FreeBSD Bugzilla – Attachment 59400 Details for
Bug 89398
[PATCH] bsd.wx.mk and patches
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
wx.shar
wx.shar (text/plain), 56.44 KB, created by
Alejandro Pulver
on 2005-11-21 23:20:32 UTC
(
hide
)
Description:
wx.shar
Filename:
MIME Type:
Creator:
Alejandro Pulver
Created:
2005-11-21 23:20:32 UTC
Size:
56.44 KB
patch
obsolete
># This is a shell archive. Save it in a file, remove anything before ># this line, and then unpack it by entering "sh file". Note, it may ># create directories; files and directories will be owned by you and ># have default permissions. ># ># This archive contains: ># ># wx ># wx/bsd.wx.mk ># wx/All.diff ># >echo c - wx >mkdir -p wx > /dev/null 2>&1 >echo x - wx/bsd.wx.mk >sed 's/^X//' >wx/bsd.wx.mk << 'END-of-wx/bsd.wx.mk' >X# bsd.wx.mk - Support for WxWidgets based ports. >X# >X# Created by: Alejandro Pulver <alejandro@varnet.biz> >X# >X# The following variable controls which WxWidgets version is used: >X# USE_WX The port needs the specified version of WxWidgets >X# (currently supported ones are 2.4 and 2.6). >X# >X# In addition, the following variables can be defined: >X# USE_WXCONTRIB The port needs WxWidgets contributed headers and libs. >X# USE_WXPYTHON The port needs WxPython for building and running. >X# USE_WXPYTHON_BUILD The port needs WxPython for building. >X# USE_WXPYTHON_RUN The port needs WxPython for running. >X# USE_WXUNICODE The port needs Unicode support in WxWidgets (>= 2.5). >X# >X# The following variables can be defined in make.conf or pkgtools.conf: >X# WITH_UNICODE Ports will use Unicode if available. >X# WITH_WX24 Ports will use WxWidgets version 2.4 if both 2.4 and >X# 2.6 are supported by the port (NOTE: this is port >X# dependent). >X# >X >X# >X# $FreeBSD$ >X# >X >XWX_Include_MAINTAINER= alejandro@varnet.biz >X >X# >X# Available WxWidgets versions. >X# >X >X_USE_WX_ALL= 2.4 2.6 >X >X# >X# Undotted selected WxWidgets version. >X# >X >X_WX_VER= ${USE_WX:S/.//g} >X >X# >X# WxWidgets flavor (currently "gtk2" is the only one supported). >X# >X >X_WX_FLAVOR= gtk2 >X >X# >X# Variables used to determine what is needed: >X# _LIB_xxx Name and version of the shared library. >X# _CONTRIB_LIB_xxx Name and version of the contributed shared library. >X# >X >X_LIB_2.4= wx_gtk2-2.4.0 >X_CONTRIB_LIB_2.4= wx_gtk2_canvas-2.4.0 >X >X_LIB_2.6= wx_base${_WXUC}-2.6.0 >X_CONTRIB_LIB_2.6= wx_gtk2${_WXUC}_animate-2.6.0 >X >X# >X# Check for valid and unique values of USE_WX. >X# >X >X_WXVER_SET= >X.for version in ${USE_WX} >X. if ${_USE_WX_ALL:M${version}} != "" >X. if ${_WXVER_SET} == "yes" >XIGNORE= More than one WxWidgets versions selected. >X. else >X_WXVER_SET= yes >X. endif >X. else >XIGNORE= Unknown WxWidgets version: ${version}. >X. endif >X.endfor >X >X# >X# Unicode support. >X# >X >X.if defined(WITH_UNICODE) && ${OSVERSION} >= 500000 && ${_WX_VER} >= 25 >XUSE_WXUNICODE= yes >X.endif >X >X.if defined(USE_WXUNICODE) >X. if ${OSVERSION} < 500000 >XIGNORE= FreeBSD versions prior to 5.x do not support Unicode. >X. elif ${_WX_VER} < 25 >XIGNORE= WxWidgets versions prior to 2.5 do not support Unicode. >X. else >X_WXUC= u >X_WXUCL= -unicode >X. endif >X.else >X_WXUC= # >X_WXUCL= # >X.endif >X >X# >X# Set WX_CONFIG and add LIB_DEPENDS. >X# >X >XWX_CONFIG?= ${X11BASE}/bin/wxgtk2${_WXUC}-${USE_WX}-config >XLIB_DEPENDS+= ${_LIB_${USE_WX}}:${PORTSDIR}/x11-toolkits/wxgtk${_WX_VER}${_WXUCL} >X >X# >X# Contributed headers and libraries. >X# >X >X.if defined(USE_WXCONTRIB) >XLIB_DEPENDS+= ${_CONTRIB_LIB_${USE_WX}}:${PORTSDIR}/x11-toolkits/wxgtk${_WX_VER}${_WXUCL}-contrib >X.endif >X >X# >X# WxPython support. >X# >X >X.if ${_WX_VER} >= 25 >X. if defined(USE_WXUNICODE) >X_WXPYTHON_DIR= wx-${USE_WX}-${_WXFLAVOR}-unicode >X. else >X_WXPYTHON_DIR= wx-${USE_WX}-${_WXFLAVOR}-ansi >X. endif >X_WXPYTHON_DEP= ${PYTHON_SITELIBDIR}/${_WX_PYTHON_DIR}/wx/__init__.py >X.else >X_WXPYTHON_DEP= ${PYTHON_SITELIBDIR}/wx/__init__.py >X.endif >X >X.if defined(USE_WXPYTHON) >XUSE_WXPYTHON_BUILD= yes >XUSE_WXPYTHON_RUN= yes >X.endif >X >X.if defined(USE_WXPYTHON_BUILD) >XBUILD_DEPENDS+= ${_WXPYTHON_DEP}:${PORTSDIR}/x11-toolkits/py-wxPython${_WX_VER}${_WXUCL} >X.endif >X >X.if defined(USE_WXPYTHON_RUN) >XRUN_DEPENDS+= ${_WXPYTHON_DEP}:${PORTSDIR}/x11-toolkits/py-wxPython${_WX_VER}${_WXUCL} >X.endif >X >X# >X# Set some useful variables. >X# >X >XMAKE_ENV+= WX_CONFIG=${WX_CONFIG} >XCONFIGURE_ENV+= WX_CONFIG=${WX_CONFIG} >XCONFIGURE_ARGS+=--with-wx=${X11BASE} \ >X --with-wx-config=${WX_CONFIG} \ >X --with-wxbase-config=${WX_CONFIG} >END-of-wx/bsd.wx.mk >echo x - wx/All.diff >sed 's/^X//' >wx/All.diff << 'END-of-wx/All.diff' >Xdiff -urN /usr/ports/chinese/BBMan/Makefile chinese/BBMan/Makefile >X--- /usr/ports/chinese/BBMan/Makefile Sat Nov 5 02:21:26 2005 >X+++ chinese/BBMan/Makefile Sat Nov 19 23:14:39 2005 >X@@ -17,12 +17,11 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= BBMan is a BBS client for X Window System >X >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X- >X USE_ZIP= yes >X WRKSRC= ${WRKDIR}/${PORTNAME} >X USE_X_PREFIX= yes >X USE_GCC= 3.3 >X+USE_WX = 2.4 >X >X PLIST_FILES= bin/BBMan >X >X@@ -37,7 +36,7 @@ >X .endif >X >X do-build: >X- cd ${WRKSRC} && ${CXX} main.cpp `wxgtk2-2.4-config --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan >X+ cd ${WRKSRC} && ${CXX} main.cpp `${WX_CONFIG} --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan >X >X do-install: >X ${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${PREFIX}/bin/BBMan >Xdiff -urN /usr/ports/biology/L-Breeder/Makefile biology/L-Breeder/Makefile >X--- /usr/ports/biology/L-Breeder/Makefile Fri Nov 11 11:29:09 2005 >X+++ biology/L-Breeder/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,8 +16,6 @@ >X MAINTAINER= dyeske@yahoo.com >X COMMENT= Allows you to display and breed L-system forms >X >X-LIB_DEPENDS= wx_gtk2_gl-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X- >X DEPRECATED= "mastersite disappeared, no longer maintained by author" >X EXPIRATION_DATE= 2005-12-31 >X >X@@ -29,8 +27,7 @@ >X USE_GL= yes >X USE_GMAKE= yes >X USE_REINPLACE= yes >X- >X-WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config >X+USE_WX= 2.4 >X >X .if defined(WITH_OPTIMIZED_CFLAGS) >X CFLAGS+= -O3 -ffast-math >Xdiff -urN /usr/ports/games/abridge/Makefile games/abridge/Makefile >X--- /usr/ports/games/abridge/Makefile Sat Nov 5 02:19:05 2005 >X+++ games/abridge/Makefile Sat Nov 19 23:14:39 2005 >X@@ -14,18 +14,11 @@ >X MAINTAINER= Janos.Mohacsi@bsd.hu >X COMMENT= Bridge game >X >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X- >X+ONLY_FOR_ARCHS= i386 >X+USE_WX= 2.4 >X GNU_CONFIGURE= yes >X-CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config >X >X MAN1= abridge.1 >X PLIST_FILES= bin/abridge >X >X-.include <bsd.port.pre.mk> >X- >X-.if ${ARCH} != "i386" >X-BROKEN= "Does not compile on !i386" >X-.endif >X- >X-.include <bsd.port.post.mk> >X+.include <bsd.port.mk> >Xdiff -urN /usr/ports/devel/agide/Makefile devel/agide/Makefile >X--- /usr/ports/devel/agide/Makefile Thu May 12 13:39:50 2005 >X+++ devel/agide/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,8 +16,7 @@ >X COMMENT= A-A-P GUI IDE: a framework for software development >X >X RUN_DEPENDS= ${LOCALBASE}/bin/aap:${PORTSDIR}/devel/aap \ >X- ${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim \ >X- ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X+ ${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim >X >X MAN1= agide.1 >X >X@@ -26,6 +25,8 @@ >X >X USE_ZIP= yes >X USE_PYTHON= yes >X+USE_WX= 2.4 >X+USE_WXPYTHON_RUN= yes >X PLIST_SUB+= PORTVERSION=${PORTVERSION} >X >X pre-install: >Xdiff -urN /usr/ports/net/amule1/Makefile net/amule1/Makefile >X--- /usr/ports/net/amule1/Makefile Sat Nov 5 02:19:19 2005 >X+++ net/amule1/Makefile Sat Nov 19 23:14:39 2005 >X@@ -14,8 +14,7 @@ >X MAINTAINER= ganael.laplanche@martymac.com >X COMMENT= The all-platform eMule p2p client >X >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \ >X- curl.3:${PORTSDIR}/ftp/curl >X+LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl >X >X LATEST_LINK= aMule1 >X CONFLICTS= aMule-2.* aMule-devel-[0-9]* >X@@ -23,12 +22,11 @@ >X USE_X_PREFIX= yes >X USE_GNOME= gnomehier gnomehack gnomeprefix >X USE_GMAKE= yes >X+USE_WX= 2.4 >X GNU_CONFIGURE= yes >X CONFIGURE_ARGS= --without-included-gettext \ >X --with-libintl-prefix=${LOCALBASE} \ >X --with-libiconv-prefix=${LOCALBASE} \ >X- --with-wx-config=${WX_CONFIG} \ >X- --with-wxbase-config=${WX_CONFIG} \ >X --with-curl-config=${CURL_CONFIG} \ >X --program-transform-name="s/ed2k/amule-ed2k-handler/" >X >X@@ -38,7 +36,6 @@ >X OPTIONS= OPTIMIZE "Build with optimization" on \ >X STATIC "Enable static linking" off >X >X-WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config >X CURL_CONFIG?= ${LOCALBASE}/bin/curl-config >X >X .include <bsd.port.pre.mk> >Xdiff -urN /usr/ports/net/amule2/Makefile net/amule2/Makefile >X--- /usr/ports/net/amule2/Makefile Sat Nov 5 02:19:19 2005 >X+++ net/amule2/Makefile Sat Nov 19 23:14:39 2005 >X@@ -14,8 +14,7 @@ >X MAINTAINER= ganael.laplanche@martymac.com >X COMMENT= The all-platform eMule p2p client >X >X-LIB_DEPENDS= wx_gtk2u_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \ >X- curl.3:${PORTSDIR}/ftp/curl >X+LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl >X # gd.4:${PORTSDIR}/graphics/gd >X # png.5:${PORTSDIR}/graphics/png >X >X@@ -25,14 +24,14 @@ >X USE_X_PREFIX= yes >X USE_GNOME= gnomehier gnomehack gnomeprefix >X USE_GMAKE= yes >X+USE_WX= 2.6 >X+USE_WXUNICODE= yes >X GNU_CONFIGURE= yes >X CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} >X CONFIGURE_ARGS= --disable-debug \ >X --without-included-gettext \ >X --with-libintl-prefix=${LOCALBASE} \ >X --with-libiconv-prefix=${LOCALBASE} \ >X- --with-wx-config=${WX_CONFIG} \ >X- --with-wxbase-config=${WX_CONFIG} \ >X --with-curl-config=${CURL_CONFIG} \ >X --enable-embedded_crypto \ >X --enable-utf8-systray \ >X@@ -51,7 +50,6 @@ >X ALC "Compile aMule Link Creator (+GUI)" on \ >X AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off >X >X-WX_CONFIG?= ${X11BASE}/bin/wxgtk2u-2.6-config >X CURL_CONFIG?= ${LOCALBASE}/bin/curl-config >X >X .include <bsd.port.pre.mk> >Xdiff -urN /usr/ports/audio/audacity/Makefile audio/audacity/Makefile >X--- /usr/ports/audio/audacity/Makefile Tue Nov 15 03:47:50 2005 >X+++ audio/audacity/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,11 +16,11 @@ >X COMMENT= Audacity is a GUI editor for digital audio waveforms >X >X BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X >X WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} >X GNU_CONFIGURE= yes >X USE_GMAKE= yes >X+USE_WX= 2.4 >X USE_X_PREFIX= yes >X USE_AUTOTOOLS= libtool:15 >X >X@@ -31,8 +31,7 @@ >X .endif >X CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ >X CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \ >X- CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \ >X- WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config >X+ CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" >X CONFIGURE_ARGS+= --with-id3=no >X >X .if !defined(NOPORTDOCS) >Xdiff -urN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile >X--- /usr/ports/sysutils/bacula-server/Makefile Thu Nov 17 04:44:04 2005 >X+++ bacula-server/Makefile Mon Nov 21 14:18:16 2005 >X@@ -98,8 +98,8 @@ >X # Build wx-console >X .if defined(WITH_WXCONSOLE) >X CONFIGURE_ARGS+= --enable-wx-console >X-LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X-CONFIGURE_ENV+= WXCONFIG=${X11BASE}/bin/wxgtk2-2.4-config >X+USE_WX= 2.4 >X+CONFIGURE_ENV+= WXCONFIG=${WX_CONFIG} >X PLIST_SUB+= WXCONS="" >X .else >X # We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) >Xdiff -urN /usr/ports/devel/boaconstructor/Makefile devel/boaconstructor/Makefile >X--- /usr/ports/devel/boaconstructor/Makefile Sat Nov 5 02:20:10 2005 >X+++ devel/boaconstructor/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,12 +16,12 @@ >X MAINTAINER= filippo.natali@gmail.com >X COMMENT= A cross platform RAD GUI Building IDE for wxPython >X >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26 >X- >X WRKSRC= ${WRKDIR}/boa-constructor-${PORTVERSION} >X >X USE_ZIP= yes >X USE_PYTHON= yes >X+USE_WX= 2.6 >X+USE_WXPYTHON_RUN= yes >X DATADIR= ${PREFIX}/share/Boa >X >X do-build: >Xdiff -urN /usr/ports/net/boinc-client/Makefile net/boinc-client/Makefile >X--- /usr/ports/net/boinc-client/Makefile Tue Nov 15 03:50:21 2005 >X+++ net/boinc-client/Makefile Sat Nov 19 23:14:39 2005 >X@@ -25,11 +25,10 @@ >X .endif >X >X .if !defined(WITHOUT_X11) >X-LIB_DEPENDS+= iconv:${PORTSDIR}/converters/libiconv \ >X- wx_base:${PORTSDIR}/x11-toolkits/wxgtk26 \ >X- jpeg:${PORTSDIR}/graphics/jpeg \ >X- glut:${PORTSDIR}/graphics/libglut >X-USE_XLIBS= yes >X+LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg >X+USE_ICONV= yes >X+USE_MESA= yes >X+USE_WX= 2.6 >X .endif >X >X USE_AUTOTOOLS= automake:19 autoheader:259 autoconf:259 libtool:15 >X@@ -61,9 +60,7 @@ >X USE_RC_SUBR= boinc.sh >X >X CONFIGURE_ARGS= --disable-server >X-.if !defined(WITHOUT_X11) >X-CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.6-config >X-.else >X+.if defined(WITHOUT_X11) >X CONFIGURE_ARGS+= --with-wx-config=false >X .endif >X CONFIGURE_ENV= CPPFLAGS=-I${X11BASE}/include CXXFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" >Xdiff -urN /usr/ports/graphics/comical/Makefile graphics/comical/Makefile >X--- /usr/ports/graphics/comical/Makefile Sat Nov 5 02:20:48 2005 >X+++ graphics/comical/Makefile Sat Nov 19 23:14:39 2005 >X@@ -15,12 +15,10 @@ >X MAINTAINER= john@mcaree.org >X COMMENT= A sequential image viewer >X >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X- >X USE_GMAKE= yes >X+USE_WX= 2.4 >X GNU_CONFIGURE= yes >X USE_X_PREFIX= yes >X-CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config >X >X .include <bsd.port.pre.mk> >X >Xdiff -urN /usr/ports/deskutils/cycle/Makefile deskutils/cycle/Makefile >X--- /usr/ports/deskutils/cycle/Makefile Wed Oct 5 11:23:37 2005 >X+++ deskutils/cycle/Makefile Sat Nov 19 23:14:39 2005 >X@@ -14,10 +14,10 @@ >X MAINTAINER= danfe@FreeBSD.org >X COMMENT= A calendar program for women >X >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26 >X- >X USE_BZIP2= yes >X USE_PYTHON_RUN= yes >X+USE_WX= 2.6 >X+USE_WXPYTHON_RUN= yes >X USE_REINPLACE= yes >X NO_BUILD= yes >X >Xdiff -urN /usr/ports/devel/datadesigner/Makefile devel/datadesigner/Makefile >X--- /usr/ports/devel/datadesigner/Makefile Sat Nov 5 02:21:30 2005 >X+++ devel/datadesigner/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,16 +16,14 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= Database Schema Designer >X >X-LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ >X- wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X+LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 >X >X USE_GNOME= libxml2 libxslt >X USE_ICONV= yes >X+USE_WX= 2.4 >X GNU_CONFIGURE= yes >X-WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config >X CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ >X LDFLAGS="-L${LOCALBASE}/lib" >X-CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG} >X >X .if !defined(WITHOUT_NLS) >X USE_GETTEXT= yes >Xdiff -urN /usr/ports/misc/documancer/Makefile misc/documancer/Makefile >X--- /usr/ports/misc/documancer/Makefile Sat Nov 5 02:21:43 2005 >X+++ misc/documancer/Makefile Sat Nov 19 23:14:39 2005 >X@@ -19,11 +19,12 @@ >X BUILD_DEPENDS= wget:${PORTSDIR}/ftp/wget \ >X swish-e:${PORTSDIR}/www/swish-e >X LIB_DEPENDS= wxmozilla_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxmozilla >X-RUN_DEPENDS= ${BUILD_DEPENDS} \ >X- ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X+RUN_DEPENDS= ${BUILD_DEPENDS} >X >X USE_PYTHON= 2.4 >X USE_PERL5= yes >X+USE_WX= 2.4 >X+USE_WXPYTHON_RUN= yes >X GNU_CONFIGURE= yes >X CONFIGURE_ARGS= --libdir=${PREFIX}/share >X >Xdiff -urN /usr/ports/devel/drpython/Makefile devel/drpython/Makefile >X--- /usr/ports/devel/drpython/Makefile Sat Nov 5 02:20:20 2005 >X+++ devel/drpython/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,11 +16,11 @@ >X MAINTAINER= vsevolod@FreeBSD.org >X COMMENT= Highly customizable cross-platform ide to aid programming in Python >X >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26 >X- >X USE_ZIP= yes >X USE_PYTHON= yes >X USE_PYDISTUTILS= yes >X+USE_WX= 2.6 >X+USE_WXPYTHON_RUN= yes >X >X post-install: >X @${ECHO} '#!/bin/sh' > ${WRKDIR}/drpython.sh >Xdiff -urN /usr/ports/multimedia/dvdstyler/Makefile multimedia/dvdstyler/Makefile >X--- /usr/ports/multimedia/dvdstyler/Makefile Tue Nov 15 03:50:12 2005 >X+++ multimedia/dvdstyler/Makefile Sat Nov 19 23:14:39 2005 >X@@ -21,18 +21,17 @@ >X mpgcat:${PORTSDIR}/multimedia/mpgtx \ >X growisofs:${PORTSDIR}/sysutils/dvd+rw-tools >X LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm \ >X- lavfile-1.8.0:${PORTSDIR}/multimedia/mjpegtools \ >X- wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 >X+ lavfile-1.8.0:${PORTSDIR}/multimedia/mjpegtools >X RUN_DEPENDS= ${BUILD_DEPENDS} >X #RUN_DEPENDS+= xine:${PORTSDIR}/multimedia/xine >X >X DVDSTYLER_ICON= ${DATADIR}/rc/dvdstyler.png >X-USE_X_PREFIX= yes >X-USE_REINPLACE= yes >X USE_AUTOTOOLS= libtool:15:inc >X USE_GMAKE= yes >X+USE_REINPLACE= yes >X+USE_WX= 2.6 >X+USE_X_PREFIX= yes >X >X-CONFIGURE_ARGS= --with-wx-config=wxgtk2-2.6-config >X CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" >X >X PORTDOCS= AUTHORS COPYING INSTALL ChangeLog README >Xdiff -urN /usr/ports/devel/ecos-tools/Makefile devel/ecos-tools/Makefile >X--- /usr/ports/devel/ecos-tools/Makefile Sat Nov 5 02:20:22 2005 >X+++ devel/ecos-tools/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,22 +16,22 @@ >X MAINTAINER= tg@FreeBSD.org >X COMMENT= Configuration tools for the eCos embedded OS >X >X-LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84 \ >X- wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X+LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84 >X >X-USE_BZIP2= yes >X WRKSRC= ${WRKDIR}/infra-build >X+USE_BZIP2= yes >X+USE_GMAKE= yes >X+USE_WX= 2.4 >X GNU_CONFIGURE= yes >X CONFIGURE_SCRIPT= ../ecos/host/configure >X CONFIGURE_ARGS= --with-tcl=${PREFIX} --with-tcl-version=8.4 >X CONFIGURE_ENV= TCL_INC_DIR=${PREFIX}/include/tcl8.4 >X-USE_GMAKE= yes >X >X SNAPDATE= 20040125 >X >X ECOSSRCDIR= ${WRKDIR}/ecos/host >X CFGTOOL_WRKSRC= ${WRKDIR}/configtool-build >X-CFGTOOL_MAKE_ENV= WXDIR=${X11BASE} WX_CONFIG=wxgtk2-2.4-config \ >X+CFGTOOL_MAKE_ENV= WXDIR=${X11BASE} WX_CONFIG=${WX_CONFIG} \ >X ECOSSRCDIR=${ECOSSRCDIR} \ >X INSTALLDIR=${PREFIX} >X CFGTOOL_MAKEFILE= ${ECOSSRCDIR}/tools/configtool/standalone/wxwin/makefile.gnu >Xdiff -urN /usr/ports/math/fityk/Makefile math/fityk/Makefile >X--- /usr/ports/math/fityk/Makefile Wed Nov 9 11:35:07 2005 >X+++ math/fityk/Makefile Sat Nov 19 23:14:39 2005 >X@@ -46,12 +46,10 @@ >X LDFLAGS+= -lstlport_gcc >X .endif >X >X-.if defined(WITH_WXGTK24) >X-LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X-CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.4-config >X+.if defined(WITH_WX24) >X+USE_WX= 2.4 >X .else >X-LIB_DEPENDS+= wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 >X-CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.6-config >X+USE_WX= 2.6 >X .endif >X >X post-patch: >Xdiff -urN /usr/ports/ftp/ftpcube/Makefile ftp/ftpcube/Makefile >X--- /usr/ports/ftp/ftpcube/Makefile Sat Nov 5 02:21:32 2005 >X+++ ftp/ftpcube/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,7 +16,6 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= A graphical FTP Client >X >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X .if defined(PACKAGE_BUILDING) >X BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ >X ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} >X@@ -25,6 +24,8 @@ >X USE_REINPLACE= yes >X USE_PYTHON= yes >X USE_PYDISTUTILS= yes >X+USE_WX= 2.4 >X+USE_WXPYTHON_RUN= yes >X >X post-patch: >X @${REINPLACE_CMD} 's,/usr/local,${PREFIX},' ${WRKSRC}/setup.cfg >Xdiff -urN /usr/ports/math/gambit/Makefile math/gambit/Makefile >X--- /usr/ports/math/gambit/Makefile Sat Nov 5 02:21:42 2005 >X+++ math/gambit/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,16 +16,10 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= A library of tools for doing computation in game theory >X >X-LIB_DEPENDS= wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 >X- >X USE_X_PREFIX= yes >X USE_GNOME= gnometarget gtk20 >X+USE_WX= 2.6 >X GNU_CONFIGURE= yes >X-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ >X- WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config" >X-MAKE_ENV= WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config" >X- >X-CPPFLAGS= ${PTHREAD_CFLAGS} >X-LDFLAGS= ${PTHREAD_LIBS} >X+CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" >X >X .include <bsd.port.mk> >Xdiff -urN /usr/ports/math/graphthing/Makefile math/graphthing/Makefile >X--- /usr/ports/math/graphthing/Makefile Sat Nov 12 15:19:32 2005 >X+++ math/graphthing/Makefile Sat Nov 19 23:14:39 2005 >X@@ -14,22 +14,17 @@ >X MAINTAINER= arved@FreeBSD.org >X COMMENT= A tool that allows you to create, manipulate and study graphs >X >X-LIB_DEPENDS= wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 >X- >X USE_BZIP2= yes >X USE_GNOME= gnometarget gtk20 >X USE_BISON= yes >X USE_REINPLACE= yes >X USE_GMAKE= yes >X+USE_WX= 2.6 >X GNU_CONFIGURE= yes >X-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" >X-CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config >X+CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" >X MAKEFILE= GNUmakefile >X >X PLIST_FILES= bin/graphthing bin/gt >X- >X-CPPFLAGS= ${PTHREAD_CFLAGS} >X-LDFLAGS= ${PTHREAD_LIBS} >X >X do-install: >X ${INSTALL_PROGRAM} ${WRKSRC}/src/graphthing ${PREFIX}/bin >Xdiff -urN /usr/ports/security/hashish/Makefile security/hashish/Makefile >X--- /usr/ports/security/hashish/Makefile Sat Nov 5 02:22:06 2005 >X+++ security/hashish/Makefile Sat Nov 19 23:14:39 2005 >X@@ -18,14 +18,13 @@ >X COMMENT= GUI file and string hashing utility >X >X BUILD_DEPENDS= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X >X+USE_GMAKE= yes >X+USE_WX= 2.4 >X GNU_CONFIGURE= yes >X CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} >X CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ >X- LDFLAGS="-L${LOCALBASE}/lib" \ >X- WX_CONFIG="${X11BASE}/bin/wxgtk2-2.4-config" >X-USE_GMAKE= yes >X+ LDFLAGS="-L${LOCALBASE}/lib" >X PLIST_FILES= bin/hashish >X >X .include <bsd.port.mk> >Xdiff -urN /usr/ports/graphics/hugin/Makefile graphics/hugin/Makefile >X--- /usr/ports/graphics/hugin/Makefile Sat Nov 5 02:19:13 2005 >X+++ graphics/hugin/Makefile Sat Nov 19 23:14:39 2005 >X@@ -22,23 +22,21 @@ >X png:${PORTSDIR}/graphics/png \ >X jpeg:${PORTSDIR}/graphics/jpeg \ >X fftw:${PORTSDIR}/math/fftw \ >X- wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \ >X- wx_gtk2_xrc-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24-contrib \ >X boost_date_time:${PORTSDIR}/devel/boost >X RUN_DEPENDS= PTOptimizer:${PORTSDIR}/graphics/libpano12 \ >X PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools >X >X+USE_BZIP2= yes >X+USE_GETTEXT= yes >X+USE_GMAKE= yes >X+USE_ICONV= yes >X+USE_WX= 2.4 >X+USE_WXCONTRIB= yes >X GNU_CONFIGURE= yes >X CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} >X-CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG} >X CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-32" \ >X LDFLAGS="-L${LOCALBASE}/lib" >X-USE_GMAKE= yes >X-USE_BZIP2= yes >X-USE_ICONV= yes >X-USE_GETTEXT= yes >X >X DOCSDIR= ${PREFIX}/share/hugin/xrc/data >X-WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config >X >X .include <bsd.port.mk> >Xdiff -urN /usr/ports/devel/klassmodeler/Makefile devel/klassmodeler/Makefile >X--- /usr/ports/devel/klassmodeler/Makefile Tue Nov 15 03:48:44 2005 >X+++ devel/klassmodeler/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,14 +16,12 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= A tool for visually creating and documenting classes >X >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X- >X+WRKSRC= ${WRKDIR}/${PORTNAME} >X USE_ZIP= yes >X USE_REINPLACE= yes >X-WRKSRC= ${WRKDIR}/${PORTNAME} >X-WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config >X-USE_GNOME= gnometarget >X USE_AUTOTOOLS= libtool:15 >X+USE_GNOME= gnometarget >X+USE_WX= 2.4 >X CONFIGURE_ENV= WXWINDOWS="yes" >X >X PLIST_FILES= bin/klassmodeler >X@@ -43,7 +41,6 @@ >X ${MV} ${WRKSRC}/${df} ${WRKSRC}/${df}.dos >X ${TR} -d '\r' < ${WRKSRC}/${df}.dos > ${WRKSRC}/${df} >X .endfor >X- @${REINPLACE_CMD} -e "s,\`wx-config,\`${WX_CONFIG}," ${WRKSRC}/${CONFIGURE_SCRIPT} >X ${CHMOD} a+x ${WRKSRC}/${CONFIGURE_SCRIPT} >X >X do-install: >Xdiff -urN /usr/ports/mail/mahogany/Makefile mail/mahogany/Makefile >X--- /usr/ports/mail/mahogany/Makefile Sat Nov 5 02:21:42 2005 >X+++ mail/mahogany/Makefile Sat Nov 19 23:14:39 2005 >X@@ -5,35 +5,33 @@ >X # $FreeBSD: ports/mail/mahogany/Makefile,v 1.27 2005/11/05 05:21:42 marcus Exp $ >X # >X >X-PORTNAME= mahogany >X-PORTVERSION= 0.65 >X-PORTREVISION= 6 >X-CATEGORIES= mail >X-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} >X+PORTNAME= mahogany >X+PORTVERSION= 0.65 >X+PORTREVISION= 6 >X+CATEGORIES= mail >X+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} >X MASTER_SITE_SUBDIR= mahogany >X >X-MAINTAINER= ports@FreeBSD.org >X-COMMENT= An X11 mail and news client >X+MAINTAINER= ports@FreeBSD.org >X+COMMENT= An X11 mail and news client >X >X-LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X+USE_X_PREFIX= yes >X+GNU_CONFIGURE= yes >X+USE_GMAKE= yes >X+USE_WX= 2.4 >X+USE_REINPLACE= yes >X+ALL_TARGET= all locales >X+INSTALL_TARGET= install_bin install_locale >X >X-USE_X_PREFIX= yes >X-GNU_CONFIGURE= yes >X-USE_GMAKE= yes >X-USE_REINPLACE= yes >X-ALL_TARGET= all locales >X-INSTALL_TARGET= install_bin install_locale >X- >X-MAN1= M.1 mahogany.1 >X- >X-CONFIGURE_ARGS= --with-python=none \ >X- --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config >X-CONFIGURE_ENV= OSTYPE=${OPSYS} CFLAGS="${CFLAGS}" >X+MAN1= M.1 mahogany.1 >X+ >X+CONFIGURE_ARGS= --with-python=none >X+CONFIGURE_ENV= OSTYPE=${OPSYS} CFLAGS="${CFLAGS}" >X >X .include <bsd.port.pre.mk> >X >X .if ${ARCH} != "i386" >X-BROKEN= "Does not compile on !i386" >X+BROKEN= "Does not compile on !i386" >X .endif >X >X post-patch: >Xdiff -urN /usr/ports/audio/mbox/Makefile audio/mbox/Makefile >X--- /usr/ports/audio/mbox/Makefile Sat Nov 5 02:21:23 2005 >X+++ audio/mbox/Makefile Sat Nov 19 23:14:39 2005 >X@@ -12,16 +12,16 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= Program intended to help with organizing your music files >X >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 \ >X- ${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \ >X+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \ >X ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \ >X lame:${PORTSDIR}/audio/lame \ >X oggenc:${PORTSDIR}/audio/vorbis-tools \ >X mplayer:${PORTSDIR}/multimedia/mplayer >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X >X USE_PYTHON= yes >X USE_PYDISTUTILS=yes >X+USE_WX= 2.4 >X+USE_WXPYTHON_RUN= yes >X USE_BZIP2= yes >X WRKSRC= ${WRKDIR}/mBox-${PORTVERSION} >X >Xdiff -urN /usr/ports/multimedia/mkvtoolnix/Makefile multimedia/mkvtoolnix/Makefile >X--- /usr/ports/multimedia/mkvtoolnix/Makefile Sat Nov 5 02:20:00 2005 >X+++ multimedia/mkvtoolnix/Makefile Sat Nov 19 23:14:39 2005 >X@@ -57,13 +57,10 @@ >X PLIST_FILES+= %%DATADIR%%/${file} >X .endfor >X >X-WXGTK_CONFIG= wxgtk2-2.4-config >X- >X .include <bsd.port.pre.mk> >X >X-.ifndef(WITHOUT_WXGTK) >X-LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X- >X+.ifndef(WITHOUT_WX) >X+USE_WX= 2.4 >X MAN1+= mmg.1 >X PLIST_FILES+= bin/mmg >X .endif >X@@ -74,14 +71,14 @@ >X >X .if ${OSVERSION} < 500000 >X BROKEN= "Does not compile on FreeBSD 4.x" >X-CFLAGS+= -DNO_WSTRING >X+CFLAGS+= -DNO_WSTRING >X .endif >X >X pre-everything:: >X-.ifndef(WITHOUT_WXGTK) >X+.ifndef(WITHOUT_WX) >X @${ECHO_MSG} "===>" >X- @${ECHO_MSG} "===> You can disable wxGTK2 support by defining" >X- @${ECHO_MSG} "===> WITHOUT_WXGTK" >X+ @${ECHO_MSG} "===> You can disable WxWidgets support by defining" >X+ @${ECHO_MSG} "===> WITHOUT_WX" >X @${ECHO_MSG} "===>" >X .endif >X >X@@ -90,8 +87,6 @@ >X @${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \ >X -n 10 ${REINPLACE_CMD} -E -e \ >X 's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!' >X- @${REINPLACE_CMD} -e 's|wx-config|${WXGTK_CONFIG}|' \ >X- ${WRKSRC}/configure >X @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ >X ${WRKSRC}/src/common/os.cpp >X >Xdiff -urN /usr/ports/graphics/multivideo/Makefile graphics/multivideo/Makefile >X--- /usr/ports/graphics/multivideo/Makefile Sat Nov 5 02:21:39 2005 >X+++ graphics/multivideo/Makefile Sat Nov 19 23:14:39 2005 >X@@ -16,19 +16,16 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= An image sequence viewer >X >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X- >X WRKSRC= ${WRKDIR}/${PORTNAME} >X >X USE_BZIP2= yes >X USE_REINPLACE= yes >X USE_GMAKE= yes >X+USE_WX= 2.4 >X MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" >X ALL_TARGET= default >X >X PLIST_FILES= bin/multivideo >X- >X-WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config >X >X post-patch: >X @${REINPLACE_CMD} -e 's|g++|\$$\(CXX)|g ; \ >Xdiff -urN /usr/ports/net/mute-net/Makefile net/mute-net/Makefile >X--- /usr/ports/net/mute-net/Makefile Sat Nov 5 02:20:01 2005 >X+++ net/mute-net/Makefile Sat Nov 19 23:14:39 2005 >X@@ -30,9 +30,7 @@ >X PATCH_WRKSRC= ${WRKDIR}/${RELEASE_DIRECTORY} >X >X .ifndef(WITHOUT_GUI) >X-LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X- >X-WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config >X+USE_WX= 2.4 >X .endif >X >X # >Xdiff -urN /usr/ports/security/newpki-client/Makefile security/newpki-client/Makefile >X--- /usr/ports/security/newpki-client/Makefile Tue Nov 15 03:51:01 2005 >X+++ security/newpki-client/Makefile Sat Nov 19 23:14:40 2005 >X@@ -15,21 +15,19 @@ >X COMMENT= C++ PKI client from newpki project >X >X LIB_DEPENDS= newpki.2:${PORTSDIR}/security/newpki-lib \ >X- xml2:${PORTSDIR}/textproc/libxml2 \ >X- wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X+ xml2:${PORTSDIR}/textproc/libxml2 >X >X WRKSRC= ${WRKDIR}/${PORTNAME}-2.0.0 >X >X USE_AUTOTOOLS= libtool:15 >X USE_OPENSSL= yes >X-WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config >X+USE_WX= 2.4 >X USE_GNOME= gnometarget >X USE_GMAKE= yes >X USE_REINPLACE= yes >X >X CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ >X- LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib" \ >X- WXCONFIG=${WX_CONFIG} >X+ LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib" >X CONFIGURE_ARGS+= --with-newpki-include=${PREFIX}/include/newpki \ >X --with-newpki-lib=${PREFIX}/lib \ >X --with-libxml2-include=${PREFIX}/include/libxml2 >Xdiff -urN /usr/ports/databases/pgadmin3-12/Makefile pgadmin3-12/Makefile >X--- /usr/ports/databases/pgadmin3-12/Makefile Sat Nov 19 15:09:45 2005 >X+++ pgadmin3-12/Makefile Mon Nov 21 14:25:16 2005 >X@@ -17,8 +17,9 @@ >X >X USE_PGSQL= yes >X USE_REINPLACE= yes >X+USE_WX= 2.6 >X+USE_WXCONTRIB= yes >X GNU_CONFIGURE= yes >X-CONFIGURE_ARGS= --with-wx=${X11BASE} --with-wx-config=${WX_CONFIG} >X CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} >X CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}" >X CONFLICTS= pgadmin3-1.[456789]* >X@@ -36,16 +37,12 @@ >X .endif >X >X .if !defined(WITHOUT_UNICODE) >X-LIB_DEPENDS+= wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib >X-WX_CONFIG= wxgtk2u-2.6-config >X+USE_WXUNICODE= yes >X PKGNAMESUFFIX= -unicode >X PKGMESSAGE= ${PKGDIR}/pkg-message-unicode >X >X post-install: >X @${CAT} ${PKGMESSAGE} >X-.else >X-LIB_DEPENDS+= wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib >X-WX_CONFIG= wxgtk2-2.6-config >X .endif # WITHOUT_UNICODE >X >X .include <bsd.port.post.mk> >Xdiff -urN /usr/ports/databases/pgadmin3/Makefile pgadmin3/Makefile >X--- /usr/ports/databases/pgadmin3/Makefile Sat Nov 19 15:09:08 2005 >X+++ pgadmin3/Makefile Mon Nov 21 14:30:12 2005 >X@@ -16,23 +16,16 @@ >X >X USE_PGSQL= yes >X BROKEN_WITH_PGSQL= 73 >X+USE_WX= 2.6 >X+USE_WXCONTRIB= yes >X+USE_WXUNICODE= yes >X USE_REINPLACE= yes >X GNU_CONFIGURE= yes >X-CONFIGURE_ARGS= --with-wx=${X11BASE} --with-wx-config=${WX_CONFIG} >X CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} >X CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}" >X CONFLICTS= pgadmin3-1.[12]* >X >X-LIB_DEPENDS+= wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib >X-WX_CONFIG= wxgtk2u-2.6-config >X- >X post-install: >X @${CAT} ${PKGMESSAGE} >X >X-.include <bsd.port.pre.mk> >X- >X-.if ${OSVERSION} < 500000 >X-BROKEN= requires wchar_t >X-.endif >X- >X-.include <bsd.port.post.mk> >X+.include <bsd.port.mk> >Xdiff -urN /usr/ports/editors/poedit/Makefile editors/poedit/Makefile >X--- /usr/ports/editors/poedit/Makefile Sat Nov 5 02:21:31 2005 >X+++ editors/poedit/Makefile Sat Nov 19 23:14:40 2005 >X@@ -52,12 +52,10 @@ >X WITH_BDB_VER?= 4 >X LIB_SUFFIX?= ${WITH_BDB_VER} >X >X-.if defined(WITH_WXGTK24) >X-LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X-CONFIGURE_ARGS+= --with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config >X+.if defined(WITH_WX24) >X+USE_WX= 2.4 >X .else >X-LIB_DEPENDS+= wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 >X-CONFIGURE_ARGS+= --with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config >X+USE_WX= 2.6 >X .endif >X >X post-patch: >Xdiff -urN /usr/ports/x11-toolkits/py-SciParam/Makefile x11-toolkits/py-SciParam/Makefile >X--- /usr/ports/x11-toolkits/py-SciParam/Makefile Sat Nov 5 02:21:57 2005 >X+++ x11-toolkits/py-SciParam/Makefile Sat Nov 19 23:14:40 2005 >X@@ -19,11 +19,11 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= Scientific Parameter Dialogs in wxPython based user interfaces >X >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X- >X USE_BZIP2= yes >X USE_PYTHON= yes >X USE_PYDISTUTILS= yes >X+USE_WX= 2.4 >X+USE_WXPYTHON_RUN= yes >X >X .if !defined(NOPORTDOCS) >X DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} >Xdiff -urN /usr/ports/net/py-bittornado/Makefile net/py-bittornado/Makefile >X--- /usr/ports/net/py-bittornado/Makefile Sat Nov 5 20:36:03 2005 >X+++ net/py-bittornado/Makefile Sat Nov 19 23:14:40 2005 >X@@ -48,7 +48,8 @@ >X >X # required for GUI >X .ifndef(WITHOUT_GUI) >X-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X+USE_WX= 2.4 >X+USE_WXPYTHON_RUN= yes >X PLIST_SUB+= GUI='' >X EXTRA_PATCHES+= ${FILESDIR}/extra-gui-patch-setup.py >X .else >Xdiff -urN /usr/ports/textproc/py-dsv/Makefile textproc/py-dsv/Makefile >X--- /usr/ports/textproc/py-dsv/Makefile Wed Jul 20 11:47:49 2005 >X+++ textproc/py-dsv/Makefile Sat Nov 19 23:14:40 2005 >X@@ -17,7 +17,8 @@ >X COMMENT= A Python module to parse or write delimeter-separated (e.g. CSV) files >X >X .if defined(WITH_GUI) >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X+USE_WX= 2.4 >X+USE_WXPYTHON_RUN= yes >X .endif >X >X USE_PYTHON= yes >Xdiff -urN /usr/ports/net/py-kenosis-bittorrent/Makefile net/py-kenosis-bittorrent/Makefile >X--- /usr/ports/net/py-kenosis-bittorrent/Makefile Sat Nov 5 02:20:01 2005 >X+++ net/py-kenosis-bittorrent/Makefile Sat Nov 19 23:14:40 2005 >X@@ -48,7 +48,8 @@ >X >X # required for GUI >X .ifndef(WITHOUT_GUI) >X-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X+USE_WX= 2.4 >X+USE_WXPYTHON_RUN= yes >X >X EXTRA_PATCHES+= ${FILESDIR}/extra-gui-patch-setup.py >X >Xdiff -urN /usr/ports/net/py-mp-random/Makefile net/py-mp-random/Makefile >X--- /usr/ports/net/py-mp-random/Makefile Thu May 12 13:39:55 2005 >X+++ net/py-mp-random/Makefile Sat Nov 19 23:14:40 2005 >X@@ -16,9 +16,9 @@ >X MAINTAINER= randomimage-widget@mirrorproject.com >X COMMENT= Display random Mirror Project images on your desktop >X >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython24 >X- >X USE_PYTHON= yes >X+USE_WX= 2.4 >X+USE_WXPYTHON_RUN= yes >X USE_X_PREFIX= yes >X NO_BUILD= yes >X >Xdiff -urN /usr/ports/science/py-scipy/Makefile science/py-scipy/Makefile >X--- /usr/ports/science/py-scipy/Makefile Wed May 18 12:44:50 2005 >X+++ science/py-scipy/Makefile Sat Nov 19 23:14:40 2005 >X@@ -18,14 +18,15 @@ >X >X BUILD_DEPENDS= ${PYNUMERIC} \ >X ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \ >X- f2py:${PORTSDIR}/lang/f2py \ >X- ${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X+ f2py:${PORTSDIR}/lang/f2py >X LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \ >X atlas.1:${PORTSDIR}/math/atlas >X >X USE_REINPLACE= yes >X USE_PYTHON= 2.3+ >X USE_PYDISTUTILS= yes >X+USE_WX= 2.4 >X+USE_WXPYTHON_BUILD= yes >X >X post-patch: >X @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ >Xdiff -urN /usr/ports/x11-toolkits/py-wxPython24/Makefile x11-toolkits/py-wxPython24/Makefile >X--- /usr/ports/x11-toolkits/py-wxPython24/Makefile Sat Nov 5 02:21:58 2005 >X+++ x11-toolkits/py-wxPython24/Makefile Sat Nov 19 23:14:40 2005 >X@@ -19,19 +19,22 @@ >X >X RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl >X >X-WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython >X-NO_LATEST_LINK= yes >X- >X USE_GMAKE= yes >X+USE_WX= 2.4 >X USE_PYTHON= yes >X USE_PYDISTUTILS=yes >X-PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" >X+PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" WXPORT="${WXPORT}" >X+ >X+WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython >X+NO_LATEST_LINK= yes >X+ >X DEMO_DIR= ${PYTHONPREFIX_SITELIBDIR}/wxPython/demo >X+WXPORT= gtk2 >X >X post-build: >X @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/demo >X-.if !defined(DEBUG_FLAGS) >X- @${FIND} ${WRKSRC} -name "*.so" | ${XARGS} strip >X+.if defined(WITH_DEBUG) >X+ @${FIND} ${WRKSRC} -type f -name "*.so" | ${XARGS} ${STRIP_CMD} >X .endif >X >X post-install: >X@@ -41,18 +44,12 @@ >X .endfor >X .for dir in bitmaps bmp_source data >X @${MKDIR} ${DEMO_DIR}/${dir} >X-.for glob in * >X- @${INSTALL_DATA} ${WRKSRC}/demo/${dir}/${glob} ${DEMO_DIR}/${dir} >X-.endfor >X+ @${INSTALL_DATA} ${WRKSRC}/demo/${dir}/* ${DEMO_DIR}/${dir} >X .endfor >X >X .include <bsd.port.pre.mk> >X >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X-WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config >X- >X-CONFIGURE_ARGS+= --enable-gtk2 >X-PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 >X-PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} >X+PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} \ >X+ ${PYDISTUTILS_BUILDARGS} >X >X .include <bsd.port.post.mk> >Xdiff -urN /usr/ports/x11-toolkits/py-wxPython24/distinfo x11-toolkits/py-wxPython24/distinfo >X--- /usr/ports/x11-toolkits/py-wxPython24/distinfo Thu Jan 29 13:12:46 2004 >X+++ x11-toolkits/py-wxPython24/distinfo Sat Nov 19 23:14:40 2005 >X@@ -1,2 +1,3 @@ >X MD5 (wxPythonSrc-2.4.2.4.tar.gz) = ea4eb68e10a0c2a9be643b35dcb78e41 >X+SHA256 (wxPythonSrc-2.4.2.4.tar.gz) = ae64f838adefe109905e3fbd6b656d088cf6ae9732131893bafc03198edb563a >X SIZE (wxPythonSrc-2.4.2.4.tar.gz) = 13130195 >Xdiff -urN /usr/ports/x11-toolkits/py-wxPython26-common/Makefile x11-toolkits/py-wxPython26-common/Makefile >X--- /usr/ports/x11-toolkits/py-wxPython26-common/Makefile Sun Oct 9 06:43:39 2005 >X+++ x11-toolkits/py-wxPython26-common/Makefile Sat Nov 19 23:14:40 2005 >X@@ -11,6 +11,7 @@ >X >X PLIST= ${.CURDIR}/pkg-plist >X >X-LIB_DEPENDS+= wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib >X+USE_WX= 2.6 >X+USE_WXCONTRIB= yes >X >X .include "${MASTERDIR}/Makefile" >Xdiff -urN /usr/ports/x11-toolkits/py-wxPython26/Makefile py-wxPython26/Makefile >X--- /usr/ports/x11-toolkits/py-wxPython26/Makefile Sat Nov 5 02:20:16 2005 >X+++ py-wxPython26/Makefile Mon Nov 21 15:33:33 2005 >X@@ -19,16 +19,17 @@ >X >X RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl >X >X-WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython >X- >X USE_GMAKE= yes >X+USE_REINPLACE= yes >X+USE_WX= 2.6 >X+USE_WXCONTRIB= yes >X USE_PYTHON= yes >X USE_PYDISTUTILS=yes >X-USE_REINPLACE= yes >X-PYDISTUTILS_BUILDARGS= \ >X- WX_CONFIG="${WX_CONFIG}" \ >X- WXPORT="${WXPORT}" >X+PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" WXPORT="${WXPORT}" >X PYDISTUTILS_CONFIGUREARGS= ${PYDISTUTILS_BUILDARGS} >X+ >X+WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython >X+ >X DEMO_DIR= ${PYTHONPREFIX_SITELIBDIR}/wxPython/demo >X WXPORT= gtk2 >X >X@@ -38,10 +39,8 @@ >X >X post-patch: >X # fix python location >X- @${REINPLACE_CMD} -E \ >X- -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ >X+ @${REINPLACE_CMD} -E -i "" -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ >X ${WRKSRC}/scripts/* >X- @${RM} ${WRKSRC}/scripts/*.bak >X >X pre-configure: >X # uphold PREFIX >X@@ -52,82 +51,52 @@ >X post-build: >X # Shared amongst ansi/unicode installations >X .if defined(WITH_COMMON_ONLY) >X-. for dir in demo wxversion >X+. for dir in demo wxversion >X @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/${dir} >X @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/${dir} >X-. endfor >X+. endfor >X .endif >X-.if !defined(DEBUG_FLAGS) >X- @${FIND} ${WRKSRC} -name "*.so" | ${XARGS} ${STRIP_CMD} >X+.if !defined(WITH_DEBUG) >X+ @${FIND} ${WRKSRC} -type f -name "*.so" | ${XARGS} ${STRIP_CMD} >X .endif >X >X .include <bsd.port.pre.mk> >X >X-# are we ready for unicode? >X-.if defined(WITH_UNICODE) >X-. if ${OSVERSION} < 500000 >X-IGNORE= Systems prior to FreeBSD 5.0 do not support Unicode >X-. endif >X-.endif >X- >X-# build dependencies >X-.if defined(WITH_UNICODE) >X-BUILD_DEPENDS+= ${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode >X- >X-WX_CONFIG= ${X11BASE}/bin/wxgtk2u-2.6-config >X-.else >X-BUILD_DEPENDS+= ${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26 >X- >X-WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.6-config >X-.endif >X- >X # wx version >X .if exists(${WX_CONFIG}) >X WX_VERSION!= ${WX_CONFIG} --release >X- >X PLIST_SUB+= WX_VERSION=${WX_VERSION} >X .endif >X >X .if defined(WITH_COMMON_ONLY) >X ## These are not shared amongst installations >X PKGNAMESUFFIX= -common >X- >X-PYDISTUTILS_BUILDARGS+= \ >X- INSTALL_MULTIVERSION=1 >X+PYDISTUTILS_BUILDARGS+= INSTALL_MULTIVERSION=1 >X .else >X ## These are shared >X RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxversion.py:${PORTSDIR}/x11-toolkits/py-wxPython26-common >X >X-PYDISTUTILS_BUILDARGS+= \ >X- NO_HEADERS=1 \ >X- NO_SCRIPTS=1 \ >X- INSTALL_MULTIVERSION=0 >X+PYDISTUTILS_BUILDARGS+= NO_HEADERS=1 NO_SCRIPTS=1 INSTALL_MULTIVERSION=0 >X INSTALLS_SHLIB= yes >X >X . if defined(WITH_UNICODE) >X-LIB_DEPENDS+= wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \ >X- wx_gtk2u_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib >X- >X+USE_WXUNICODE= yes >X PKGNAMESUFFIX= -unicode >X- >X-PYDISTUTILS_BUILDARGS+= \ >X- UNICODE=1 >X+PYDISTUTILS_BUILDARGS+= UNICODE=1 >X WX_PYTHON_DIR= wx-${WX_VERSION}-${WXPORT}-unicode >X . else >X-LIB_DEPENDS+= wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \ >X- wx_gtk2_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib >X- >X-WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi >X-. endif # defined(WITH_UNICODE) >X+WX_PYTHON_DIR= wx-${WX_VERSION}-${WXPORT}-ansi >X+. endif # WITH_UNICODE >X >X # plist substitutions and library dirs >X PLIST_SUB+= WX_PYTHON_DIR=${WX_PYTHON_DIR} >X LDCONFIG_DIRS+= %%PREFIX%%/%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wx/ >X >X-.endif # !defined(WITH_COMMON_ONLY) >X+.endif # !WITH_COMMON_ONLY >X >X # install arguments >X-PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} >X+PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} \ >X+ ${PYDISTUTILS_BUILDARGS} >X >X ## Shared amongst ansi/unicode installations >X # XXX - Override do-install since I was not able to tell setup.py to >X@@ -141,9 +110,7 @@ >X .endfor >X .for dir in bitmaps bmp_source data >X @${MKDIR} ${DEMO_DIR}/${dir} >X-. for glob in * >X- @${INSTALL_DATA} ${WRKSRC}/demo/${dir}/${glob} ${DEMO_DIR}/${dir} >X-. endfor >X+ @${INSTALL_DATA} ${WRKSRC}/demo/${dir}/* ${DEMO_DIR}/${dir} >X .endfor >X # header files >X @${MKDIR} ${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython/i_files >X@@ -160,7 +127,7 @@ >X # wxversion script >X @${INSTALL_DATA} ${WRKSRC}/wxversion/* \ >X ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@} >X-.endif # defined(WITH_COMMON_ONLY) >X+.endif # WITH_COMMON_ONLY >X >X post-install: >X .if !defined(WITH_COMMON_ONLY) >Xdiff -urN /usr/ports/databases/pydbdesigner/Makefile databases/pydbdesigner/Makefile >X--- /usr/ports/databases/pydbdesigner/Makefile Sat Nov 5 02:21:27 2005 >X+++ databases/pydbdesigner/Makefile Sat Nov 19 23:14:40 2005 >X@@ -18,10 +18,9 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= Graphical designer for relational databases >X >X-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X- >X USE_PYTHON= yes >X+USE_WX= 2.4 >X+USE_WXPYTHON= yes >X PLIST= ${WRKDIR}/plist >X WRKSRC= ${WRKDIR}/${PORTNAME} >X >Xdiff -urN /usr/ports/net/pyslsk/Makefile net/pyslsk/Makefile >X--- /usr/ports/net/pyslsk/Makefile Sat Nov 5 02:21:21 2005 >X+++ net/pyslsk/Makefile Sat Nov 19 23:14:40 2005 >X@@ -14,9 +14,6 @@ >X MAINTAINER= shoesoft@gmx.net >X COMMENT= Client for SoulSeek filesharing system >X >X-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26 >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26 >X- >X .if !defined(WITHOUT_VORBIS) >X RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis >X .endif >X@@ -27,6 +24,8 @@ >X >X USE_PYTHON= yes >X USE_PYDISTUTILS=yes >X+USE_WX= 2.6 >X+USE_WXPYTHON= yes >X >X .include <bsd.port.pre.mk> >X >Xdiff -urN /usr/ports/x11-toolkits/ruby-wx/Makefile x11-toolkits/ruby-wx/Makefile >X--- /usr/ports/x11-toolkits/ruby-wx/Makefile Sat Nov 5 02:19:33 2005 >X+++ x11-toolkits/ruby-wx/Makefile Sat Nov 19 23:14:40 2005 >X@@ -17,9 +17,8 @@ >X MAINTAINER= q@galgenberg.net >X COMMENT= Ruby bindings for wxWindows (aka wxWidgets) >X >X-LIB_DEPENDS= wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk24 \ >X- wx_gtk2_xrc-2.4:${PORTSDIR}/x11-toolkits/wxgtk24-contrib >X- >X+USE_WX= 2.4 >X+USE_WXCONTRIB= yes >X USE_ICONV= yes >X USE_RUBY= yes >X USE_RUBY_EXTCONF= yes >X@@ -37,7 +36,6 @@ >X post-patch: >X @${FIND} ${WRKSRC} -name *.t | ${XARGS} ${REINPLACE_CMD} -e 's| ||' >X @${REINPLACE_CMD} -E 's/ html(processor|window).o//' ${WRKSRC}/depend >X- @${REINPLACE_CMD} -e 's/wx-config/wxgtk2-2.4-config/' ${WRKSRC}/extconf.rb >X >X .if !defined(NOPORTDOCS) >X post-install: >Xdiff -urN /usr/ports/games/scorched3d/Makefile games/scorched3d/Makefile >X--- /usr/ports/games/scorched3d/Makefile Tue Nov 15 03:49:20 2005 >X+++ games/scorched3d/Makefile Sat Nov 19 23:14:40 2005 >X@@ -5,50 +5,48 @@ >X # >X # $FreeBSD: ports/games/scorched3d/Makefile,v 1.26 2005/11/15 06:49:20 ade Exp $ >X >X-PORTNAME= scorched3d >X-PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION} >X+PORTNAME= scorched3d >X+PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION} >X PORTREVISION= 1 >X-CATEGORIES= games >X-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} >X+CATEGORIES= games >X+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} >X MASTER_SITE_SUBDIR= scorched3d >X-DISTNAME= Scorched3D-${SCORCH_VERSION}-src >X+DISTNAME= Scorched3D-${SCORCH_VERSION}-src >X >X-MAINTAINER= guy@device.dyndns.org >X-COMMENT= Scorched is a game based loosely on the classic DOS game >X+MAINTAINER= guy@device.dyndns.org >X+COMMENT= Scorched is a game based loosely on the classic DOS game >X >X-BUILD_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \ >X- wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \ >X- openal-config:${PORTSDIR}/audio/openal >X-RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \ >X- wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \ >X- openal-config:${PORTSDIR}/audio/openal >X+LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal >X >X-SCORCH_VERSION= 39.1 >X+WRKSRC= ${WRKDIR}/scorched >X >X-.if defined(WITH_MYSQL) >X-USE_MYSQL= yes >X-.endif >X-USE_SDL= mixer net sdl >X-GNU_CONFIGURE= yes >X-USE_GL= yes >X-USE_GMAKE= yes >X+USE_GMAKE= yes >X+USE_REINPLACE= yes >X USE_AUTOTOOLS= automake:15 autoconf:253 >X-USE_REINPLACE= yes >X+USE_GL= yes >X+USE_SDL= mixer net sdl >X+USE_WX= 2.6 >X+GNU_CONFIGURE= yes >X+ >X+AUTOMAKE_ARGS= --foreign >X+CONFIGURE_ARGS= --program-prefix='' \ >X+ --prefix=${PREFIX}/games/scorched3d \ >X+ --datadir=${PREFIX}/games/scorched3d \ >X+ --with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config >X+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" >X+MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \ >X+ AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}" >X >X-WRKSRC= ${WRKDIR}/scorched >X-AUTOMAKE_ARGS= --foreign >X-CONFIGURE_ARGS= --program-prefix='' \ >X- --prefix=${PREFIX}/games/scorched3d \ >X- --datadir=${PREFIX}/games/scorched3d \ >X- --with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config >X-.if defined(WITH_MYSQL) >X-CONFIGURE_ARGS+= --with-mysql >X-.endif >X-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" >X-MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \ >X- AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}" >X+OPTIONS= MYSQL "Use MySQL" off >X+ >X+SCORCH_VERSION= 39.1 >X >X .include <bsd.port.pre.mk> >X+ >X+.if defined(WITH_MYSQL) >X+USE_MYSQL= yes >X+CONFIGURE_ARGS+=--with-mysql >X+.endif >X >X post-patch: >X @${REINPLACE_CMD} -E 's,#include.*<SDL/(SDL.*\.h)>,#include <SDL11/\1>,g' \ >Xdiff -urN /usr/ports/biology/treeviewx/Makefile biology/treeviewx/Makefile >X--- /usr/ports/biology/treeviewx/Makefile Sat Nov 5 02:19:07 2005 >X+++ biology/treeviewx/Makefile Sat Nov 19 23:14:40 2005 >X@@ -16,12 +16,10 @@ >X MAINTAINER= fernan@iib.unsam.edu.ar >X COMMENT= A phylogenetic tree viewer >X >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \ >X- wx_gtk2_dcsvg-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24-contrib >X- >X USE_GMAKE= yes >X+USE_WX= 2.4 >X+USE_WXCONTRIB= yes >X GNU_CONFIGURE= yes >X-CONFIGURE_ENV= WX_CONFIG="${X11BASE}/bin/wxgtk2-2.4-config" >X >X PLIST_FILES= bin/tv >X >Xdiff -urN /usr/ports/comms/trustedqsl/Makefile comms/trustedqsl/Makefile >X--- /usr/ports/comms/trustedqsl/Makefile Sat Nov 5 02:19:13 2005 >X+++ comms/trustedqsl/Makefile Sat Nov 19 23:14:40 2005 >X@@ -16,11 +16,11 @@ >X MAINTAINER= db@db.net >X COMMENT= Amateur Radio Station electronic trusted logbook >X >X-LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ >X- wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X+LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 >X >X-USE_GETOPT_LONG= yes >X+USE_GETOPT_LONG=yes >X USE_REINPLACE= yes >X+USE_WX= 2.4 >X MAKE_ENV= INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" >X >X WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} >Xdiff -urN /usr/ports/devel/wxGlade/Makefile devel/wxGlade/Makefile >X--- /usr/ports/devel/wxGlade/Makefile Sat Nov 5 02:19:45 2005 >X+++ devel/wxGlade/Makefile Sat Nov 19 23:14:40 2005 >X@@ -14,13 +14,8 @@ >X MAINTAINER= alejandro@varnet.biz >X COMMENT= GUI builder for wxPython/wxWindows written in Python >X >X-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/${WX_PYTHON_DIR}/wxPython/_wx.py:${PORTSDIR}/x11-toolkits/py-wxPython26 >X- >X-.if defined(WITH_UNICODE) >X-WX_PYTHON_DIR= wx-2.6-gtk2-unicode >X-.else >X-WX_PYTHON_DIR= wx-2.6-gtk2-ansi >X-.endif >X+USE_WX= 2.6 >X+USE_WXPYTHON_RUN= yes >X >X WRKSRC= ${WRKDIR}/wxGlade-${PORTVERSION} >X >Xdiff -urN /usr/ports/math/wxMaxima/Makefile math/wxMaxima/Makefile >X--- /usr/ports/math/wxMaxima/Makefile Sat Nov 5 02:19:15 2005 >X+++ math/wxMaxima/Makefile Sat Nov 19 23:14:40 2005 >X@@ -15,13 +15,11 @@ >X MAINTAINER= nivit@email.it >X COMMENT= A wxWidgets GUI for the computer algebra system maxima >X >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X RUN_DEPENDS= maxima:${PORTSDIR}/math/maxima >X >X USE_GNOME= libxml2 >X-WXGTK_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config >X+USE_WX= 2.4 >X GNU_CONFIGURE= yes >X-CONFIGURE_ARGS= --with-wx-config=${WXGTK_CONFIG} \ >X- --program-prefix= >X+CONFIGURE_ARGS= --program-prefix= >X >X .include <bsd.port.mk> >Xdiff -urN /usr/ports/x11-toolkits/wxgtk24-contrib/Makefile x11-toolkits/wxgtk24-contrib/Makefile >X--- /usr/ports/x11-toolkits/wxgtk24-contrib/Makefile Sat Nov 5 02:19:08 2005 >X+++ x11-toolkits/wxgtk24-contrib/Makefile Sat Nov 19 23:14:39 2005 >X@@ -12,7 +12,7 @@ >X >X WXGTK_FLAVOR= gtk2-contrib >X MASTERDIR= ${.CURDIR}/../wxgtk24 >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X+USE_WX= 2.4 >X >X BUILD_WRKSRC= ${WRKSRC}/contrib/src >X INSTALL_WRKSRC= ${BUILD_WRKSRC} >Xdiff -urN /usr/ports/x11-toolkits/wxgtk24/distinfo x11-toolkits/wxgtk24/distinfo >X--- /usr/ports/x11-toolkits/wxgtk24/distinfo Thu Nov 17 16:11:09 2005 >X+++ x11-toolkits/wxgtk24/distinfo Sat Nov 19 23:14:39 2005 >X@@ -1,3 +1,2 @@ >X MD5 (wxGTK-2.4.2.tar.bz2) = cdadfe82fc93f8a65a2ae18a95b0b0e3 >X-SHA256 (wxGTK-2.4.2.tar.bz2) = 2b057cbd6f5573d2bac2c8af180fcd9f56ad4e27bba44abdd2cb0a6904c725b1 >X SIZE (wxGTK-2.4.2.tar.bz2) = 5381935 >Xdiff -urN /usr/ports/x11-toolkits/wxgtk26/Makefile x11-toolkits/wxgtk26/Makefile >X--- /usr/ports/x11-toolkits/wxgtk26/Makefile Tue Nov 8 04:28:38 2005 >X+++ x11-toolkits/wxgtk26/Makefile Sat Nov 19 23:14:39 2005 >X@@ -72,10 +72,10 @@ >X .if ${WXGTK_FLAVOR} != "gtk2-contrib-common" >X RUN_DEPENDS= ${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common >X >X+USE_WX= 2.6 >X+ >X .if ${WXGTK_FLAVOR:M*-unicode*} != "" >X-LIB_DEPENDS+= wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode >X-.else >X-LIB_DEPENDS+= wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 >X+USE_WXUNICODE= yes >X .endif >X >X pre-configure: >Xdiff -urN /usr/ports/x11-toolkits/wxgtk26/distinfo x11-toolkits/wxgtk26/distinfo >X--- /usr/ports/x11-toolkits/wxgtk26/distinfo Thu Nov 17 16:11:10 2005 >X+++ x11-toolkits/wxgtk26/distinfo Sat Nov 19 23:14:39 2005 >X@@ -1,3 +1,2 @@ >X MD5 (wxGTK-2.6.2.tar.bz2) = ba2afe7bd028062c5fff6d5ef3249c67 >X-SHA256 (wxGTK-2.6.2.tar.bz2) = 563c46435642d8c371768d3191c38e0791e689d1abc85b693a447cc0194bc771 >X SIZE (wxGTK-2.6.2.tar.bz2) = 7328807 >Xdiff -urN /usr/ports/x11-toolkits/wxmozilla/Makefile x11-toolkits/wxmozilla/Makefile >X--- /usr/ports/x11-toolkits/wxmozilla/Makefile Tue Nov 15 03:52:07 2005 >X+++ x11-toolkits/wxmozilla/Makefile Sat Nov 19 23:14:40 2005 >X@@ -16,15 +16,14 @@ >X MAINTAINER= ports@FreeBSD.org >X COMMENT= Embedding Mozilla in wxWidgets >X >X-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-nspr.pc:${PORTSDIR}/www/mozilla \ >X- ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 >X-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X+BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/mozilla-nspr.pc:${PORTSDIR}/www/mozilla >X RUN_DEPENDS= ${BUILD_DEPENDS} >X >X-USE_PYTHON= yes >X-USE_GNOME= gnomehack gnometarget >X-WXGTK_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config >X USE_AUTOTOOLS= libtool:15 >X+USE_GNOME= gnomehack gnometarget >X+USE_PYTHON= yes >X+USE_WX= 2.4 >X+USE_WXPYTHON= yes >X CONFIGURE_ARGS= --with-wx-config=${WXGTK_CONFIG} --enable-python >X INSTALLS_SHLIB= yes >X >Xdiff -urN /usr/ports/deskutils/xchm/Makefile deskutils/xchm/Makefile >X--- /usr/ports/deskutils/xchm/Makefile Sat Nov 5 02:21:19 2005 >X+++ deskutils/xchm/Makefile Sat Nov 19 23:14:40 2005 >X@@ -15,12 +15,11 @@ >X MAINTAINER= pav@FreeBSD.org >X COMMENT= Windows HTML Help (.chm) viewer for UNIX >X >X-LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib \ >X- wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 >X+LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib >X >X GNU_CONFIGURE= yes >X+USE_WX= 2.6 >X USE_X_PREFIX= yes >X-CONFIGURE_ARGS= --with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config >X CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" >X USE_REINPLACE= yes >X >Xdiff -urN /usr/ports/net/xmule/Makefile xmule/Makefile >X--- /usr/ports/net/xmule/Makefile Fri Nov 18 04:01:51 2005 >X+++ xmule/Makefile Sun Nov 20 11:34:06 2005 >X@@ -16,8 +16,7 @@ >X COMMENT= Port of eMule eDonkey P2P client using wxWindows class library >X >X BUILD_DEPENDS= ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp >X-LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 \ >X- wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 >X+LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 >X RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget >X >X USE_GETTEXT= yes >X@@ -28,22 +27,20 @@ >X gnomeprefix >X USE_REINPLACE= yes >X USE_GMAKE= yes >X+USE_WX= 2.6 >X GNU_CONFIGURE= yes >X CONFIGURE_ARGS= --without-included-gettext \ >X --with-cryptopp-prefix=${LOCALBASE} \ >X --with-gtk-prefix=${X11BASE} \ >X --with-libiconv-prefix=${LOCALBASE} \ >X --with-libintl-prefix=${LOCALBASE} \ >X- --enable-debug \ >X- --with-wx-config=${WX_CONFIG} >X+ --enable-debug >X CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ >X LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" >X MAKE_ENV= CC="${CC}" CXX="${CXX}" >X >X # for debugging purposes >X STRIP= >X- >X-WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.6-config >X >X FILES_ATOLL_PATCH= src/Preferences.cpp \ >X src/otherfunctions.cpp >Xdiff -urN /usr/ports/graphics/zphoto/Makefile graphics/zphoto/Makefile >X--- /usr/ports/graphics/zphoto/Makefile Thu May 26 08:36:04 2005 >X+++ graphics/zphoto/Makefile Sat Nov 19 23:14:40 2005 >X@@ -18,37 +18,39 @@ >X LIB_DEPENDS= ming.3:${PORTSDIR}/graphics/ming \ >X Imlib2.3:${PORTSDIR}/graphics/imlib2 \ >X popt.0:${PORTSDIR}/devel/popt >X-.if !defined (WITHOUT_AVIPLAY) >X-LIB_DEPENDS+= aviplay.0:${PORTSDIR}/multimedia/avifile >X-.endif >X-.if defined (WITH_WXGTK2) >X-LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 >X-.endif >X-.if !defined (WITHOUT_ZIP) >X-RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip >X-.endif >X >X+USE_GMAKE= yes >X+USE_XLIB= yes >X USE_REINPLACE= yes >X GNU_CONFIGURE= yes >X CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ >X- CPPFLAGS="-I${LOCALBASE}/include \ >X- ${PTHREAD_CFLAGS}" >X-.if defined (WITH_WXGTK2) >X-CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.4-config >X-PLIST_FILES+= bin/wxzphoto >X+ CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" >X+ >X+OPTIONS= AVIPLAY "Enable aviplay support" on \ >X+ WX "Enable WxWidgets support" off \ >X+ ZIP "Enable Zip support" on >X+ >X+post-patch: >X+ @${REINPLACE_CMD} -e 's|<ming.h>|<ming/ming.h>|g' ${WRKSRC}/*.c ${WRKSRC}/configure >X+ >X+.include <bsd.port.pre.mk> >X+ >X+.if defined(WITH_AVIPLAY) >X+LIB_DEPENDS+= aviplay.0:${PORTSDIR}/multimedia/avifile >X .else >X-CONFIGURE_ARGS+= --disable-wx >X-.endif >X-.if defined (WITHOUT_AVIPLAY) >X-CONFIGURE_ARGS+= --disable-avifile >X+CONFIGURE_ARGS+=--disable-avifile >X .endif >X-.if defined (WITHOUT_ZIP) >X-CONFIGURE_ARGS+= --disable-zip >X+ >X+.if defined(WITH_WX) >X+USE_WX= 2.4 >X+.else >X+CONFIGURE_ARGS+=--disable-wx >X .endif >X-USE_GMAKE= yes >X-USE_XLIB= yes >X >X-post-patch: >X- @${REINPLACE_CMD} -e 's|<ming.h>|<ming/ming.h>|g' ${WRKSRC}/*.c ${WRKSRC}/configure >X+.if defined(WITH_ZIP) >X+RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip >X+.else >X+CONFIGURE_ARGS+=--disable-zip >X+.endif >X >X-.include <bsd.port.mk> >X+.include <bsd.port.post.mk> >END-of-wx/All.diff >exit
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=59400">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 89398
: 59400