Index: Mk/bsd.wx.mk =================================================================== --- Mk/bsd.wx.mk +++ Mk/bsd.wx.mk @@ -11,9 +11,9 @@ # USE_WX - Set to the list of wxWidgets versions that can be used by # the port. The syntax allows the following elements: # - Single version (e.g. "3.0"). -# - Range of versions (e.g. "2.8-3.0"). Must be ascending. -# - Partial range: single version and upper (e.g. "2.8+"). -# - Partial range: single version and lower (e.g. "-2.8"). +# - Range of versions (e.g. "3.0-3.2"). Must be ascending. +# - Partial range: single version and upper (e.g. "3.2+"). +# - Partial range: single version and lower (e.g. "-3.2"). # Multiple elements can be specified separated by spaces. # USE_WX_NOT - Set to the list of wxWidgets versions that can't be used by # the port. In other words, it removes some versions from @@ -26,7 +26,6 @@ # dependency type. # The available components are: # wx - The wxWidgets library. -# contrib - The wxWidgets contributed libraries. # python - The wxWidgets API for Python. # The available dependency types are: # build - Requires component for building. @@ -49,7 +48,7 @@ # components and add them to the variable HAVE_WX. If a # version is selected, HAVE_WX will contain a list of # components in the other case it will contain a list of -# "component-version" pairs (e.g. wx-2.8, contrib-2.8, etc). +# "component-version" pairs (e.g. wx-3.0, etc). # It has to be used before bsd.port.pre.mk. # WANT_WX_VER - Set to the preferred wxWidgets version for the port. It must # be present in USE_WX or missing in USE_WX_NOT. This is @@ -72,26 +71,26 @@ # set to "yes". # # Examples: -# - A port that needs wxWidgets 2.8 and contributed libraries -# USE_WX= 2.8 -# WX_COMPS= wx contrib -# - A port that needs WxPython 2.8 for running. +# - A port that needs wxWidgets 3.0 +# USE_WX= 3.0 +# WX_COMPS= wx +# - A port that needs WxPython 3.0 for running. # USE_PYTHON= yes -# USE_WX= 2.8 +# USE_WX= 3.0 # WX_COMPS= python:run -# - A port that needs WxPython 2.8 or 3.0 for building. +# - A port that needs WxPython 3.0 or 3.2 for building. # USE_PYTHON= yes -# USE_WX= 2.8 3.0 +# USE_WX= 3.0 3.2 # WX_COMPS= python:build -# - A port that needs wxWidgets version 2.8 or higher and contributed +# - A port that needs wxWidgets version 3.0 or higher # libraries. -# USE_WX= 2.8+ -# WX_COMPS= wx contrib -# - A port that needs wxWidgets of any version other than 2.8. -# USE_WX_NOT= 2.8 +# USE_WX= 3.0+ +# WX_COMPS= wx +# - A port that needs wxWidgets of any version other than 3.0. +# USE_WX_NOT= 3.0 # -WX_Include_MAINTAINER= ports@FreeBSD.org +WX_Include_MAINTAINER= desktop@FreeBSD.org # # Global definitions. @@ -109,10 +108,10 @@ # _WX_VERS_LISTS - Reverse lists preference order. # -_WX_COMPS_ALL= wx contrib python +_WX_COMPS_ALL= wx python _WX_DEP_TYPES_ALL= build lib run -_WX_VERS_ALL= 2.8 3.0 3.2 -_WX_VERS_UC_ALL= 2.8 3.0 3.2 +_WX_VERS_ALL= 3.0 3.2 +_WX_VERS_UC_ALL= 3.0 3.2 _WX_VERS_SKIP= 3.0 3.2 _WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED @@ -125,13 +124,6 @@ # _WX_DEPTYPE_comp_ver - Default dependency type (optional). # -# wxgtk 2.8 -_WX_PORT_wx_2.8= x11-toolkits/wxgtk28 -_WX_LIB_wx_2.8= wx_base${_WX_UC}-2.8 - -_WX_PORT_contrib_2.8= x11-toolkits/wxgtk28-contrib -_WX_LIB_contrib_2.8= wx_gtk2${_WX_UC}_fl-2.8 - # wxgtk 3.0 _WX_PORT_wx_3.0= x11-toolkits/wxgtk30@${_GTKFLAVOR} _WX_LIB_wx_3.0= wx_baseu-3.0 @@ -411,8 +403,6 @@ . elif ${_WX_VER} == 3.0 _GTKVER= ${WANT_WXGTK_VER:U3} _GTKFLAVOR= gtk${_GTKVER} -. else -_GTKVER= 2 . endif WX_CONFIG?= ${LOCALBASE}/bin/wxgtk${_GTKVER}${_WX_UC}-${_WX_VER}-config Index: cad/basicdsp/Makefile =================================================================== --- cad/basicdsp/Makefile +++ cad/basicdsp/Makefile @@ -9,6 +9,9 @@ COMMENT= Program for experimenting with simple audio DSP algorithms WWW= https://wwwhome.cs.utwente.nl/~ptdeboer/ham/basicdsp/ +DEPRECATED= Abandoned project and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= GPLv2 USES= compiler:c++11-lang dos2unix tar:tgz Index: comms/ebook2cwgui/Makefile =================================================================== --- comms/ebook2cwgui/Makefile +++ comms/ebook2cwgui/Makefile @@ -9,6 +9,9 @@ COMMENT= Gui front end for ebooks2cw WWW= http://fkurz.net/ham/ebook2cw.html #graphicaluserinterface +DEPRECATED= Abandoned project, last update 2013-01-23 and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING Index: comms/trustedqsl/Makefile =================================================================== --- comms/trustedqsl/Makefile +++ comms/trustedqsl/Makefile @@ -24,7 +24,7 @@ USES= bdb:5+ cmake compiler:c++11-lib pkgconfig ssl CMAKE_ARGS= -DBDB_PREFIX=${LOCALBASE} CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" -USE_WX= 2.8+ +USE_WX= 3.0+ USE_LDCONFIG= yes OPTIONS_DEFINE= GEN_CRQ LOAD_CERT STATION_LOC CONVERTER Index: deskutils/xchm/Makefile =================================================================== --- deskutils/xchm/Makefile +++ deskutils/xchm/Makefile @@ -8,6 +8,9 @@ COMMENT= Windows HTML Help (.chm) viewer for UNIX WWW= http://xchm.sourceforge.net/ +DEPRECATED= Abandoned project and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING Index: editors/madedit/Makefile =================================================================== --- editors/madedit/Makefile +++ editors/madedit/Makefile @@ -8,6 +8,9 @@ COMMENT= Open-source and cross-platform text/hex editor WWW= http://madedit.sourceforge.net/ +DEPRECATED= Abandoned project and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:devel/boost-libs Index: emulators/lisaem/Makefile =================================================================== --- emulators/lisaem/Makefile +++ emulators/lisaem/Makefile @@ -8,6 +8,9 @@ COMMENT= Apple Lisa 2 Emulator WWW= https://lisaem.sunder.net/ +DEPRECATED= Broken for more than a year and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING Index: games/blokish/Makefile =================================================================== --- games/blokish/Makefile +++ games/blokish/Makefile @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USES= compiler:c++11-lang gl gmake localbase tar:tgz USE_GL= gl -USE_WX= 2.8 +USE_WX= 3.0 MAKEFILE= makefile Index: games/openyahtzee/Makefile =================================================================== --- games/openyahtzee/Makefile +++ games/openyahtzee/Makefile @@ -15,7 +15,7 @@ USES= compiler:c++11-lib localbase:ldflags tar:xz USE_CXXSTD= c++11 -USE_WX= 2.8 +USE_WX= 3.0 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes Index: games/scorched3d/Makefile =================================================================== --- games/scorched3d/Makefile +++ games/scorched3d/Makefile @@ -9,6 +9,9 @@ COMMENT= 3D version of the classic DOS game Scorched Earth WWW= http://www.scorched3d.co.uk/ +DEPRECATED= Abandoned project and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= GPLv2 LIB_DEPENDS= libvorbis.so:audio/libvorbis \ Index: games/scummvm-tools/Makefile =================================================================== --- games/scummvm-tools/Makefile +++ games/scummvm-tools/Makefile @@ -40,7 +40,7 @@ OPTIONS_DEFAULT=WXGTK OPTIONS_SUB= yes -WXGTK_USE= WX=2.8 +WXGTK_USE= WX=3.0 WXGTK_VARS= WX_COMPS=wx WX_CONFIG_ARGS=absolute WXGTK_CONFIGURE_ENABLE= wxwidgets Index: graphics/comical/Makefile =================================================================== --- graphics/comical/Makefile +++ graphics/comical/Makefile @@ -8,6 +8,9 @@ COMMENT= Sequential image viewer WWW= http://comical.sourceforge.net/ +DEPRECATED= Abandoned project and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING Index: math/graphthing/Makefile =================================================================== --- math/graphthing/Makefile +++ math/graphthing/Makefile @@ -8,6 +8,9 @@ COMMENT= Tool that allows you to create, manipulate, and study graphs WWW= http://graph.seul.org/ +DEPRECATED= Abandoned project and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING Index: net-p2p/amule-devel/Makefile =================================================================== --- net-p2p/amule-devel/Makefile +++ net-p2p/amule-devel/Makefile @@ -10,6 +10,9 @@ COMMENT= All-platform eMule p2p client WWW= https://www.amule.org/ +DEPRECATED= Obsolete version and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/docs/COPYING Index: net/opennx/Makefile =================================================================== --- net/opennx/Makefile +++ net/opennx/Makefile @@ -8,6 +8,9 @@ COMMENT= Open source drop in replacement for NoMachine's NX client WWW= http://opennx.net/ +DEPRECATED= Abandoned project and use deprecated wxgtk28 +EXPIRATION_DATE= 2022-12-31 + LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING Index: x11-toolkits/wxgtk28-contrib/Makefile =================================================================== --- x11-toolkits/wxgtk28-contrib/Makefile +++ x11-toolkits/wxgtk28-contrib/Makefile @@ -1,6 +1,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries +DEPRECATED= Abandoned project, use wx 3.x +EXPIRATION_DATE= 2022-12-31 + WXGTK_FLAVOR= gtk2-contrib MASTERDIR= ${.CURDIR}/../wxgtk28 Index: x11-toolkits/wxgtk28/Makefile =================================================================== --- x11-toolkits/wxgtk28/Makefile +++ x11-toolkits/wxgtk28/Makefile @@ -10,6 +10,9 @@ COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings WWW= https://www.wxwidgets.org/ +DEPRECATED= Abandoned project, use wx 3.x +EXPIRATION_DATE= 2022-12-31 + LIB_DEPENDS+= libpng.so:graphics/png\ libtiff.so:graphics/tiff\ libexpat.so:textproc/expat2