Date: Thu, 17 Aug 2006 16:59:46 -0300 From: Alejandro Pulver <alepulver@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: bug-followup@freebsd.org Subject: Re: ports/101613: [PATCH] bsd.wx.mk: integrate existing ports with it Message-ID: <20060817165946.2be28feb@phobos.mars.bsd> In-Reply-To: <200608072130.k77LUFaW083073@freefall.freebsd.org> References: <1154985765.46073@phobos.mars.bsd> <200608072130.k77LUFaW083073@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This diff contains the updated patches for chinese/BBMan, math/fityk,
math/gambit and x11-toolkits/wxmozilla.
Index: chinese/BBMan/Makefile
===================================================================
RCS file: /home/pcvs/ports/chinese/BBMan/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- chinese/BBMan/Makefile 14 Aug 2006 07:56:43 -0000 1.13
+++ chinese/BBMan/Makefile 17 Aug 2006 19:56:55 -0000
@@ -16,11 +16,10 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= BBMan is a BBS client for X Window System
-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
-
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
USE_ZIP= yes
+USE_WX= 2.4
PLIST_FILES= bin/BBMan
@@ -35,7 +34,7 @@
.endif
do-build:
- cd ${WRKSRC} && ${CXX} main.cpp `wxgtk2-2.4-config --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan
+ cd ${WRKSRC} && ${CXX} main.cpp `${WX_CONFIG} --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${TARGETDIR}/bin/BBMan
Index: math/fityk/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/fityk/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- math/fityk/Makefile 10 Aug 2006 21:03:01 -0000 1.14
+++ math/fityk/Makefile 17 Aug 2006 19:56:55 -0000
@@ -24,6 +24,8 @@
USE_WX= 2.6
WX_CONF_ARGS= absolute
USE_GMAKE= yes
+USE_WX= 2.6
+WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
Index: math/gambit/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/gambit/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- math/gambit/Makefile 15 Aug 2006 00:29:12 -0000 1.20
+++ math/gambit/Makefile 17 Aug 2006 19:56:55 -0000
@@ -15,14 +15,11 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A library of tools for doing computation in game theory
-LIB_DEPENDS= wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
-
USE_X_PREFIX= yes
+USE_WX= 2.6
USE_GNOME= gnometarget gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
-MAKE_ENV= WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
USE_LDCONFIG= yes
CPPFLAGS= ${PTHREAD_CFLAGS}
Index: x11-toolkits/wxmozilla/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/wxmozilla/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- x11-toolkits/wxmozilla/Makefile 15 Aug 2006 01:13:41 -0000 1.22
+++ x11-toolkits/wxmozilla/Makefile 17 Aug 2006 19:56:55 -0000
@@ -16,16 +16,14 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Embedding Mozilla in wxWidgets
-BUILD_DEPENDS= ${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
USE_GNOME= gnomehack gnometarget
USE_GECKO= mozilla
-WXGTK_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config
USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS= --with-wx-config=${WXGTK_CONFIG} --enable-python
+CONFIGURE_ARGS= --enable-python
+USE_WX= 2.4
+WX_COMPS= python
+WX_CONF_ARGS= absolute
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060817165946.2be28feb>