diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2005-05-12 16:39:59 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2005-05-12 16:39:59 +0000 |
| commit | d164e5eed292f9d38bcae24ae5a022d4398498fb (patch) | |
| tree | 0624ea58421e1b1ee60ff22ecb3eff4e2b60f382 | |
| parent | f2e04afc00d5f1a1504497a0ba282336df14f721 (diff) | |
| download | ports-d164e5eed292f9d38bcae24ae5a022d4398498fb.tar.gz ports-d164e5eed292f9d38bcae24ae5a022d4398498fb.zip | |
Finish repo copy of wxgtk 2.4.2 ports to wxgtk24*
Notes
Notes:
svn path=/head/; revision=135139
93 files changed, 643 insertions, 1564 deletions
@@ -1467,3 +1467,13 @@ www/mod_watch||2005-05-07|author does not permit distribution of patch files www/mod_watch4||2005-05-07|author does not permit distribution of patch files japanese/postgresql7-man|japanese/postgresql74-man|2005-05-08|port renamed devel/libuta|devel/wftk|2005-05-11|wftk is a fork of libuta which is not any longer maintained +x11-toolkits/wxgtk||2005-05-12|obsolete +x11-toolkits/wxgtk-common|x11-toolkits/wxgtk24|2005-05-12|old wxgtk 2.4.2 port renamed +x11-toolkits/wxgtk-contrib||2005-05-12|obsolete +x11-toolkits/wxgtk-contrib-common|x11-toolkits/wxgtk24-contrib|2005-05-12|old wxgtk 2.4.2 port renamed +x11-toolkits/wxgtk-docs|x11-toolkits/wxgtk24-docs|2005-05-12|old wxgtk 2.4.2 port renamed +x11-toolkits/wxgtk2|x11-toolkits/wxgtk24|2005-05-12|old wxgtk 2.4.2 port renamed +x11-toolkits/wxgtk2-contrib|x11-toolkits/wxgtk24-contrib|2005-05-12|old wxgtk 2.4.2 port renamed +x11-toolkits/wxgtk2-unicode||2005-05-12|broken +x11-toolkits/wxgtk2-unicode-contrib||2005-05-12|broken +x11-toolkits/py-wxPython|x11-toolkits/py-wxPython24|2005-05-12|old wxgtk 2.4.2-based port renamed diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 9c59b1c1b96e..9f15164f6785 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -16,7 +16,7 @@ MAINTAINER= craig@yekse.gank.org COMMENT= Audacity is a GUI editor for digital audio waveforms BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} GNU_CONFIGURE= yes diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile index bb49b381c200..b1006c53b200 100644 --- a/audio/mbox/Makefile +++ b/audio/mbox/Makefile @@ -12,13 +12,13 @@ MASTER_SITES= http://www.mbox.wz.cz/src/ MAINTAINER= oc@nm.ru COMMENT= Program intended to help with organizing your music files -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 \ ${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \ ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \ lame:${PORTSDIR}/audio/lame \ oggenc:${PORTSDIR}/audio/vorbis-tools \ mplayer:${PORTSDIR}/multimedia/mplayer -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_PYTHON= yes USE_PYDISTUTILS=yes diff --git a/biology/L-Breeder/Makefile b/biology/L-Breeder/Makefile index b15d1c48f1be..13b1fbf5cd9f 100644 --- a/biology/L-Breeder/Makefile +++ b/biology/L-Breeder/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= dyeske@yahoo.com COMMENT= Allows you to display and breed L-system forms -LIB_DEPENDS= wx_gtk2_gl-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2_gl-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 WRKSRC= ${WRKDIR}/LBreeder/LBreeder PATCH_WRKSRC= ${WRKDIR}/LBreeder diff --git a/biology/treeviewx/Makefile b/biology/treeviewx/Makefile index 8227053314ff..d42f355c54d3 100644 --- a/biology/treeviewx/Makefile +++ b/biology/treeviewx/Makefile @@ -15,8 +15,8 @@ DISTNAME= tv-${PORTVERSION} MAINTAINER= fernan@iib.unsam.edu.ar COMMENT= A phylogenetic tree viewer -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ - wx_gtk2_dcsvg-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-contrib +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \ + wx_gtk2_dcsvg-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24-contrib USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/chinese/BBMan/Makefile b/chinese/BBMan/Makefile index 0a024684eb0b..3216c28f7042 100644 --- a/chinese/BBMan/Makefile +++ b/chinese/BBMan/Makefile @@ -17,7 +17,7 @@ EXTRACT_SUFX= .zip MAINTAINER= statue@freebsd.netlab.cse.yzu.edu.tw COMMENT= BBMan is a BBS client for X Window System -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_ZIP= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile index 00da53f307d1..2992f4c8e364 100644 --- a/comms/trustedqsl/Makefile +++ b/comms/trustedqsl/Makefile @@ -17,7 +17,7 @@ MAINTAINER= db@db.net COMMENT= Amateur Radio Station electronic trusted logbook LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 + wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_GETOPT_LONG= yes USE_REINPLACE= yes diff --git a/databases/pydbdesigner/Makefile b/databases/pydbdesigner/Makefile index 7b036bc4a01e..0e7bc0a2d296 100644 --- a/databases/pydbdesigner/Makefile +++ b/databases/pydbdesigner/Makefile @@ -18,8 +18,8 @@ MASTER_SITE_SUBDIR=${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Graphical designer for relational databases -BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 USE_PYTHON= yes PLIST= ${WRKDIR}/plist diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile index 7293a46abacf..73de1985adbc 100644 --- a/deskutils/xchm/Makefile +++ b/deskutils/xchm/Makefile @@ -15,7 +15,7 @@ MAINTAINER= pav@FreeBSD.org COMMENT= Windows HTML Help (.chm) viewer for UNIX LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 + wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 GNU_CONFIGURE= yes USE_X_PREFIX= yes diff --git a/devel/agide/Makefile b/devel/agide/Makefile index 2eef19855901..aac8ac317425 100644 --- a/devel/agide/Makefile +++ b/devel/agide/Makefile @@ -17,7 +17,7 @@ COMMENT= A-A-P GUI IDE: a framework for software development RUN_DEPENDS= ${LOCALBASE}/bin/aap:${PORTSDIR}/devel/aap \ ${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim \ - ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython + ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 MAN1= agide.1 diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile index 11c68053fc4a..ea2aad518e35 100644 --- a/devel/boaconstructor/Makefile +++ b/devel/boaconstructor/Makefile @@ -16,7 +16,7 @@ DISTNAME= boa-constructor-${PORTVERSION}.src MAINTAINER= filippo.natali@gmail.com COMMENT= A cross platform RAD GUI Building IDE for wxPython -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython24 WRKSRC= ${WRKDIR}/boa-constructor-${PORTVERSION} diff --git a/devel/datadesigner/Makefile b/devel/datadesigner/Makefile index c88c1448c695..628a89efb903 100644 --- a/devel/datadesigner/Makefile +++ b/devel/datadesigner/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Database Schema Designer LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 + wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_GNOME= libxml2 libxslt USE_ICONV= yes diff --git a/devel/ecos-tools/Makefile b/devel/ecos-tools/Makefile index c7e3f2d393f6..77e60a674033 100644 --- a/devel/ecos-tools/Makefile +++ b/devel/ecos-tools/Makefile @@ -17,7 +17,7 @@ MAINTAINER= tg@FreeBSD.org COMMENT= Configuration tools for the eCos embedded OS LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84 \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 + wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_BZIP2= yes WRKSRC= ${WRKDIR}/infra-build diff --git a/devel/klassmodeler/Makefile b/devel/klassmodeler/Makefile index 4a2e326d1bc0..1e0390b52cd8 100644 --- a/devel/klassmodeler/Makefile +++ b/devel/klassmodeler/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}.bsd MAINTAINER= ports@FreeBSD.org COMMENT= A tool for visually creating and documenting classes -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_ZIP= yes USE_REINPLACE= yes diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile index f415341440e1..98f04018271a 100644 --- a/devel/rapidsvn/Makefile +++ b/devel/rapidsvn/Makefile @@ -32,7 +32,7 @@ MAN1= rapidsvn.1 WXPORT= wxgtk2-devel WXCONFIG= wxgtk2-2.5-config .else -WXPORT= wxgtk2 +WXPORT= wxgtk24 WXCONFIG= wx-config .endif SVNDEP= ${LOCALBASE}/include/subversion-1/svn_types.h diff --git a/devel/wxGlade/Makefile b/devel/wxGlade/Makefile index 43b2bf2f2e43..46785e70824f 100644 --- a/devel/wxGlade/Makefile +++ b/devel/wxGlade/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= wxglade MAINTAINER= ports@FreeBSD.org COMMENT= GUI builder for wxPython/wxWindows written in Python -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/wx.py:${PORTSDIR}/x11-toolkits/py-wxPython +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/wx.py:${PORTSDIR}/x11-toolkits/py-wxPython24 USE_PYTHON= yes NO_BUILD= yes diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 9d89139c2c7d..7653aade697d 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -18,7 +18,7 @@ COMMENT= Gettext catalogs (.po files) editor BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 + wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_X_PREFIX= yes USE_GETTEXT= yes diff --git a/ftp/ftpcube/Makefile b/ftp/ftpcube/Makefile index ca0b6f8f71fa..63333c88bd91 100644 --- a/ftp/ftpcube/Makefile +++ b/ftp/ftpcube/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A graphical FTP Client -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 .if defined(PACKAGE_BUILDING) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} diff --git a/games/abridge/Makefile b/games/abridge/Makefile index 23ec885ad0a1..5605fcaf0e76 100644 --- a/games/abridge/Makefile +++ b/games/abridge/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.abridgegame.org/src/ MAINTAINER= Janos.Mohacsi@bsd.hu COMMENT= Bridge game -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index 572fae1c34bd..7f5232211e6c 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -16,7 +16,7 @@ DISTNAME= Scorched3D-${SCORCH_VERSION}-src MAINTAINER= guy@device.dyndns.org COMMENT= Scorched is a game based loosely on the classic DOS game -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 SCORCH_VERSION= 38.1 SCORCH_REVISION= b diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index f974ec333233..9cbafc6a1c1c 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -22,8 +22,8 @@ LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ png:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ fftw:${PORTSDIR}/math/fftw \ - wx_gtk2:${PORTSDIR}/x11-toolkits/wxgtk2 \ - wx_gtk2_xrc:${PORTSDIR}/x11-toolkits/wxgtk2-contrib \ + wx_gtk2:${PORTSDIR}/x11-toolkits/wxgtk24 \ + wx_gtk2_xrc:${PORTSDIR}/x11-toolkits/wxgtk24-contrib \ boost_date_time:${PORTSDIR}/devel/boost RUN_DEPENDS= PTOptimizer:${PORTSDIR}/graphics/libpano12 \ PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools diff --git a/graphics/multivideo/Makefile b/graphics/multivideo/Makefile index e03be24f3459..ddc74de3c023 100644 --- a/graphics/multivideo/Makefile +++ b/graphics/multivideo/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= An image sequence viewer -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile index dfcd249d97f5..f8449d5348f1 100644 --- a/mail/mahogany/Makefile +++ b/mail/mahogany/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= mahogany MAINTAINER= ports@FreeBSD.org COMMENT= An X11 mail and news client -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_X_PREFIX= yes GNU_CONFIGURE= yes diff --git a/math/gambit/Makefile b/math/gambit/Makefile index ed9debe87ed0..3566d863ae97 100644 --- a/math/gambit/Makefile +++ b/math/gambit/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A library of tools for doing computation in game theory -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_X_PREFIX= yes GNU_CONFIGURE= yes diff --git a/misc/documancer/Makefile b/misc/documancer/Makefile index 9401a20c309e..670242c21b82 100644 --- a/misc/documancer/Makefile +++ b/misc/documancer/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= wget:${PORTSDIR}/ftp/wget \ swish-e:${PORTSDIR}/www/swish-e LIB_DEPENDS= wxmozilla_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxmozilla RUN_DEPENDS= ${BUILD_DEPENDS} \ - ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython + ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 BROKEN= Broken dependency diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile index b04448c007bb..86a73e11f21f 100644 --- a/multimedia/dvdstyler/Makefile +++ b/multimedia/dvdstyler/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ growisofs:${PORTSDIR}/sysutils/dvd+rw-tools LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm \ lavfile-1.6.2:${PORTSDIR}/multimedia/mjpegtools \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 + wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS+= xine:${PORTSDIR}/multimedia/xine diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 039e3cc682b4..7c906b48b001 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -36,7 +36,7 @@ WXGTK_CONFIG= wxgtk2-2.4-config .include <bsd.port.pre.mk> .ifndef(WITHOUT_WXGTK) -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 MAN1+= mmg.1 PLIST_FILES+= bin/mmg diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index a64fb6466124..b1c7adf4ba6c 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -362,14 +362,14 @@ DEFAULT_CDROM_DEVICE=/dev/acd0 .endif .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 CONFIGURE_ARGS+=--enable-skins2 --enable-skins .else CONFIGURE_ARGS+=--disable-skins2 .endif .if !defined(WITHOUT_WXWINDOWS) -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_GNOME+= gnomehier CONFIGURE_ARGS+=--enable-wxwindows CONFIGURE_ENV+= WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index a64fb6466124..b1c7adf4ba6c 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -362,14 +362,14 @@ DEFAULT_CDROM_DEVICE=/dev/acd0 .endif .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 CONFIGURE_ARGS+=--enable-skins2 --enable-skins .else CONFIGURE_ARGS+=--disable-skins2 .endif .if !defined(WITHOUT_WXWINDOWS) -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 USE_GNOME+= gnomehier CONFIGURE_ARGS+=--enable-wxwindows CONFIGURE_ENV+= WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile index a1e270dd0200..d66ccc3125fc 100644 --- a/net-p2p/amule1/Makefile +++ b/net-p2p/amule1/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://download.berlios.de/amule/ MAINTAINER= ganael.laplanche@martymac.com COMMENT= The all-platform eMule p2p client -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ +LIB_DEPENDS= wx_gtk2_core-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk24 \ curl.3:${PORTSDIR}/ftp/curl CONFLICTS= aMule-devel-* diff --git a/net-p2p/mute-net/Makefile b/net-p2p/mute-net/Makefile index af25f718ecfe..519fcfb4a004 100644 --- a/net-p2p/mute-net/Makefile +++ b/net-p2p/mute-net/Makefile @@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/${RELEASE_DIRECTORY}/MUTE PATCH_WRKSRC= ${WRKDIR}/${RELEASE_DIRECTORY} .ifndef(WITHOUT_GUI) -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config .endif diff --git a/net-p2p/py-bittornado/Makefile b/net-p2p/py-bittornado/Makefile index c879c7bfb755..505abb2573f5 100644 --- a/net-p2p/py-bittornado/Makefile +++ b/net-p2p/py-bittornado/Makefile @@ -40,7 +40,7 @@ MAN1= bittorrent-downloader.1 bittorrent-multi-downloader.1 \ # required for GUI .ifndef(WITHOUT_GUI) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 PLIST_SUB+= GUI='' EXTRA_PATCHES+= ${FILESDIR}/extra-gui-patch-setup.py .else diff --git a/net-p2p/py-kenosis-bittorrent/Makefile b/net-p2p/py-kenosis-bittorrent/Makefile index 74d0512c2382..2248a62bf145 100644 --- a/net-p2p/py-kenosis-bittorrent/Makefile +++ b/net-p2p/py-kenosis-bittorrent/Makefile @@ -48,7 +48,7 @@ WITHOUT_PSYCO= yes # required for GUI .ifndef(WITHOUT_GUI) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 EXTRA_PATCHES+= ${FILESDIR}/extra-gui-patch-setup.py diff --git a/net-p2p/pyslsk/Makefile b/net-p2p/pyslsk/Makefile index 84c2cd8d96af..a275bcc37a9a 100644 --- a/net-p2p/pyslsk/Makefile +++ b/net-p2p/pyslsk/Makefile @@ -14,8 +14,8 @@ MASTER_SITES= http://www.sensi.org/~ak/pyslsk/ MAINTAINER= shoesoft@gmx.net COMMENT= Client for SoulSeek filesharing system -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 .if !defined(WITHOUT_VORBIS) RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile index 925f901aded5..0c3fd9156b56 100644 --- a/net-p2p/xmule/Makefile +++ b/net-p2p/xmule/Makefile @@ -18,7 +18,7 @@ COMMENT= Port of eMule eDonkey P2P client using wxWindows class library BUILD_DEPENDS= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 + wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget USE_GETTEXT= yes diff --git a/net/amule-devel/Makefile b/net/amule-devel/Makefile index 06fa04facbbe..680a7efddc0c 100644 --- a/net/amule-devel/Makefile +++ b/net/amule-devel/Makefile @@ -15,7 +15,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= ganael.laplanche@martymac.com COMMENT= The all-platform eMule p2p client -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \ curl.3:${PORTSDIR}/ftp/curl \ execinfo.1:${PORTSDIR}/devel/libexecinfo # gd.4:${PORTSDIR}/graphics/gd diff --git a/net/amule/Makefile b/net/amule/Makefile index a1e270dd0200..d66ccc3125fc 100644 --- a/net/amule/Makefile +++ b/net/amule/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://download.berlios.de/amule/ MAINTAINER= ganael.laplanche@martymac.com COMMENT= The all-platform eMule p2p client -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ +LIB_DEPENDS= wx_gtk2_core-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk24 \ curl.3:${PORTSDIR}/ftp/curl CONFLICTS= aMule-devel-* diff --git a/net/amule1/Makefile b/net/amule1/Makefile index a1e270dd0200..d66ccc3125fc 100644 --- a/net/amule1/Makefile +++ b/net/amule1/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://download.berlios.de/amule/ MAINTAINER= ganael.laplanche@martymac.com COMMENT= The all-platform eMule p2p client -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ +LIB_DEPENDS= wx_gtk2_core-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk24 \ curl.3:${PORTSDIR}/ftp/curl CONFLICTS= aMule-devel-* diff --git a/net/mute-net/Makefile b/net/mute-net/Makefile index af25f718ecfe..519fcfb4a004 100644 --- a/net/mute-net/Makefile +++ b/net/mute-net/Makefile @@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/${RELEASE_DIRECTORY}/MUTE PATCH_WRKSRC= ${WRKDIR}/${RELEASE_DIRECTORY} .ifndef(WITHOUT_GUI) -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config .endif diff --git a/net/py-bittornado/Makefile b/net/py-bittornado/Makefile index c879c7bfb755..505abb2573f5 100644 --- a/net/py-bittornado/Makefile +++ b/net/py-bittornado/Makefile @@ -40,7 +40,7 @@ MAN1= bittorrent-downloader.1 bittorrent-multi-downloader.1 \ # required for GUI .ifndef(WITHOUT_GUI) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 PLIST_SUB+= GUI='' EXTRA_PATCHES+= ${FILESDIR}/extra-gui-patch-setup.py .else diff --git a/net/py-kenosis-bittorrent/Makefile b/net/py-kenosis-bittorrent/Makefile index 74d0512c2382..2248a62bf145 100644 --- a/net/py-kenosis-bittorrent/Makefile +++ b/net/py-kenosis-bittorrent/Makefile @@ -48,7 +48,7 @@ WITHOUT_PSYCO= yes # required for GUI .ifndef(WITHOUT_GUI) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 EXTRA_PATCHES+= ${FILESDIR}/extra-gui-patch-setup.py diff --git a/net/py-mp-random/Makefile b/net/py-mp-random/Makefile index 4e38b7f9c3e9..9905ccf0f700 100644 --- a/net/py-mp-random/Makefile +++ b/net/py-mp-random/Makefile @@ -16,7 +16,7 @@ DISTNAME= MirrorProjectRandomImageWidget-src-${PORTVERSION} MAINTAINER= randomimage-widget@mirrorproject.com COMMENT= Display random Mirror Project images on your desktop -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython24 USE_PYTHON= yes USE_X_PREFIX= yes diff --git a/net/pyslsk/Makefile b/net/pyslsk/Makefile index 84c2cd8d96af..a275bcc37a9a 100644 --- a/net/pyslsk/Makefile +++ b/net/pyslsk/Makefile @@ -14,8 +14,8 @@ MASTER_SITES= http://www.sensi.org/~ak/pyslsk/ MAINTAINER= shoesoft@gmx.net COMMENT= Client for SoulSeek filesharing system -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 .if !defined(WITHOUT_VORBIS) RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis diff --git a/net/xmule/Makefile b/net/xmule/Makefile index 925f901aded5..0c3fd9156b56 100644 --- a/net/xmule/Makefile +++ b/net/xmule/Makefile @@ -18,7 +18,7 @@ COMMENT= Port of eMule eDonkey P2P client using wxWindows class library BUILD_DEPENDS= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ - wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 + wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget USE_GETTEXT= yes diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile index 25de39dcb146..0b8eaca3abdc 100644 --- a/science/py-scipy/Makefile +++ b/science/py-scipy/Makefile @@ -19,7 +19,7 @@ COMMENT= Scientific tools for Python BUILD_DEPENDS= ${PYNUMERIC} \ ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \ f2py:${PORTSDIR}/lang/f2py \ - ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython + ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \ atlas.1:${PORTSDIR}/math/atlas diff --git a/science/py-scipy03/Makefile b/science/py-scipy03/Makefile index 25de39dcb146..0b8eaca3abdc 100644 --- a/science/py-scipy03/Makefile +++ b/science/py-scipy03/Makefile @@ -19,7 +19,7 @@ COMMENT= Scientific tools for Python BUILD_DEPENDS= ${PYNUMERIC} \ ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \ f2py:${PORTSDIR}/lang/f2py \ - ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython + ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \ atlas.1:${PORTSDIR}/math/atlas diff --git a/security/hashish/Makefile b/security/hashish/Makefile index 04169d08199d..467ccbea2cf7 100644 --- a/security/hashish/Makefile +++ b/security/hashish/Makefile @@ -18,20 +18,13 @@ MAINTAINER= jllovela@ncsu.edu COMMENT= GUI file and string hashing utility BUILD_DEPENDS= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp - -.if defined(WITH_GTK1) -LIB_DEPENDS= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk -.else -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 -.endif +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 GNU_CONFIGURE= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -.if !defined(WITH_GTK1) -CONFIGURE_ENV+= WX_CONFIG="${X11BASE}/bin/wxgtk2-2.4-config" -.endif + LDFLAGS="-L${LOCALBASE}/lib" \ + WX_CONFIG="${X11BASE}/bin/wxgtk2-2.4-config" USE_GMAKE= yes PLIST_FILES= bin/hashish diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index af6dbe3cd2e9..ec80dfadce8e 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -196,22 +196,16 @@ SUBDIR += viewklass SUBDIR += vte SUBDIR += wmapp - SUBDIR += wxgtk - SUBDIR += wxgtk-common - SUBDIR += wxgtk-contrib - SUBDIR += wxgtk-contrib-common - SUBDIR += wxgtk-docs - SUBDIR += wxgtk2 SUBDIR += wxgtk2-common-devel - SUBDIR += wxgtk2-contrib SUBDIR += wxgtk2-contrib-common-devel SUBDIR += wxgtk2-contrib-devel SUBDIR += wxgtk2-devel - SUBDIR += wxgtk2-unicode - SUBDIR += wxgtk2-unicode-contrib SUBDIR += wxgtk2-unicode-contrib-devel SUBDIR += wxgtk2-unicode-devel SUBDIR += wxgtk2-utils-devel + SUBDIR += wxgtk24 + SUBDIR += wxgtk24-contrib + SUBDIR += wxgtk24-docs SUBDIR += wxmozilla SUBDIR += xbae SUBDIR += xclasses diff --git a/x11-toolkits/py-SciParam/Makefile b/x11-toolkits/py-SciParam/Makefile index 79035d62fc3f..ade3877e3f81 100644 --- a/x11-toolkits/py-SciParam/Makefile +++ b/x11-toolkits/py-SciParam/Makefile @@ -19,7 +19,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Scientific Parameter Dialogs in wxPython based user interfaces -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 USE_BZIP2= yes USE_PYTHON= yes diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile index a9a8217f6cf3..b64b4bdc393f 100644 --- a/x11-toolkits/py-wxPython/Makefile +++ b/x11-toolkits/py-wxPython/Makefile @@ -47,16 +47,10 @@ post-install: .include <bsd.port.pre.mk> -.if !defined(WITH_GTK1) -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config - CONFIGURE_ARGS+= --enable-gtk2 PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} -.else -LIB_DEPENDS= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk -WX_CONFIG= ${X11BASE}/bin/wxgtk-2.4-config -.endif .include <bsd.port.post.mk> diff --git a/x11-toolkits/ruby-wx/Makefile b/x11-toolkits/ruby-wx/Makefile index e9a7f558de6e..0ef5b8ab704d 100644 --- a/x11-toolkits/ruby-wx/Makefile +++ b/x11-toolkits/ruby-wx/Makefile @@ -17,8 +17,8 @@ DIST_SUBDIR= ruby MAINTAINER= q@uni.de COMMENT= Ruby bindings for wxWindows (aka wxWidgets) -LIB_DEPENDS= wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk2 \ - wx_gtk2_xrc-2.4:${PORTSDIR}/x11-toolkits/wxgtk2-contrib +LIB_DEPENDS= wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk24 \ + wx_gtk2_xrc-2.4:${PORTSDIR}/x11-toolkits/wxgtk24-contrib USE_ICONV= yes USE_RUBY= yes diff --git a/x11-toolkits/wxgtk-common/Makefile b/x11-toolkits/wxgtk-common/Makefile deleted file mode 100644 index b01845e9f40b..000000000000 --- a/x11-toolkits/wxgtk-common/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: wxgtk-common -# Date created: November 4, 2003 -# Whom: fjoe@FreeBSD.ORG -# -# $FreeBSD$ -# - -PORTREVISION= 1 - -MAINTAINER= fjoe@FreeBSD.org -COMMENT= The wxWidgets GUI toolkit (common files) - -WXGTK_FLAVOR= gtk-common -MASTERDIR= ${.CURDIR}/../wxgtk - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk-common/pkg-plist b/x11-toolkits/wxgtk-common/pkg-plist deleted file mode 100644 index ee687e563e8f..000000000000 --- a/x11-toolkits/wxgtk-common/pkg-plist +++ /dev/null @@ -1,415 +0,0 @@ -include/wx/accel.h -include/wx/app.h -include/wx/arrimpl.cpp -include/wx/artprov.h -include/wx/bitmap.h -include/wx/bmpbuttn.h -include/wx/brush.h -include/wx/buffer.h -include/wx/build.h -include/wx/busyinfo.h -include/wx/button.h -include/wx/calctrl.h -include/wx/caret.h -include/wx/checkbox.h -include/wx/checklst.h -include/wx/chkconf.h -include/wx/choicdlg.h -include/wx/choice.h -include/wx/clipbrd.h -include/wx/clntdata.h -include/wx/cmdline.h -include/wx/cmdproc.h -include/wx/cmndata.h -include/wx/colordlg.h -include/wx/colour.h -include/wx/combobox.h -include/wx/confbase.h -include/wx/config.h -include/wx/containr.h -include/wx/control.h -include/wx/cshelp.h -include/wx/ctrlsub.h -include/wx/cursor.h -include/wx/dataobj.h -include/wx/date.h -include/wx/datetime.h -include/wx/datetime.inl -include/wx/datstrm.h -include/wx/db.h -include/wx/dbgrid.h -include/wx/dbkeyg.h -include/wx/dbtable.h -include/wx/dc.h -include/wx/dcbuffer.h -include/wx/dcclient.h -include/wx/dcmemory.h -include/wx/dcprint.h -include/wx/dcps.h -include/wx/dcscreen.h -include/wx/dde.h -include/wx/debug.h -include/wx/defs.h -include/wx/dialog.h -include/wx/dialup.h -include/wx/dir.h -include/wx/dirctrl.h -include/wx/dirdlg.h -include/wx/dnd.h -include/wx/docmdi.h -include/wx/docview.h -include/wx/dragimag.h -include/wx/dynarray.h -include/wx/dynlib.h -include/wx/dynload.h -include/wx/effects.h -include/wx/encconv.h -include/wx/event.h -include/wx/expr.h -include/wx/fdrepdlg.h -include/wx/features.h -include/wx/ffile.h -include/wx/file.h -include/wx/fileconf.h -include/wx/filedlg.h -include/wx/filefn.h -include/wx/filename.h -include/wx/filesys.h -include/wx/font.h -include/wx/fontdlg.h -include/wx/fontenc.h -include/wx/fontenum.h -include/wx/fontmap.h -include/wx/fontutil.h -include/wx/frame.h -include/wx/fs_inet.h -include/wx/fs_mem.h -include/wx/fs_zip.h -include/wx/gauge.h -include/wx/gdicmn.h -include/wx/gdiobj.h -include/wx/generic/accel.h -include/wx/generic/calctrl.h -include/wx/generic/caret.h -include/wx/generic/choicdgg.h -include/wx/generic/colrdlgg.h -include/wx/generic/dcpsg.h -include/wx/generic/dirctrlg.h -include/wx/generic/dirdlgg.h -include/wx/generic/dragimgg.h -include/wx/generic/fdrepdlg.h -include/wx/generic/filedlgg.h -include/wx/generic/fontdlgg.h -include/wx/generic/grid.h -include/wx/generic/gridctrl.h -include/wx/generic/gridg.h -include/wx/generic/helpext.h -include/wx/generic/helphtml.h -include/wx/generic/imaglist.h -include/wx/generic/laywin.h -include/wx/generic/listctrl.h -include/wx/generic/msgdlgg.h -include/wx/generic/notebook.h -include/wx/generic/paletteg.h -include/wx/generic/panelg.h -include/wx/generic/printps.h -include/wx/generic/prntdlgg.h -include/wx/generic/progdlgg.h -include/wx/generic/sashwin.h -include/wx/generic/scrolwin.h -include/wx/generic/spinctlg.h -include/wx/generic/splash.h -include/wx/generic/splitter.h -include/wx/generic/statusbr.h -include/wx/generic/tabg.h -include/wx/generic/textdlgg.h -include/wx/generic/timer.h -include/wx/generic/treectlg.h -include/wx/generic/wizard.h -include/wx/geometry.h -include/wx/gifdecod.h -include/wx/glcanvas.h -include/wx/grid.h -include/wx/gsocket.h -include/wx/gtk/accel.h -include/wx/gtk/app.h -include/wx/gtk/bitmap.h -include/wx/gtk/bmpbuttn.h -include/wx/gtk/brush.h -include/wx/gtk/button.h -include/wx/gtk/checkbox.h -include/wx/gtk/checklst.h -include/wx/gtk/choice.h -include/wx/gtk/clipbrd.h -include/wx/gtk/colour.h -include/wx/gtk/combobox.h -include/wx/gtk/control.h -include/wx/gtk/cursor.h -include/wx/gtk/dataform.h -include/wx/gtk/dataobj.h -include/wx/gtk/dataobj2.h -include/wx/gtk/dc.h -include/wx/gtk/dcclient.h -include/wx/gtk/dcmemory.h -include/wx/gtk/dcscreen.h -include/wx/gtk/dialog.h -include/wx/gtk/dnd.h -include/wx/gtk/filedlg.h -include/wx/gtk/font.h -include/wx/gtk/fontdlg.h -include/wx/gtk/frame.h -include/wx/gtk/gauge.h -include/wx/gtk/gdiobj.h -include/wx/gtk/glcanvas.h -include/wx/gtk/icon.h -include/wx/gtk/joystick.h -include/wx/gtk/listbox.h -include/wx/gtk/mdi.h -include/wx/gtk/menu.h -include/wx/gtk/menuitem.h -include/wx/gtk/minifram.h -include/wx/gtk/notebook.h -include/wx/gtk/pen.h -include/wx/gtk/popupwin.h -include/wx/gtk/radiobox.h -include/wx/gtk/radiobut.h -include/wx/gtk/region.h -include/wx/gtk/scrolbar.h -include/wx/gtk/scrolwin.h -include/wx/gtk/slider.h -include/wx/gtk/spinbutt.h -include/wx/gtk/spinctrl.h -include/wx/gtk/statbmp.h -include/wx/gtk/statbox.h -include/wx/gtk/statline.h -include/wx/gtk/stattext.h -include/wx/gtk/tbargtk.h -include/wx/gtk/textctrl.h -include/wx/gtk/tglbtn.h -include/wx/gtk/timer.h -include/wx/gtk/tooltip.h -include/wx/gtk/toplevel.h -include/wx/gtk/treectrl.h -include/wx/gtk/wave.h -include/wx/gtk/win_gtk.h -include/wx/gtk/window.h -include/wx/hash.h -include/wx/hashmap.h -include/wx/help.h -include/wx/helpbase.h -include/wx/helphtml.h -include/wx/helpwin.h -include/wx/html/forcelnk.h -include/wx/html/helpctrl.h -include/wx/html/helpdata.h -include/wx/html/helpfrm.h -include/wx/html/htmlcell.h -include/wx/html/htmldefs.h -include/wx/html/htmlfilt.h -include/wx/html/htmlpars.h -include/wx/html/htmltag.h -include/wx/html/htmlwin.h -include/wx/html/htmprint.h -include/wx/html/m_templ.h -include/wx/html/winpars.h -include/wx/icon.h -include/wx/iconbndl.h -include/wx/imagbmp.h -include/wx/image.h -include/wx/imaggif.h -include/wx/imagiff.h -include/wx/imagjpeg.h -include/wx/imaglist.h -include/wx/imagpcx.h -include/wx/imagpng.h -include/wx/imagpnm.h -include/wx/imagtiff.h -include/wx/imagxpm.h -include/wx/intl.h -include/wx/ioswrap.h -include/wx/ipc.h -include/wx/ipcbase.h -include/wx/isql.h -include/wx/isqlext.h -include/wx/joystick.h -include/wx/layout.h -include/wx/laywin.h -include/wx/list.h -include/wx/listbase.h -include/wx/listbox.h -include/wx/listctrl.h -include/wx/listimpl.cpp -include/wx/log.h -include/wx/longlong.h -include/wx/matrix.h -include/wx/mdi.h -include/wx/memconf.h -include/wx/memory.h -include/wx/memtext.h -include/wx/menu.h -include/wx/menuitem.h -include/wx/metafile.h -include/wx/mimetype.h -include/wx/minifram.h -include/wx/module.h -include/wx/msgdlg.h -include/wx/msgout.h -include/wx/mstream.h -include/wx/notebook.h -include/wx/object.h -include/wx/odbc.h -include/wx/ownerdrw.h -include/wx/palette.h -include/wx/panel.h -include/wx/paper.h -include/wx/pen.h -include/wx/platform.h -include/wx/popupwin.h -include/wx/print.h -include/wx/printdlg.h -include/wx/prntbase.h -include/wx/process.h -include/wx/progdlg.h -include/wx/prop.h -include/wx/propform.h -include/wx/proplist.h -include/wx/protocol/file.h -include/wx/protocol/ftp.h -include/wx/protocol/http.h -include/wx/protocol/protocol.h -include/wx/quantize.h -include/wx/radiobox.h -include/wx/radiobut.h -include/wx/regex.h -include/wx/region.h -include/wx/resource.h -include/wx/sashwin.h -include/wx/sckaddr.h -include/wx/sckipc.h -include/wx/sckstrm.h -include/wx/scrolbar.h -include/wx/scrolwin.h -include/wx/settings.h -include/wx/sizer.h -include/wx/slider.h -include/wx/snglinst.h -include/wx/socket.h -include/wx/spinbutt.h -include/wx/spinctrl.h -include/wx/splash.h -include/wx/splitter.h -include/wx/stack.h -include/wx/statbmp.h -include/wx/statbox.h -include/wx/statline.h -include/wx/stattext.h -include/wx/statusbr.h -include/wx/strconv.h -include/wx/stream.h -include/wx/string.h -include/wx/sysopt.h -include/wx/tab.h -include/wx/tabctrl.h -include/wx/taskbar.h -include/wx/tbarbase.h -include/wx/tbarsmpl.h -include/wx/textbuf.h -include/wx/textctrl.h -include/wx/textdlg.h -include/wx/textfile.h -include/wx/tglbtn.h -include/wx/thread.h -include/wx/thrimpl.cpp -include/wx/time.h -include/wx/timer.h -include/wx/tipdlg.h -include/wx/tipwin.h -include/wx/tokenzr.h -include/wx/toolbar.h -include/wx/tooltip.h -include/wx/toplevel.h -include/wx/treebase.h -include/wx/treectrl.h -include/wx/txtstrm.h -include/wx/types.h -include/wx/unix/execute.h -include/wx/unix/fontutil.h -include/wx/unix/gsockunx.h -include/wx/unix/mimetype.h -include/wx/unix/utilsx11.h -include/wx/url.h -include/wx/utils.h -include/wx/valgen.h -include/wx/validate.h -include/wx/valtext.h -include/wx/variant.h -include/wx/vector.h -include/wx/version.h -include/wx/volume.h -include/wx/wave.h -include/wx/wfstream.h -include/wx/window.h -include/wx/wizard.h -include/wx/wx.h -include/wx/wx_cw.h -include/wx/wx_cw_cm.h -include/wx/wx_cw_d.h -include/wx/wxchar.h -include/wx/wxexpr.h -include/wx/wxhtml.h -include/wx/wxprec.h -include/wx/xpmdecod.h -include/wx/zipstrm.h -include/wx/zstream.h -share/aclocal/wxwin.m4 -share/locale/cs/LC_MESSAGES/wxstd.mo -share/locale/da/LC_MESSAGES/wxstd.mo -share/locale/de/LC_MESSAGES/wxstd.mo -share/locale/es/LC_MESSAGES/wxstd.mo -share/locale/fi/LC_MESSAGES/wxstd.mo -share/locale/fr/LC_MESSAGES/wxstd.mo -share/locale/hu/LC_MESSAGES/wxstd.mo -share/locale/id/LC_MESSAGES/wxstd.mo -share/locale/it/LC_MESSAGES/wxstd.mo -share/locale/nl/LC_MESSAGES/wxstd.mo -share/locale/pl/LC_MESSAGES/wxstd.mo -share/locale/ru/LC_MESSAGES/wxstd.mo -share/locale/sl/LC_MESSAGES/wxstd.mo -share/locale/sv/LC_MESSAGES/wxstd.mo -share/locale/tr/LC_MESSAGES/wxstd.mo -share/locale/zh/LC_MESSAGES/wxstd.mo -share/wx/afm/Cour.afm -share/wx/afm/CourBo.afm -share/wx/afm/CourBoO.afm -share/wx/afm/CourO.afm -share/wx/afm/Helv.afm -share/wx/afm/HelvBo.afm -share/wx/afm/HelvBoO.afm -share/wx/afm/HelvO.afm -share/wx/afm/TimesBo.afm -share/wx/afm/TimesBoO.afm -share/wx/afm/TimesO.afm -share/wx/afm/TimesRo.afm -share/wx/afm/Zapf.afm -share/wx/gs_afm/Cour.afm -share/wx/gs_afm/CourBo.afm -share/wx/gs_afm/CourBoO.afm -share/wx/gs_afm/CourO.afm -share/wx/gs_afm/Helv.afm -share/wx/gs_afm/HelvBo.afm -share/wx/gs_afm/HelvBoO.afm -share/wx/gs_afm/HelvO.afm -share/wx/gs_afm/TimesBo.afm -share/wx/gs_afm/TimesBoO.afm -share/wx/gs_afm/TimesO.afm -share/wx/gs_afm/TimesRo.afm -share/wx/gs_afm/Zapf.afm -@dirrm share/wx/gs_afm -@dirrm share/wx/afm -@dirrm share/wx -@dirrm include/wx/unix -@dirrm include/wx/protocol -@dirrm include/wx/html -@dirrm include/wx/gtk -@dirrm include/wx/generic -@dirrm include/wx diff --git a/x11-toolkits/wxgtk-contrib-common/Makefile b/x11-toolkits/wxgtk-contrib-common/Makefile deleted file mode 100644 index 66f100eda883..000000000000 --- a/x11-toolkits/wxgtk-contrib-common/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: wxgtk-contrib-common -# Date created: November 4, 2003 -# Whom: fjoe@FreeBSD.ORG -# -# $FreeBSD$ -# - -PORTREVISION= 1 - -MAINTAINER= fjoe@FreeBSD.org -COMMENT= The wxWidgets GUI toolkit contributed libraries (common files) - -WXGTK_FLAVOR= gtk-contrib-common -MASTERDIR= ${.CURDIR}/../wxgtk - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk-contrib-common/pkg-plist b/x11-toolkits/wxgtk-contrib-common/pkg-plist deleted file mode 100644 index 1c12eecee8e3..000000000000 --- a/x11-toolkits/wxgtk-contrib-common/pkg-plist +++ /dev/null @@ -1,96 +0,0 @@ -include/wx/canvas/bbox.h -include/wx/canvas/canvas.h -include/wx/canvas/liner.h -include/wx/canvas/polygon.h -include/wx/fl/antiflickpl.h -include/wx/fl/bardragpl.h -include/wx/fl/barhintspl.h -include/wx/fl/cbcustom.h -include/wx/fl/controlbar.h -include/wx/fl/dynbarhnd.h -include/wx/fl/dyntbar.h -include/wx/fl/dyntbarhnd.h -include/wx/fl/fldefs.h -include/wx/fl/frmview.h -include/wx/fl/garbagec.h -include/wx/fl/gcupdatesmgr.h -include/wx/fl/hintanimpl.h -include/wx/fl/newbmpbtn.h -include/wx/fl/panedrawpl.h -include/wx/fl/rowdragpl.h -include/wx/fl/rowlayoutpl.h -include/wx/fl/toolwnd.h -include/wx/fl/updatesmgr.h -include/wx/gizmos/dynamicsash.h -include/wx/gizmos/editlbox.h -include/wx/gizmos/ledctrl.h -include/wx/gizmos/multicell.h -include/wx/gizmos/splittree.h -include/wx/net/email.h -include/wx/net/msg.h -include/wx/net/web.h -include/wx/ogl/basic.h -include/wx/ogl/basicp.h -include/wx/ogl/bmpshape.h -include/wx/ogl/canvas.h -include/wx/ogl/composit.h -include/wx/ogl/constrnt.h -include/wx/ogl/divided.h -include/wx/ogl/drawn.h -include/wx/ogl/drawnp.h -include/wx/ogl/lines.h -include/wx/ogl/linesp.h -include/wx/ogl/mfutils.h -include/wx/ogl/misc.h -include/wx/ogl/ogl.h -include/wx/ogl/ogldiag.h -include/wx/plot/plot.h -include/wx/stc/stc.h -include/wx/svg/dcsvg.h -include/wx/xrc/xh_all.h -include/wx/xrc/xh_bmp.h -include/wx/xrc/xh_bmpbt.h -include/wx/xrc/xh_bttn.h -include/wx/xrc/xh_cald.h -include/wx/xrc/xh_chckb.h -include/wx/xrc/xh_chckl.h -include/wx/xrc/xh_choic.h -include/wx/xrc/xh_combo.h -include/wx/xrc/xh_dlg.h -include/wx/xrc/xh_frame.h -include/wx/xrc/xh_gauge.h -include/wx/xrc/xh_gdctl.h -include/wx/xrc/xh_html.h -include/wx/xrc/xh_listb.h -include/wx/xrc/xh_listc.h -include/wx/xrc/xh_menu.h -include/wx/xrc/xh_notbk.h -include/wx/xrc/xh_panel.h -include/wx/xrc/xh_radbt.h -include/wx/xrc/xh_radbx.h -include/wx/xrc/xh_scrol.h -include/wx/xrc/xh_scwin.h -include/wx/xrc/xh_sizer.h -include/wx/xrc/xh_slidr.h -include/wx/xrc/xh_spin.h -include/wx/xrc/xh_split.h -include/wx/xrc/xh_stbmp.h -include/wx/xrc/xh_stbox.h -include/wx/xrc/xh_stlin.h -include/wx/xrc/xh_sttxt.h -include/wx/xrc/xh_text.h -include/wx/xrc/xh_toolb.h -include/wx/xrc/xh_tree.h -include/wx/xrc/xh_unkwn.h -include/wx/xrc/xh_wizrd.h -include/wx/xrc/xml.h -include/wx/xrc/xmlres.h -@dirrm include/wx/xrc -@dirrm include/wx/svg -@dirrm include/wx/stc -@dirrm include/wx/plot -@dirrm include/wx/ogl -@dirrm include/wx/net -@dirrm include/wx/gizmos -@dirrm include/wx/fl -@dirrm include/wx/canvas diff --git a/x11-toolkits/wxgtk-contrib/Makefile b/x11-toolkits/wxgtk-contrib/Makefile deleted file mode 100644 index a7571bb08781..000000000000 --- a/x11-toolkits/wxgtk-contrib/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: wxgtk-contrib -# Date created: November 4, 2003 -# Whom: fjoe@FreeBSD.ORG -# -# $FreeBSD$ -# - -PORTREVISION= 2 - -MAINTAINER= fjoe@FreeBSD.org -COMMENT= The wxWidgets GUI toolkit contributed libraries - -WXGTK_FLAVOR= gtk-contrib -MASTERDIR= ${.CURDIR}/../wxgtk - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk-contrib/pkg-plist b/x11-toolkits/wxgtk-contrib/pkg-plist deleted file mode 100644 index e2b142c75bf6..000000000000 --- a/x11-toolkits/wxgtk-contrib/pkg-plist +++ /dev/null @@ -1,18 +0,0 @@ -lib/libwx_gtk_canvas-2.4.so -lib/libwx_gtk_canvas-2.4.so.0 -lib/libwx_gtk_dcsvg-2.4.so -lib/libwx_gtk_dcsvg-2.4.so.0 -lib/libwx_gtk_fl-2.4.so -lib/libwx_gtk_fl-2.4.so.0 -lib/libwx_gtk_gizmos-2.4.so -lib/libwx_gtk_gizmos-2.4.so.0 -lib/libwx_gtk_net-2.4.so -lib/libwx_gtk_net-2.4.so.0 -lib/libwx_gtk_ogl-2.4.so -lib/libwx_gtk_ogl-2.4.so.0 -lib/libwx_gtk_plot-2.4.so -lib/libwx_gtk_plot-2.4.so.0 -lib/libwx_gtk_stc-2.4.so -lib/libwx_gtk_stc-2.4.so.0 -lib/libwx_gtk_xrc-2.4.so -lib/libwx_gtk_xrc-2.4.so.0 diff --git a/x11-toolkits/wxgtk-docs/Makefile b/x11-toolkits/wxgtk-docs/Makefile deleted file mode 100644 index 5cceb1768391..000000000000 --- a/x11-toolkits/wxgtk-docs/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# New ports collection makefile for: wxgtk_doc -# Date created: 1 Apr 23:51:14 2003 CEST -# Whom: Michal Pasternak <dotz@irc.pl> -# -# $FreeBSD$ -# - -PORTNAME= wxgtk_doc -PORTVERSION= 2.4.2 -CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows -DISTNAME= wxWindows-${PORTVERSION}-HTML - -MAINTAINER= ports@FreeBSD.org -COMMENT= wxWindows documentation in HTML - -NO_BUILD= YES -USE_REINPLACE= YES -USE_ZIP= YES - -WXGTKDOCDIR= ${PREFIX}/share/doc/${PORTNAME}/html/ -WRKSRC= ${WRKDIR}/wxWindows-${PORTVERSION}/docs/html/ - -post-patch: - @${REINPLACE_CMD} -e 's|../pdf/wxTutorial.pdf|http://users.skynet.be/saw/download/wxWindows/wxTutorial.pdf|' ${WRKSRC}/index.htm - -do-install: - @${MKDIR} ${WXGTKDOCDIR} - @${CP} -R ${WRKSRC}/* ${WXGTKDOCDIR} - -post-install: - @(cd ${WRKSRC} && ${FIND} * -type f | ${XARGS} printf "share/doc/${PORTNAME}/html/%s\n" >> ${TMPPLIST}) - @(cd ${WRKSRC} && ${FIND} * -type d | ${XARGS} printf "@dirrm share/doc/${PORTNAME}/html/%s\n" >> ${TMPPLIST}) - @${ECHO} @dirrm share/doc/${PORTNAME}/html >> ${TMPPLIST} - @${ECHO} @dirrm share/doc/${PORTNAME} >> ${TMPPLIST} - -.include <bsd.port.mk> diff --git a/x11-toolkits/wxgtk-docs/distinfo b/x11-toolkits/wxgtk-docs/distinfo deleted file mode 100644 index b2ddd94a16c1..000000000000 --- a/x11-toolkits/wxgtk-docs/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (wxWindows-2.4.2-HTML.zip) = 700292c9f97114f7f65e6d023b1dd9c5 -SIZE (wxWindows-2.4.2-HTML.zip) = 1560015 diff --git a/x11-toolkits/wxgtk-docs/pkg-descr b/x11-toolkits/wxgtk-docs/pkg-descr deleted file mode 100644 index 9a66e42e3cf6..000000000000 --- a/x11-toolkits/wxgtk-docs/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -wxGTK documentation - -WWW: http://www.wxwindows.org/ diff --git a/x11-toolkits/wxgtk-docs/pkg-plist b/x11-toolkits/wxgtk-docs/pkg-plist deleted file mode 100644 index 435f005646ca..000000000000 --- a/x11-toolkits/wxgtk-docs/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment automatically generated plist diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile deleted file mode 100644 index 9b0fc3d7bfa3..000000000000 --- a/x11-toolkits/wxgtk/Makefile +++ /dev/null @@ -1,98 +0,0 @@ -# New ports collection makefile for: wxGTK -# Date created: September 18, 1999 -# Whom: nectar@FreeBSD.ORG -# -# $FreeBSD$ -# - -PORTNAME= wx -PORTVERSION= 2.4.2 -PORTREVISION?= 8 -PKGNAMESUFFIX= ${WXGTK_FLAVOR} -CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= wxwindows -DISTNAME= wxGTK-${PORTVERSION} - -MAINTAINER?= fjoe@FreeBSD.org -COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings - -LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ - tiff.4:${PORTSDIR}/graphics/tiff - -USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GL= yes -USE_GMAKE= yes -USE_ICONV= yes -USE_REINPLACE= yes -GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-libpng=sys \ - --with-libjpeg=sys \ - --with-libtiff=sys \ - --with-zlib=sys \ - --with-opengl -CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include \ - -I${LOCALBASE}/include \ - -I${X11BASE}/include \ - ${PTHREAD_CFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv \ - -L${X11BASE}/lib \ - ${PTHREAD_LIBS}" -MAKE_ENV= WXGTK_FLAVOR="${WXGTK_FLAVOR}" -PLIST= ${.CURDIR}/pkg-plist - -WXGTK_FLAVOR?= gtk - -.if ${WXGTK_FLAVOR} != "gtk-common" -RUN_DEPENDS= ${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk-common -.endif - -.if ${WXGTK_FLAVOR:M*-common} != "" -NO_BUILD= yes -INSTALL_TARGET= install-common -.endif # *-common - -.if ${WXGTK_FLAVOR:M*-contrib*} != "" -BUILD_WRKSRC= ${WRKSRC}/contrib/src -INSTALL_WRKSRC= ${BUILD_WRKSRC} - -.if ${WXGTK_FLAVOR} != "gtk-contrib-common" -RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk-contrib-common -.if ${WXGTK_FLAVOR} == "gtk-contrib" -LIB_DEPENDS+= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk -.elif ${WXGTK_FLAVOR} == "gtk2-contrib" -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 -.elif ${WXGTK_FLAVOR} == "gtk2-unicode-contrib" -LIB_DEPENDS+= wx_gtk2u-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-unicode -.endif -.endif # !gtk-contrib-common -.endif # *-contrib* - -.if ${WXGTK_FLAVOR:Mgtk2*} != "" -USE_GNOME= gtk20 -CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL} -.else -USE_GNOME= gtk12 -CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET} -.endif - -.include <bsd.port.pre.mk> - -.if ${WXGTK_FLAVOR:M*-unicode*} != "" -.if ${OSVERSION} < 500000 -IGNORE= Systems prior to FreeBSD 5.0 currently out of support -.endif -CONFIGURE_ARGS+=--enable-unicode -.endif # *-unicode* - -pre-patch: -.if ${WXGTK_FLAVOR:Mgtk2*} != "" - @${REINPLACE_CMD} -e 's|lgdk|lgdk-x11-2.0|g' ${WRKSRC}/configure -.else - @${REINPLACE_CMD} -e 's|lgdk|lgdk12|g' ${WRKSRC}/configure -.endif - -.include <bsd.port.post.mk> diff --git a/x11-toolkits/wxgtk/distinfo b/x11-toolkits/wxgtk/distinfo deleted file mode 100644 index ef14fe7e73b5..000000000000 --- a/x11-toolkits/wxgtk/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (wxGTK-2.4.2.tar.bz2) = cdadfe82fc93f8a65a2ae18a95b0b0e3 -SIZE (wxGTK-2.4.2.tar.bz2) = 5381935 diff --git a/x11-toolkits/wxgtk/files/patch-ac b/x11-toolkits/wxgtk/files/patch-ac deleted file mode 100644 index b95baddfc8c5..000000000000 --- a/x11-toolkits/wxgtk/files/patch-ac +++ /dev/null @@ -1,124 +0,0 @@ ---- Makefile.in.orig Sun Sep 21 18:31:27 2003 -+++ Makefile.in Tue Nov 4 22:33:54 2003 -@@ -332,17 +332,13 @@ - - $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@ - cd $(build_libdir) \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ -+ && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ - - $(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@ - @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@ - cd $(build_libdir) \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ -+ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ - - $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h - -@@ -371,28 +367,23 @@ - - CREATE_INSTALLED_LINKS: preinstall - $(RM) $(libdir)/@WX_LIBRARY_LINK1@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK2@ - cd $(libdir) \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ -+ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ - - CREATE_INSTALLED_LINKS_GL: preinstall_gl - $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - cd $(libdir) \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ -+ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ - --afminstall: preinstall -+afminstall: - @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi - $(INSTALL) -d $(datadir)/wx -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN) -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm -- $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm -- $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm -+ $(INSTALL) -d $(datadir)/wx/afm -+ $(INSTALL) -d $(datadir)/wx/gs_afm -+ $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm -+ $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm - --m4datainstall: preinstall -+m4datainstall: - $(INSTALL) -d $(datadir)/aclocal - $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal - -@@ -410,7 +401,7 @@ - - # this is the real install target: copies the library, wx-config and the - # headers to the installation directory --preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config -+install-common: @AFMINSTALL@ m4datainstall @WIN32INSTALL@ - @echo " " - @echo " Installing wxWindows..." - @echo " " -@@ -419,26 +410,11 @@ - @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi - @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi - -- $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config -- cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config -- @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ -- @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ -- $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi -- -- $(INSTALL) -d $(libdir)/wx -- $(INSTALL) -d $(libdir)/wx/include -- $(INSTALL) -d $(libdir)/wx/include/univ -- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ -- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx -- $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ -- $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h -- - $(INSTALL) -d $(includedir)/wx - @# FIXME: This will erroneously install a wx/base dir for wxBase.. - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi -- @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi - @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi - - @# always install msw headers for wxBase, it's much simpler -@@ -459,6 +435,19 @@ - echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ - done - -+preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config -+ $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config -+ @if test "$(WXGTK_FLAVOR)" = "gtk2"; then \ -+ cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config; \ -+ fi -+ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ -+ @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ -+ $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi -+ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@ -+ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx -+ $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ -+ $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx/setup.h -+ - preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ - @echo " " - @echo " Installing wxWindows Mac resource ..." -@@ -474,7 +463,7 @@ - @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi - @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ - --install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@ -+install: @WX_ALL_INSTALLED@ - @echo " " - @echo " The installation of wxWindows is finished. On certain" - @echo " platforms (e.g. Linux) you'll now have to run ldconfig" diff --git a/x11-toolkits/wxgtk/files/patch-configure b/x11-toolkits/wxgtk/files/patch-configure deleted file mode 100644 index 2236f9edacee..000000000000 --- a/x11-toolkits/wxgtk/files/patch-configure +++ /dev/null @@ -1,73 +0,0 @@ ---- configure.orig Tue Nov 4 19:54:04 2003 -+++ configure Tue Nov 4 20:12:59 2003 -@@ -11731,7 +11731,7 @@ - - - if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then -- if test "$USE_DARWIN" = 1; then -+ if test "$USE_DARWIN" = 1 -o "$USE_FREEBSD" = 1; then - system_zlib_h_ok="yes" - else - echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6 -@@ -16099,6 +16099,13 @@ - WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc" - fi - ;; -+ -+ *-*-freebsd* ) -+ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" -+ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" -+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}" -+ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" -+ ;; - esac - - WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" -@@ -18679,7 +18686,7 @@ - ;; - esac - -- THREAD_OPTS="$THREAD_OPTS pthread none" -+ THREAD_OPTS= - - THREADS_OK=no - for flag in $THREAD_OPTS; do -@@ -18736,6 +18743,8 @@ - THREADS_CFLAGS="" - done - -+ THREADS_OK=yes -+ - if test "x$THREADS_OK" != "xyes"; then - wxUSE_THREADS=no - echo "configure: warning: No thread support on this system... disabled" 1>&2 -@@ -18752,7 +18761,6 @@ - flag="-D_THREAD_SAFE" - ;; - *-freebsd*) -- flag="-D_THREAD_SAFE" - ;; - *-hp-hpux* ) - flag="-D_REENTRANT" -@@ -19529,21 +19537,6 @@ - CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections" - ;; - esac --fi -- --if test "$wxUSE_OPTIMISE" = "no" ; then -- OPTIMISE= --else -- if test "$GCC" = yes ; then -- OPTIMISE="-O2" -- case "${host}" in -- i586-*-*|i686-*-* ) -- OPTIMISE="${OPTIMISE} " -- ;; -- esac -- else -- OPTIMISE="-O" -- fi - fi - - if test "$WXWIN_COMPATIBILITY_2" = "yes"; then diff --git a/x11-toolkits/wxgtk/files/patch-contrib-include-wx-fl-frmview.h b/x11-toolkits/wxgtk/files/patch-contrib-include-wx-fl-frmview.h deleted file mode 100644 index 57217e446561..000000000000 --- a/x11-toolkits/wxgtk/files/patch-contrib-include-wx-fl-frmview.h +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/include/wx/fl/frmview.h.orig Wed Nov 5 00:02:21 2003 -+++ contrib/include/wx/fl/frmview.h Wed Nov 5 00:03:08 2003 -@@ -114,7 +114,7 @@ - - // if file name is empty, views are are not saved/loaded - -- virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = "" ); -+ virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = wxEmptyString ); - - // synonyms - wxFrame* GetParentFrame(); diff --git a/x11-toolkits/wxgtk/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk/files/patch-contrib-src-Makefile.in deleted file mode 100644 index 5d9fe0443f8e..000000000000 --- a/x11-toolkits/wxgtk/files/patch-contrib-src-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- contrib/src/Makefile.in.orig Sun Sep 21 18:32:39 2003 -+++ contrib/src/Makefile.in Tue Nov 4 22:30:37 2003 -@@ -1,6 +1,6 @@ - # $Id: Makefile.in,v 1.13.2.1 2003/07/28 08:23:09 VS Exp $ - --CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc animate #applet -+CONTRIB_SUBDIRS=canvas fl gizmos net ogl plot stc svg xrc #animate applet mmedia - - all: - @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done -@@ -10,6 +10,9 @@ - - install: - @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install); done -+ -+install-common: -+ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install-common); done - - uninstall: - @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) uninstall); done diff --git a/x11-toolkits/wxgtk/files/patch-contrib-src-gizmos-multicell.cpp b/x11-toolkits/wxgtk/files/patch-contrib-src-gizmos-multicell.cpp deleted file mode 100644 index 88d6778914ba..000000000000 --- a/x11-toolkits/wxgtk/files/patch-contrib-src-gizmos-multicell.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- contrib/src/gizmos/multicell.cpp.orig Wed Nov 5 00:04:44 2003 -+++ contrib/src/gizmos/multicell.cpp Wed Nov 5 00:06:11 2003 -@@ -633,17 +633,12 @@ - m_minCellSize = wxSize(5, 5); - } - //--------------------------------------------------------------------------- --wxString itoa(int x) --{ -- char bfr[255]; -- sprintf(bfr, "%d", x); -- return bfr; --} --//--------------------------------------------------------------------------- - void wxMultiCellCanvas :: Add(wxWindow *win, unsigned int row, unsigned int col) - { -- wxASSERT_MSG(row >= 0 && row < m_maxRows, wxString("Row ") + itoa(row) + " out of bounds (" + itoa(m_maxRows) + ")"); -- wxASSERT_MSG(col >= 0 && col < m_maxCols, wxString("Column ") + itoa(col) + " out of bounds (" + itoa(m_maxCols) + ")"); -+ wxASSERT_MSG(row >= 0 && row < m_maxRows, -+ wxString::Format(_T("Row %d out of bounds (0..%d)"), row, m_maxRows) ); -+ wxASSERT_MSG(col >= 0 && col < m_maxCols, -+ wxString::Format(_T("Column %d out of bounds (0..%d)"), col, m_maxCols) ); - wxASSERT_MSG(m_cells[CELL_LOC(row, col)] == NULL, wxT("Cell already occupied")); - - wxCell *newCell = new wxCell(win); -@@ -660,7 +655,7 @@ - if (!m_cells[CELL_LOC(row, col)]) - { - // Create an empty static text field as a placeholder -- m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, "")); -+ m_cells[CELL_LOC(row, col)] = new wxCell(new wxStaticText(m_parent, -1, wxT(""))); - } - wxFlexGridSizer::Add(m_cells[CELL_LOC(row, col)]->m_window); - } diff --git a/x11-toolkits/wxgtk/files/patch-contrib-src-plot-plot.cpp b/x11-toolkits/wxgtk/files/patch-contrib-src-plot-plot.cpp deleted file mode 100644 index ff6fc281b199..000000000000 --- a/x11-toolkits/wxgtk/files/patch-contrib-src-plot-plot.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- contrib/src/plot/plot.cpp.orig Wed Nov 5 00:03:37 2003 -+++ contrib/src/plot/plot.cpp Wed Nov 5 00:04:27 2003 -@@ -204,7 +204,7 @@ - END_EVENT_TABLE() - - wxPlotArea::wxPlotArea( wxPlotWindow *parent ) -- : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, "plotarea" ) -+ : wxWindow( parent, -1, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER, _T("plotarea") ) - { - m_owner = parent; - -@@ -462,7 +462,7 @@ - END_EVENT_TABLE() - - wxPlotXAxisArea::wxPlotXAxisArea( wxPlotWindow *parent ) -- : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, "plotxaxisarea" ) -+ : wxWindow( parent, -1, wxDefaultPosition, wxSize(-1,40), 0, _T("plotxaxisarea") ) - { - m_owner = parent; - -@@ -589,7 +589,7 @@ - END_EVENT_TABLE() - - wxPlotYAxisArea::wxPlotYAxisArea( wxPlotWindow *parent ) -- : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, "plotyaxisarea" ) -+ : wxWindow( parent, -1, wxDefaultPosition, wxSize(60,-1), 0, _T("plotyaxisarea") ) - { - m_owner = parent; - -@@ -713,7 +713,7 @@ - END_EVENT_TABLE() - - wxPlotWindow::wxPlotWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag ) -- : wxScrolledWindow( parent, id, pos, size, flag, "plotcanvas" ) -+ : wxScrolledWindow( parent, id, pos, size, flag, _T("plotcanvas") ) - { - m_xUnitsPerValue = 1.0; - m_xZoom = 1.0; diff --git a/x11-toolkits/wxgtk/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk/files/patch-include::wx::wxchar.h deleted file mode 100644 index f0fd474d8047..000000000000 --- a/x11-toolkits/wxgtk/files/patch-include::wx::wxchar.h +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- include/wx/wxchar.h.orig Sun Sep 15 21:19:48 2002 -+++ include/wx/wxchar.h Sat Oct 26 18:06:12 2002 -@@ -554,10 +554,10 @@ - #endif // wxUSE_WCHAR_T - - // checks whether the passed in pointer is NULL and if the string is empty --inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } -+WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } - - // safe version of strlen() (returns 0 if passed NULL pointer) --inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; } -+WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; } - - WXDLLEXPORT bool wxOKlibc(); // for internal use - diff --git a/x11-toolkits/wxgtk/files/patch-src-common-datetime.cpp b/x11-toolkits/wxgtk/files/patch-src-common-datetime.cpp deleted file mode 100644 index f4931273f720..000000000000 --- a/x11-toolkits/wxgtk/files/patch-src-common-datetime.cpp +++ /dev/null @@ -1,56 +0,0 @@ ---- src/common/datetime.cpp.orig Tue Nov 4 09:50:09 2003 -+++ src/common/datetime.cpp Tue Nov 4 09:52:02 2003 -@@ -349,6 +349,35 @@ - return wxString(buf); - } - -+#ifdef HAVE_STRPTIME -+ -+// Unicode-friendly strptime() wrapper -+static const wxChar * -+CallStrptime(const wxChar *input, const char *fmt, tm *tm) -+{ -+ // the problem here is that strptime() returns pointer into the string we -+ // passed to it while we're really interested in the pointer into the -+ // original, Unicode, string so we try to transform the pointer back -+#if wxUSE_UNICODE -+ wxCharBuffer inputMB(wxConvertWX2MB(input)); -+#else // ASCII -+ const char * const inputMB = input; -+#endif // Unicode/Ascii -+ -+ const char *result = strptime(inputMB, fmt, tm); -+ if ( !result ) -+ return NULL; -+ -+#if wxUSE_UNICODE -+ // FIXME: this is wrong in presence of surrogates &c -+ return input + (result - inputMB.data()); -+#else // ASCII -+ return result; -+#endif // Unicode/Ascii -+} -+ -+#endif // HAVE_STRPTIME -+ - // if year and/or month have invalid values, replace them with the current ones - static void ReplaceDefaultYearMonthWithCurrent(int *year, - wxDateTime::Month *month) -@@ -2920,7 +2949,7 @@ - // to our generic code anyhow (FIXME !Unicode friendly) - { - struct tm tm; -- const wxChar *result = strptime(input, "%x", &tm); -+ const wxChar *result = CallStrptime(input, "%x", &tm); - if ( result ) - { - input = result; -@@ -2985,7 +3014,7 @@ - { - // use strptime() to do it for us (FIXME !Unicode friendly) - struct tm tm; -- input = strptime(input, "%X", &tm); -+ input = CallStrptime(input, "%X", &tm); - if ( !input ) - { - return (wxChar *)NULL; diff --git a/x11-toolkits/wxgtk/files/patch-src-gtk-notebook.cpp b/x11-toolkits/wxgtk/files/patch-src-gtk-notebook.cpp deleted file mode 100644 index 1aae1c52f5fa..000000000000 --- a/x11-toolkits/wxgtk/files/patch-src-gtk-notebook.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gtk/notebook.cpp.orig Sun Sep 21 18:31:57 2003 -+++ src/gtk/notebook.cpp Mon Nov 10 03:26:16 2003 -@@ -643,7 +643,7 @@ - nb_page->m_text = text; - if (nb_page->m_text.IsEmpty()) nb_page->m_text = wxT(""); - -- nb_page->m_label = GTK_LABEL( gtk_label_new(nb_page->m_text.mbc_str()) ); -+ nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) ); - gtk_box_pack_end( GTK_BOX(nb_page->m_box), GTK_WIDGET(nb_page->m_label), FALSE, FALSE, m_padding ); - - /* show the label */ diff --git a/x11-toolkits/wxgtk/files/patch-src-makelib.env.in b/x11-toolkits/wxgtk/files/patch-src-makelib.env.in deleted file mode 100644 index 17ce4b33fced..000000000000 --- a/x11-toolkits/wxgtk/files/patch-src-makelib.env.in +++ /dev/null @@ -1,61 +0,0 @@ ---- src/makelib.env.in.orig Sun Sep 21 18:31:38 2003 -+++ src/makelib.env.in Tue Nov 4 22:33:31 2003 -@@ -35,8 +35,8 @@ - INSTALL_DATA = @INSTALL_DATA@ - - TARGETLIB_STATIC = $(TARGET_LIBNAME).a --TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) --TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) -+TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) -+TARGETLIB_LINK1 = $(TARGET_LIBNAME).so - TARGETLIB_LINK2 = $(TARGET_LIBNAME).so - - TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@ -@@ -72,9 +72,8 @@ - @$(INSTALL) -d $(top_builddir)/lib - $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING) - cd $(top_builddir)/lib \ -- && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) -+ && $(RM) $(TARGETLIB_LINK1) \ -+ && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) - - $(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS) - @$(INSTALL) -d $(top_builddir)/lib -@@ -82,14 +81,15 @@ - $(AR) $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - --install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers -+install: install_@WX_TARGET_LIBRARY_TYPE@ -+ -+install-common: install_headers - - install_so: - $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED) -- @$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2) -+ @$(RM) $(libdir)/$(TARGETLIB_LINK1) - cd $(libdir) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) -+ && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) - - install_a: - $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC) -@@ -105,7 +105,6 @@ - $(RM) $(libdir)/$(TARGETLIB_STATIC) - $(RM) $(libdir)/$(TARGETLIB_SHARED) - $(RM) $(libdir)/$(TARGETLIB_LINK1) -- $(RM) $(libdir)/$(TARGETLIB_LINK2) - @echo "removing headers" - @for h in $(HEADERS); do \ - $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ -@@ -118,7 +117,6 @@ - clean: - $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \ - $(top_builddir)/lib/$(TARGETLIB_LINK1) \ -- $(top_builddir)/lib/$(TARGETLIB_LINK2) \ - $(top_builddir)/lib/$(TARGETLIB_STATIC) core - - .PHONY: all libtype_so libtype_a install install_so install_a install_headers uninstall clean diff --git a/x11-toolkits/wxgtk/files/patch-src_common_intl.cpp b/x11-toolkits/wxgtk/files/patch-src_common_intl.cpp deleted file mode 100644 index f8e465e4cbc3..000000000000 --- a/x11-toolkits/wxgtk/files/patch-src_common_intl.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- src/common/intl.cpp.orig Sat Oct 4 23:10:24 2003 -+++ src/common/intl.cpp Sun Oct 5 21:35:30 2003 -@@ -743,8 +742,18 @@ - } - if ( !retloc ) - { -+ wxString langFull; -+ if (wxGetEnv(wxT("LC_ALL"), &langFull)|| -+ wxGetEnv(wxT("LC_MESSAGES"), &langFull) || -+ wxGetEnv(wxT("LANG"), &langFull)) -+ { -+ retloc = wxSetlocale(LC_ALL, langFull); -+ } -+ } -+ if ( !retloc ) -+ { - wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str()); -- return FALSE; -+ //return FALSE; - } - #elif defined(__WIN32__) - diff --git a/x11-toolkits/wxgtk/files/patch-wx-config.in b/x11-toolkits/wxgtk/files/patch-wx-config.in deleted file mode 100644 index a7ed9b6792da..000000000000 --- a/x11-toolkits/wxgtk/files/patch-wx-config.in +++ /dev/null @@ -1,11 +0,0 @@ ---- wx-config.in.orig Wed Nov 5 00:19:46 2003 -+++ wx-config.in Wed Nov 5 00:20:14 2003 -@@ -66,7 +66,7 @@ - if test $inplace_flag = yes ; then - includes="-I$inplace_builddir/lib/wx/include/@TOOLCHAIN_NAME@ -I$inplace_include" - else -- includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@$includes" -+ includes="-I@prefix@/include/wx/@TOOLCHAIN_NAME@$includes" - fi - - if test $static_flag = yes ; then diff --git a/x11-toolkits/wxgtk/pkg-descr b/x11-toolkits/wxgtk/pkg-descr deleted file mode 100644 index 67f1f41d315b..000000000000 --- a/x11-toolkits/wxgtk/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -wxWidgets (formerly known as wxWindows) is a C++ GUI framework for platform -independent software development. On FreeBSD the Gtk toolkit is used. - -WWW: http://www.wxwidgets.org/ diff --git a/x11-toolkits/wxgtk/pkg-plist b/x11-toolkits/wxgtk/pkg-plist deleted file mode 100644 index c4b6537e54b5..000000000000 --- a/x11-toolkits/wxgtk/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/wxgtk-2.4-config -include/wx/gtk-2.4/wx/setup.h -lib/libwx_gtk-2.4.so -lib/libwx_gtk-2.4.so.0 -lib/libwx_gtk_gl-2.4.so -lib/libwx_gtk_gl-2.4.so.0 -@dirrm include/wx/gtk-2.4/wx -@dirrm include/wx/gtk-2.4 diff --git a/x11-toolkits/wxgtk2-contrib/Makefile b/x11-toolkits/wxgtk2-contrib/Makefile deleted file mode 100644 index 73a84aace39e..000000000000 --- a/x11-toolkits/wxgtk2-contrib/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: wxgtk2-contrib -# Date created: November 5, 2003 -# Whom: fjoe@FreeBSD.ORG -# -# $FreeBSD$ -# - -PORTREVISION= 4 - -MAINTAINER= fjoe@FreeBSD.org -COMMENT= The wxWidgets GUI toolkit contributed libraries (GTK2 version) - -WXGTK_FLAVOR= gtk2-contrib -MASTERDIR= ${.CURDIR}/../wxgtk - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk2-contrib/pkg-plist b/x11-toolkits/wxgtk2-contrib/pkg-plist deleted file mode 100644 index 622362868a35..000000000000 --- a/x11-toolkits/wxgtk2-contrib/pkg-plist +++ /dev/null @@ -1,18 +0,0 @@ -lib/libwx_gtk2_canvas-2.4.so -lib/libwx_gtk2_canvas-2.4.so.0 -lib/libwx_gtk2_dcsvg-2.4.so -lib/libwx_gtk2_dcsvg-2.4.so.0 -lib/libwx_gtk2_fl-2.4.so -lib/libwx_gtk2_fl-2.4.so.0 -lib/libwx_gtk2_gizmos-2.4.so -lib/libwx_gtk2_gizmos-2.4.so.0 -lib/libwx_gtk2_net-2.4.so -lib/libwx_gtk2_net-2.4.so.0 -lib/libwx_gtk2_ogl-2.4.so -lib/libwx_gtk2_ogl-2.4.so.0 -lib/libwx_gtk2_plot-2.4.so -lib/libwx_gtk2_plot-2.4.so.0 -lib/libwx_gtk2_stc-2.4.so -lib/libwx_gtk2_stc-2.4.so.0 -lib/libwx_gtk2_xrc-2.4.so -lib/libwx_gtk2_xrc-2.4.so.0 diff --git a/x11-toolkits/wxgtk2-unicode-contrib/Makefile b/x11-toolkits/wxgtk2-unicode-contrib/Makefile deleted file mode 100644 index 865a316c2bce..000000000000 --- a/x11-toolkits/wxgtk2-unicode-contrib/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: wxgtk2-unicode-contrib -# Date created: November 5, 2003 -# Whom: fjoe@FreeBSD.ORG -# -# $FreeBSD$ -# - -PORTREVISION= 4 - -MAINTAINER= fjoe@FreeBSD.org -COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode version) - -WXGTK_FLAVOR= gtk2-unicode-contrib -MASTERDIR= ${.CURDIR}/../wxgtk - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk2-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk2-unicode-contrib/pkg-plist deleted file mode 100644 index 2ad88887dbff..000000000000 --- a/x11-toolkits/wxgtk2-unicode-contrib/pkg-plist +++ /dev/null @@ -1,18 +0,0 @@ -lib/libwx_gtk2u_canvas-2.4.so -lib/libwx_gtk2u_canvas-2.4.so.0 -lib/libwx_gtk2u_dcsvg-2.4.so -lib/libwx_gtk2u_dcsvg-2.4.so.0 -lib/libwx_gtk2u_fl-2.4.so -lib/libwx_gtk2u_fl-2.4.so.0 -lib/libwx_gtk2u_gizmos-2.4.so -lib/libwx_gtk2u_gizmos-2.4.so.0 -lib/libwx_gtk2u_net-2.4.so -lib/libwx_gtk2u_net-2.4.so.0 -lib/libwx_gtk2u_ogl-2.4.so -lib/libwx_gtk2u_ogl-2.4.so.0 -lib/libwx_gtk2u_plot-2.4.so -lib/libwx_gtk2u_plot-2.4.so.0 -lib/libwx_gtk2u_stc-2.4.so -lib/libwx_gtk2u_stc-2.4.so.0 -lib/libwx_gtk2u_xrc-2.4.so -lib/libwx_gtk2u_xrc-2.4.so.0 diff --git a/x11-toolkits/wxgtk2-unicode/Makefile b/x11-toolkits/wxgtk2-unicode/Makefile deleted file mode 100644 index 9158f14a9aba..000000000000 --- a/x11-toolkits/wxgtk2-unicode/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: wxgtk2-unicode -# Date created: November 4, 2003 -# Whom: fjoe@FreeBSD.ORG -# -# $FreeBSD$ -# - -PORTREVISION= 4 - -MAINTAINER= fjoe@FreeBSD.org -COMMENT= The wxWidgets GUI toolkit (Unicode version) - -WXGTK_FLAVOR= gtk2-unicode -MASTERDIR= ${.CURDIR}/../wxgtk - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk2-unicode/pkg-plist b/x11-toolkits/wxgtk2-unicode/pkg-plist deleted file mode 100644 index 6dac093e324a..000000000000 --- a/x11-toolkits/wxgtk2-unicode/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/wxgtk2u-2.4-config -include/wx/gtk2u-2.4/wx/setup.h -lib/libwx_gtk2u-2.4.so -lib/libwx_gtk2u-2.4.so.0 -lib/libwx_gtk2u_gl-2.4.so -lib/libwx_gtk2u_gl-2.4.so.0 -@dirrm include/wx/gtk2u-2.4/wx -@dirrm include/wx/gtk2u-2.4 diff --git a/x11-toolkits/wxgtk2/Makefile b/x11-toolkits/wxgtk2/Makefile deleted file mode 100644 index 9ee5c57a9b92..000000000000 --- a/x11-toolkits/wxgtk2/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: wxgtk2 -# Date created: November 4, 2003 -# Whom: fjoe@FreeBSD.ORG -# -# $FreeBSD$ -# - -PORTREVISION= 6 - -MAINTAINER= fjoe@FreeBSD.org -COMMENT= The wxWidgets GUI toolkit (GTK2 version) - -WXGTK_FLAVOR= gtk2 -MASTERDIR= ${.CURDIR}/../wxgtk - -.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk2/pkg-plist b/x11-toolkits/wxgtk2/pkg-plist deleted file mode 100644 index 31ad6573ae9c..000000000000 --- a/x11-toolkits/wxgtk2/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/wx-config -bin/wxgtk2-2.4-config -include/wx/gtk2-2.4/wx/setup.h -lib/libwx_gtk2-2.4.so -lib/libwx_gtk2-2.4.so.0 -lib/libwx_gtk2_gl-2.4.so -lib/libwx_gtk2_gl-2.4.so.0 -@dirrm include/wx/gtk2-2.4/wx -@dirrm include/wx/gtk2-2.4 diff --git a/x11-toolkits/wxgtk24-contrib/Makefile b/x11-toolkits/wxgtk24-contrib/Makefile index a7571bb08781..40c9814db1ab 100644 --- a/x11-toolkits/wxgtk24-contrib/Makefile +++ b/x11-toolkits/wxgtk24-contrib/Makefile @@ -5,12 +5,16 @@ # $FreeBSD$ # -PORTREVISION= 2 +PORTREVISION= 3 MAINTAINER= fjoe@FreeBSD.org COMMENT= The wxWidgets GUI toolkit contributed libraries -WXGTK_FLAVOR= gtk-contrib -MASTERDIR= ${.CURDIR}/../wxgtk +WXGTK_FLAVOR= gtk2-contrib +MASTERDIR= ${.CURDIR}/../wxgtk24 +LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 + +BUILD_WRKSRC= ${WRKSRC}/contrib/src +INSTALL_WRKSRC= ${BUILD_WRKSRC} .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/wxgtk24-contrib/pkg-plist b/x11-toolkits/wxgtk24-contrib/pkg-plist index e2b142c75bf6..ba5a083a6f6a 100644 --- a/x11-toolkits/wxgtk24-contrib/pkg-plist +++ b/x11-toolkits/wxgtk24-contrib/pkg-plist @@ -1,18 +1,114 @@ -lib/libwx_gtk_canvas-2.4.so -lib/libwx_gtk_canvas-2.4.so.0 -lib/libwx_gtk_dcsvg-2.4.so -lib/libwx_gtk_dcsvg-2.4.so.0 -lib/libwx_gtk_fl-2.4.so -lib/libwx_gtk_fl-2.4.so.0 -lib/libwx_gtk_gizmos-2.4.so -lib/libwx_gtk_gizmos-2.4.so.0 -lib/libwx_gtk_net-2.4.so -lib/libwx_gtk_net-2.4.so.0 -lib/libwx_gtk_ogl-2.4.so -lib/libwx_gtk_ogl-2.4.so.0 -lib/libwx_gtk_plot-2.4.so -lib/libwx_gtk_plot-2.4.so.0 -lib/libwx_gtk_stc-2.4.so -lib/libwx_gtk_stc-2.4.so.0 -lib/libwx_gtk_xrc-2.4.so -lib/libwx_gtk_xrc-2.4.so.0 +include/wx/canvas/bbox.h +include/wx/canvas/canvas.h +include/wx/canvas/liner.h +include/wx/canvas/polygon.h +include/wx/fl/antiflickpl.h +include/wx/fl/bardragpl.h +include/wx/fl/barhintspl.h +include/wx/fl/cbcustom.h +include/wx/fl/controlbar.h +include/wx/fl/dynbarhnd.h +include/wx/fl/dyntbar.h +include/wx/fl/dyntbarhnd.h +include/wx/fl/fldefs.h +include/wx/fl/frmview.h +include/wx/fl/garbagec.h +include/wx/fl/gcupdatesmgr.h +include/wx/fl/hintanimpl.h +include/wx/fl/newbmpbtn.h +include/wx/fl/panedrawpl.h +include/wx/fl/rowdragpl.h +include/wx/fl/rowlayoutpl.h +include/wx/fl/toolwnd.h +include/wx/fl/updatesmgr.h +include/wx/gizmos/dynamicsash.h +include/wx/gizmos/editlbox.h +include/wx/gizmos/ledctrl.h +include/wx/gizmos/multicell.h +include/wx/gizmos/splittree.h +include/wx/net/email.h +include/wx/net/msg.h +include/wx/net/web.h +include/wx/ogl/basic.h +include/wx/ogl/basicp.h +include/wx/ogl/bmpshape.h +include/wx/ogl/canvas.h +include/wx/ogl/composit.h +include/wx/ogl/constrnt.h +include/wx/ogl/divided.h +include/wx/ogl/drawn.h +include/wx/ogl/drawnp.h +include/wx/ogl/lines.h +include/wx/ogl/linesp.h +include/wx/ogl/mfutils.h +include/wx/ogl/misc.h +include/wx/ogl/ogl.h +include/wx/ogl/ogldiag.h +include/wx/plot/plot.h +include/wx/stc/stc.h +include/wx/svg/dcsvg.h +include/wx/xrc/xh_all.h +include/wx/xrc/xh_bmp.h +include/wx/xrc/xh_bmpbt.h +include/wx/xrc/xh_bttn.h +include/wx/xrc/xh_cald.h +include/wx/xrc/xh_chckb.h +include/wx/xrc/xh_chckl.h +include/wx/xrc/xh_choic.h +include/wx/xrc/xh_combo.h +include/wx/xrc/xh_dlg.h +include/wx/xrc/xh_frame.h +include/wx/xrc/xh_gauge.h +include/wx/xrc/xh_gdctl.h +include/wx/xrc/xh_html.h +include/wx/xrc/xh_listb.h +include/wx/xrc/xh_listc.h +include/wx/xrc/xh_menu.h +include/wx/xrc/xh_notbk.h +include/wx/xrc/xh_panel.h +include/wx/xrc/xh_radbt.h +include/wx/xrc/xh_radbx.h +include/wx/xrc/xh_scrol.h +include/wx/xrc/xh_scwin.h +include/wx/xrc/xh_sizer.h +include/wx/xrc/xh_slidr.h +include/wx/xrc/xh_spin.h +include/wx/xrc/xh_split.h +include/wx/xrc/xh_stbmp.h +include/wx/xrc/xh_stbox.h +include/wx/xrc/xh_stlin.h +include/wx/xrc/xh_sttxt.h +include/wx/xrc/xh_text.h +include/wx/xrc/xh_toolb.h +include/wx/xrc/xh_tree.h +include/wx/xrc/xh_unkwn.h +include/wx/xrc/xh_wizrd.h +include/wx/xrc/xml.h +include/wx/xrc/xmlres.h +lib/libwx_gtk2_canvas-2.4.so +lib/libwx_gtk2_canvas-2.4.so.0 +lib/libwx_gtk2_dcsvg-2.4.so +lib/libwx_gtk2_dcsvg-2.4.so.0 +lib/libwx_gtk2_fl-2.4.so +lib/libwx_gtk2_fl-2.4.so.0 +lib/libwx_gtk2_gizmos-2.4.so +lib/libwx_gtk2_gizmos-2.4.so.0 +lib/libwx_gtk2_net-2.4.so +lib/libwx_gtk2_net-2.4.so.0 +lib/libwx_gtk2_ogl-2.4.so +lib/libwx_gtk2_ogl-2.4.so.0 +lib/libwx_gtk2_plot-2.4.so +lib/libwx_gtk2_plot-2.4.so.0 +lib/libwx_gtk2_stc-2.4.so +lib/libwx_gtk2_stc-2.4.so.0 +lib/libwx_gtk2_xrc-2.4.so +lib/libwx_gtk2_xrc-2.4.so.0 +@dirrm include/wx/xrc +@dirrm include/wx/svg +@dirrm include/wx/stc +@dirrm include/wx/plot +@dirrm include/wx/ogl +@dirrm include/wx/net +@dirrm include/wx/gizmos +@dirrm include/wx/fl +@dirrm include/wx/canvas diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index 9b0fc3d7bfa3..6b794593695a 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.4.2 -PORTREVISION?= 8 +PORTREVISION?= 9 PKGNAMESUFFIX= ${WXGTK_FLAVOR} CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -29,11 +29,13 @@ USE_ICONV= yes USE_REINPLACE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes +USE_GNOME= gtk20 CONFIGURE_ARGS= --with-libpng=sys \ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=sys \ - --with-opengl + --with-opengl\ + --enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include \ -I${LOCALBASE}/include \ -I${X11BASE}/include \ @@ -41,58 +43,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include \ LDFLAGS="-L${LOCALBASE}/lib -liconv \ -L${X11BASE}/lib \ ${PTHREAD_LIBS}" -MAKE_ENV= WXGTK_FLAVOR="${WXGTK_FLAVOR}" +NO_LATEST_LINK= yes PLIST= ${.CURDIR}/pkg-plist -WXGTK_FLAVOR?= gtk - -.if ${WXGTK_FLAVOR} != "gtk-common" -RUN_DEPENDS= ${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk-common -.endif - -.if ${WXGTK_FLAVOR:M*-common} != "" -NO_BUILD= yes -INSTALL_TARGET= install-common -.endif # *-common - -.if ${WXGTK_FLAVOR:M*-contrib*} != "" -BUILD_WRKSRC= ${WRKSRC}/contrib/src -INSTALL_WRKSRC= ${BUILD_WRKSRC} - -.if ${WXGTK_FLAVOR} != "gtk-contrib-common" -RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk-contrib-common -.if ${WXGTK_FLAVOR} == "gtk-contrib" -LIB_DEPENDS+= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk -.elif ${WXGTK_FLAVOR} == "gtk2-contrib" -LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 -.elif ${WXGTK_FLAVOR} == "gtk2-unicode-contrib" -LIB_DEPENDS+= wx_gtk2u-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2-unicode -.endif -.endif # !gtk-contrib-common -.endif # *-contrib* - -.if ${WXGTK_FLAVOR:Mgtk2*} != "" -USE_GNOME= gtk20 -CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL} -.else -USE_GNOME= gtk12 -CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET} -.endif +WXGTK_FLAVOR?= gtk2 .include <bsd.port.pre.mk> -.if ${WXGTK_FLAVOR:M*-unicode*} != "" -.if ${OSVERSION} < 500000 -IGNORE= Systems prior to FreeBSD 5.0 currently out of support -.endif -CONFIGURE_ARGS+=--enable-unicode -.endif # *-unicode* - pre-patch: -.if ${WXGTK_FLAVOR:Mgtk2*} != "" @${REINPLACE_CMD} -e 's|lgdk|lgdk-x11-2.0|g' ${WRKSRC}/configure -.else - @${REINPLACE_CMD} -e 's|lgdk|lgdk12|g' ${WRKSRC}/configure -.endif .include <bsd.port.post.mk> diff --git a/x11-toolkits/wxgtk24/files/patch-ac b/x11-toolkits/wxgtk24/files/patch-ac index b95baddfc8c5..416b9fe2ad50 100644 --- a/x11-toolkits/wxgtk24/files/patch-ac +++ b/x11-toolkits/wxgtk24/files/patch-ac @@ -1,5 +1,5 @@ --- Makefile.in.orig Sun Sep 21 18:31:27 2003 -+++ Makefile.in Tue Nov 4 22:33:54 2003 ++++ Makefile.in Sat May 7 01:10:14 2005 @@ -332,17 +332,13 @@ $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ @@ -20,7 +20,7 @@ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h -@@ -371,28 +367,23 @@ +@@ -371,26 +367,21 @@ CREATE_INSTALLED_LINKS: preinstall $(RM) $(libdir)/@WX_LIBRARY_LINK1@ @@ -38,8 +38,7 @@ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ + && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ --afminstall: preinstall -+afminstall: + afminstall: preinstall @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi $(INSTALL) -d $(datadir)/wx - $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN) @@ -52,38 +51,28 @@ + $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm + $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm --m4datainstall: preinstall -+m4datainstall: + m4datainstall: preinstall $(INSTALL) -d $(datadir)/aclocal - $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal - -@@ -410,7 +401,7 @@ - - # this is the real install target: copies the library, wx-config and the - # headers to the installation directory --preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config -+install-common: @AFMINSTALL@ m4datainstall @WIN32INSTALL@ - @echo " " - @echo " Installing wxWindows..." - @echo " " -@@ -419,26 +410,11 @@ - @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi +@@ -420,25 +411,19 @@ @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi -- $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config + $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config - cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config -- @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ -- @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ -- $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi + @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ + @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ + $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi - - $(INSTALL) -d $(libdir)/wx - $(INSTALL) -d $(libdir)/wx/include - $(INSTALL) -d $(libdir)/wx/include/univ - $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ - $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx -- $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ ++ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@ ++ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx + $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ - $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h -- ++ $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx/setup.h + $(INSTALL) -d $(includedir)/wx @# FIXME: This will erroneously install a wx/base dir for wxBase.. @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi @@ -93,32 +82,3 @@ @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi @# always install msw headers for wxBase, it's much simpler -@@ -459,6 +435,19 @@ - echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ - done - -+preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config -+ $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config -+ @if test "$(WXGTK_FLAVOR)" = "gtk2"; then \ -+ cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config; \ -+ fi -+ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ -+ @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ -+ $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi -+ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@ -+ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx -+ $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ -+ $(prefix)/include/wx/@TOOLCHAIN_NAME@/wx/setup.h -+ - preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ - @echo " " - @echo " Installing wxWindows Mac resource ..." -@@ -474,7 +463,7 @@ - @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi - @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ - --install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@ -+install: @WX_ALL_INSTALLED@ - @echo " " - @echo " The installation of wxWindows is finished. On certain" - @echo " platforms (e.g. Linux) you'll now have to run ldconfig" diff --git a/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in b/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in index 5d9fe0443f8e..497bbca104e8 100644 --- a/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in +++ b/x11-toolkits/wxgtk24/files/patch-contrib-src-Makefile.in @@ -8,13 +8,3 @@ all: @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done -@@ -10,6 +10,9 @@ - - install: - @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install); done -+ -+install-common: -+ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) install-common); done - - uninstall: - @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE) uninstall); done diff --git a/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in b/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in index 17ce4b33fced..af05f435d3a8 100644 --- a/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in +++ b/x11-toolkits/wxgtk24/files/patch-src-makelib.env.in @@ -1,5 +1,5 @@ --- src/makelib.env.in.orig Sun Sep 21 18:31:38 2003 -+++ src/makelib.env.in Tue Nov 4 22:33:31 2003 ++++ src/makelib.env.in Sat May 7 00:33:13 2005 @@ -35,8 +35,8 @@ INSTALL_DATA = @INSTALL_DATA@ @@ -23,14 +23,7 @@ $(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS) @$(INSTALL) -d $(top_builddir)/lib -@@ -82,14 +81,15 @@ - $(AR) $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - --install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers -+install: install_@WX_TARGET_LIBRARY_TYPE@ -+ -+install-common: install_headers +@@ -86,10 +85,9 @@ install_so: $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED) @@ -43,7 +36,7 @@ install_a: $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC) -@@ -105,7 +105,6 @@ +@@ -105,7 +103,6 @@ $(RM) $(libdir)/$(TARGETLIB_STATIC) $(RM) $(libdir)/$(TARGETLIB_SHARED) $(RM) $(libdir)/$(TARGETLIB_LINK1) @@ -51,7 +44,7 @@ @echo "removing headers" @for h in $(HEADERS); do \ $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ -@@ -118,7 +117,6 @@ +@@ -118,7 +115,6 @@ clean: $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \ $(top_builddir)/lib/$(TARGETLIB_LINK1) \ diff --git a/x11-toolkits/wxgtk24/pkg-plist b/x11-toolkits/wxgtk24/pkg-plist index c4b6537e54b5..426a83b11df6 100644 --- a/x11-toolkits/wxgtk24/pkg-plist +++ b/x11-toolkits/wxgtk24/pkg-plist @@ -1,8 +1,423 @@ -bin/wxgtk-2.4-config -include/wx/gtk-2.4/wx/setup.h -lib/libwx_gtk-2.4.so -lib/libwx_gtk-2.4.so.0 -lib/libwx_gtk_gl-2.4.so -lib/libwx_gtk_gl-2.4.so.0 -@dirrm include/wx/gtk-2.4/wx -@dirrm include/wx/gtk-2.4 +bin/wxgtk2-2.4-config +include/wx/accel.h +include/wx/app.h +include/wx/arrimpl.cpp +include/wx/artprov.h +include/wx/bitmap.h +include/wx/bmpbuttn.h +include/wx/brush.h +include/wx/buffer.h +include/wx/build.h +include/wx/busyinfo.h +include/wx/button.h +include/wx/calctrl.h +include/wx/caret.h +include/wx/checkbox.h +include/wx/checklst.h +include/wx/chkconf.h +include/wx/choicdlg.h +include/wx/choice.h +include/wx/clipbrd.h +include/wx/clntdata.h +include/wx/cmdline.h +include/wx/cmdproc.h +include/wx/cmndata.h +include/wx/colordlg.h +include/wx/colour.h +include/wx/combobox.h +include/wx/confbase.h +include/wx/config.h +include/wx/containr.h +include/wx/control.h +include/wx/cshelp.h +include/wx/ctrlsub.h +include/wx/cursor.h +include/wx/dataobj.h +include/wx/date.h +include/wx/datetime.h +include/wx/datetime.inl +include/wx/datstrm.h +include/wx/db.h +include/wx/dbgrid.h +include/wx/dbkeyg.h +include/wx/dbtable.h +include/wx/dc.h +include/wx/dcbuffer.h +include/wx/dcclient.h +include/wx/dcmemory.h +include/wx/dcprint.h +include/wx/dcps.h +include/wx/dcscreen.h +include/wx/dde.h +include/wx/debug.h +include/wx/defs.h +include/wx/dialog.h +include/wx/dialup.h +include/wx/dir.h +include/wx/dirctrl.h +include/wx/dirdlg.h +include/wx/dnd.h +include/wx/docmdi.h +include/wx/docview.h +include/wx/dragimag.h +include/wx/dynarray.h +include/wx/dynlib.h +include/wx/dynload.h +include/wx/effects.h +include/wx/encconv.h +include/wx/event.h +include/wx/expr.h +include/wx/fdrepdlg.h +include/wx/features.h +include/wx/ffile.h +include/wx/file.h +include/wx/fileconf.h +include/wx/filedlg.h +include/wx/filefn.h +include/wx/filename.h +include/wx/filesys.h +include/wx/font.h +include/wx/fontdlg.h +include/wx/fontenc.h +include/wx/fontenum.h +include/wx/fontmap.h +include/wx/fontutil.h +include/wx/frame.h +include/wx/fs_inet.h +include/wx/fs_mem.h +include/wx/fs_zip.h +include/wx/gauge.h +include/wx/gdicmn.h +include/wx/gdiobj.h +include/wx/generic/accel.h +include/wx/generic/calctrl.h +include/wx/generic/caret.h +include/wx/generic/choicdgg.h +include/wx/generic/colrdlgg.h +include/wx/generic/dcpsg.h +include/wx/generic/dirctrlg.h +include/wx/generic/dirdlgg.h +include/wx/generic/dragimgg.h +include/wx/generic/fdrepdlg.h +include/wx/generic/filedlgg.h +include/wx/generic/fontdlgg.h +include/wx/generic/grid.h +include/wx/generic/gridctrl.h +include/wx/generic/gridg.h +include/wx/generic/helpext.h +include/wx/generic/helphtml.h +include/wx/generic/imaglist.h +include/wx/generic/laywin.h +include/wx/generic/listctrl.h +include/wx/generic/msgdlgg.h +include/wx/generic/notebook.h +include/wx/generic/paletteg.h +include/wx/generic/panelg.h +include/wx/generic/printps.h +include/wx/generic/prntdlgg.h +include/wx/generic/progdlgg.h +include/wx/generic/sashwin.h +include/wx/generic/scrolwin.h +include/wx/generic/spinctlg.h +include/wx/generic/splash.h +include/wx/generic/splitter.h +include/wx/generic/statusbr.h +include/wx/generic/tabg.h +include/wx/generic/textdlgg.h +include/wx/generic/timer.h +include/wx/generic/treectlg.h +include/wx/generic/wizard.h +include/wx/geometry.h +include/wx/gifdecod.h +include/wx/glcanvas.h +include/wx/grid.h +include/wx/gsocket.h +include/wx/gtk/accel.h +include/wx/gtk/app.h +include/wx/gtk/bitmap.h +include/wx/gtk/bmpbuttn.h +include/wx/gtk/brush.h +include/wx/gtk/button.h +include/wx/gtk/checkbox.h +include/wx/gtk/checklst.h +include/wx/gtk/choice.h +include/wx/gtk/clipbrd.h +include/wx/gtk/colour.h +include/wx/gtk/combobox.h +include/wx/gtk/control.h +include/wx/gtk/cursor.h +include/wx/gtk/dataform.h +include/wx/gtk/dataobj.h +include/wx/gtk/dataobj2.h +include/wx/gtk/dc.h +include/wx/gtk/dcclient.h +include/wx/gtk/dcmemory.h +include/wx/gtk/dcscreen.h +include/wx/gtk/dialog.h +include/wx/gtk/dnd.h +include/wx/gtk/filedlg.h +include/wx/gtk/font.h +include/wx/gtk/fontdlg.h +include/wx/gtk/frame.h +include/wx/gtk/gauge.h +include/wx/gtk/gdiobj.h +include/wx/gtk/glcanvas.h +include/wx/gtk/icon.h +include/wx/gtk/joystick.h +include/wx/gtk/listbox.h +include/wx/gtk/mdi.h +include/wx/gtk/menu.h +include/wx/gtk/menuitem.h +include/wx/gtk/minifram.h +include/wx/gtk/notebook.h +include/wx/gtk/pen.h +include/wx/gtk/popupwin.h +include/wx/gtk/radiobox.h +include/wx/gtk/radiobut.h +include/wx/gtk/region.h +include/wx/gtk/scrolbar.h +include/wx/gtk/scrolwin.h +include/wx/gtk/slider.h +include/wx/gtk/spinbutt.h +include/wx/gtk/spinctrl.h +include/wx/gtk/statbmp.h +include/wx/gtk/statbox.h +include/wx/gtk/statline.h +include/wx/gtk/stattext.h +include/wx/gtk/tbargtk.h +include/wx/gtk/textctrl.h +include/wx/gtk/tglbtn.h +include/wx/gtk/timer.h +include/wx/gtk/tooltip.h +include/wx/gtk/toplevel.h +include/wx/gtk/treectrl.h +include/wx/gtk/wave.h +include/wx/gtk/win_gtk.h +include/wx/gtk/window.h +include/wx/gtk2-2.4/wx/setup.h +include/wx/hash.h +include/wx/hashmap.h +include/wx/help.h +include/wx/helpbase.h +include/wx/helphtml.h +include/wx/helpwin.h +include/wx/html/forcelnk.h +include/wx/html/helpctrl.h +include/wx/html/helpdata.h +include/wx/html/helpfrm.h +include/wx/html/htmlcell.h +include/wx/html/htmldefs.h +include/wx/html/htmlfilt.h +include/wx/html/htmlpars.h +include/wx/html/htmltag.h +include/wx/html/htmlwin.h +include/wx/html/htmprint.h +include/wx/html/m_templ.h +include/wx/html/winpars.h +include/wx/icon.h +include/wx/iconbndl.h +include/wx/imagbmp.h +include/wx/image.h +include/wx/imaggif.h +include/wx/imagiff.h +include/wx/imagjpeg.h +include/wx/imaglist.h +include/wx/imagpcx.h +include/wx/imagpng.h +include/wx/imagpnm.h +include/wx/imagtiff.h +include/wx/imagxpm.h +include/wx/intl.h +include/wx/ioswrap.h +include/wx/ipc.h +include/wx/ipcbase.h +include/wx/isql.h +include/wx/isqlext.h +include/wx/joystick.h +include/wx/layout.h +include/wx/laywin.h +include/wx/list.h +include/wx/listbase.h +include/wx/listbox.h +include/wx/listctrl.h +include/wx/listimpl.cpp +include/wx/log.h +include/wx/longlong.h +include/wx/matrix.h +include/wx/mdi.h +include/wx/memconf.h +include/wx/memory.h +include/wx/memtext.h +include/wx/menu.h +include/wx/menuitem.h +include/wx/metafile.h +include/wx/mimetype.h +include/wx/minifram.h +include/wx/module.h +include/wx/msgdlg.h +include/wx/msgout.h +include/wx/mstream.h +include/wx/notebook.h +include/wx/object.h +include/wx/odbc.h +include/wx/ownerdrw.h +include/wx/palette.h +include/wx/panel.h +include/wx/paper.h +include/wx/pen.h +include/wx/platform.h +include/wx/popupwin.h +include/wx/print.h +include/wx/printdlg.h +include/wx/prntbase.h +include/wx/process.h +include/wx/progdlg.h +include/wx/prop.h +include/wx/propform.h +include/wx/proplist.h +include/wx/protocol/file.h +include/wx/protocol/ftp.h +include/wx/protocol/http.h +include/wx/protocol/protocol.h +include/wx/quantize.h +include/wx/radiobox.h +include/wx/radiobut.h +include/wx/regex.h +include/wx/region.h +include/wx/resource.h +include/wx/sashwin.h +include/wx/sckaddr.h +include/wx/sckipc.h +include/wx/sckstrm.h +include/wx/scrolbar.h +include/wx/scrolwin.h +include/wx/settings.h +include/wx/sizer.h +include/wx/slider.h +include/wx/snglinst.h +include/wx/socket.h +include/wx/spinbutt.h +include/wx/spinctrl.h +include/wx/splash.h +include/wx/splitter.h +include/wx/stack.h +include/wx/statbmp.h +include/wx/statbox.h +include/wx/statline.h +include/wx/stattext.h +include/wx/statusbr.h +include/wx/strconv.h +include/wx/stream.h +include/wx/string.h +include/wx/sysopt.h +include/wx/tab.h +include/wx/tabctrl.h +include/wx/taskbar.h +include/wx/tbarbase.h +include/wx/tbarsmpl.h +include/wx/textbuf.h +include/wx/textctrl.h +include/wx/textdlg.h +include/wx/textfile.h +include/wx/tglbtn.h +include/wx/thread.h +include/wx/thrimpl.cpp +include/wx/time.h +include/wx/timer.h +include/wx/tipdlg.h +include/wx/tipwin.h +include/wx/tokenzr.h +include/wx/toolbar.h +include/wx/tooltip.h +include/wx/toplevel.h +include/wx/treebase.h +include/wx/treectrl.h +include/wx/txtstrm.h +include/wx/types.h +include/wx/unix/execute.h +include/wx/unix/fontutil.h +include/wx/unix/gsockunx.h +include/wx/unix/mimetype.h +include/wx/unix/utilsx11.h +include/wx/url.h +include/wx/utils.h +include/wx/valgen.h +include/wx/validate.h +include/wx/valtext.h +include/wx/variant.h +include/wx/vector.h +include/wx/version.h +include/wx/volume.h +include/wx/wave.h +include/wx/wfstream.h +include/wx/window.h +include/wx/wizard.h +include/wx/wx.h +include/wx/wx_cw.h +include/wx/wx_cw_cm.h +include/wx/wx_cw_d.h +include/wx/wxchar.h +include/wx/wxexpr.h +include/wx/wxhtml.h +include/wx/wxprec.h +include/wx/xpmdecod.h +include/wx/zipstrm.h +include/wx/zstream.h +lib/libwx_gtk2-2.4.so +lib/libwx_gtk2-2.4.so.0 +lib/libwx_gtk2_gl-2.4.so +lib/libwx_gtk2_gl-2.4.so.0 +share/aclocal/wxwin.m4 +share/locale/cs/LC_MESSAGES/wxstd.mo +share/locale/da/LC_MESSAGES/wxstd.mo +share/locale/de/LC_MESSAGES/wxstd.mo +share/locale/es/LC_MESSAGES/wxstd.mo +share/locale/fi/LC_MESSAGES/wxstd.mo +share/locale/fr/LC_MESSAGES/wxstd.mo +share/locale/hu/LC_MESSAGES/wxstd.mo +share/locale/id/LC_MESSAGES/wxstd.mo +share/locale/it/LC_MESSAGES/wxstd.mo +share/locale/nl/LC_MESSAGES/wxstd.mo +share/locale/pl/LC_MESSAGES/wxstd.mo +share/locale/ru/LC_MESSAGES/wxstd.mo +share/locale/sl/LC_MESSAGES/wxstd.mo +share/locale/sv/LC_MESSAGES/wxstd.mo +share/locale/tr/LC_MESSAGES/wxstd.mo +share/locale/zh/LC_MESSAGES/wxstd.mo +share/wx/afm/Cour.afm +share/wx/afm/CourBo.afm +share/wx/afm/CourBoO.afm +share/wx/afm/CourO.afm +share/wx/afm/Helv.afm +share/wx/afm/HelvBo.afm +share/wx/afm/HelvBoO.afm +share/wx/afm/HelvO.afm +share/wx/afm/TimesBo.afm +share/wx/afm/TimesBoO.afm +share/wx/afm/TimesO.afm +share/wx/afm/TimesRo.afm +share/wx/afm/Zapf.afm +share/wx/gs_afm/Cour.afm +share/wx/gs_afm/CourBo.afm +share/wx/gs_afm/CourBoO.afm +share/wx/gs_afm/CourO.afm +share/wx/gs_afm/Helv.afm +share/wx/gs_afm/HelvBo.afm +share/wx/gs_afm/HelvBoO.afm +share/wx/gs_afm/HelvO.afm +share/wx/gs_afm/TimesBo.afm +share/wx/gs_afm/TimesBoO.afm +share/wx/gs_afm/TimesO.afm +share/wx/gs_afm/TimesRo.afm +share/wx/gs_afm/Zapf.afm +@dirrm share/wx/gs_afm +@dirrm share/wx/afm +@dirrm share/wx +@dirrm include/wx/unix +@dirrm include/wx/protocol +@dirrm include/wx/html +@dirrm include/wx/gtk2-2.4/wx +@dirrm include/wx/gtk2-2.4 +@dirrm include/wx/gtk +@dirrm include/wx/generic +@dirrm include/wx diff --git a/x11-toolkits/wxmozilla/Makefile b/x11-toolkits/wxmozilla/Makefile index 5a975258c9e5..b0abaf3505f9 100644 --- a/x11-toolkits/wxmozilla/Makefile +++ b/x11-toolkits/wxmozilla/Makefile @@ -17,8 +17,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Embedding Mozilla in wxWidgets BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-nspr.pc:${PORTSDIR}/www/mozilla \ - ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 + ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes |