diff options
author | lioux <lioux@FreeBSD.org> | 2003-06-05 08:02:41 +0800 |
---|---|---|
committer | lioux <lioux@FreeBSD.org> | 2003-06-05 08:02:41 +0800 |
commit | 18bd43a3db35c9061986e1d6daf54fed3d9cb70f (patch) | |
tree | c3d6f923ceefe319d3ca088cd37812179f6618c8 | |
parent | 31ada2dd07a80ad53ae338208ac75d6cfc307bf1 (diff) | |
download | freebsd-ports-gnome-18bd43a3db35c9061986e1d6daf54fed3d9cb70f.tar.gz freebsd-ports-gnome-18bd43a3db35c9061986e1d6daf54fed3d9cb70f.tar.zst freebsd-ports-gnome-18bd43a3db35c9061986e1d6daf54fed3d9cb70f.zip |
Add a layer that enable this port to build with a wxgtk port built
against either gtk12 AND gtk20. Support for wxgtk to build against
gtk20 is being reviewed.
Reviewed by: marcus (the idea)
-rw-r--r-- | x11-toolkits/py-wxPython/Makefile | 23 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython24/Makefile | 23 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython26/Makefile | 23 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython28/Makefile | 23 |
4 files changed, 80 insertions, 12 deletions
diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile index 8099b69b1670..c719a2f90346 100644 --- a/x11-toolkits/py-wxPython/Makefile +++ b/x11-toolkits/py-wxPython/Makefile @@ -26,8 +26,7 @@ WX_CONFIG= ${X11BASE}/bin/wx-config USE_GMAKE= yes USE_PYTHON= yes USE_PYDISTUTILS=yes -USE_GNOME= gtk12 -MAKE_ENV= WX_CONFIG="${WX_CONFIG}" +PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" DEMO_DIR= ${PYTHONPREFIX_SITELIBDIR}/wxPython/demo post-build: @@ -48,4 +47,22 @@ post-install: .endfor .endfor -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if exists(${WX_CONFIG}) +# detect if wxgtk was linked against gtk1 or gtk2 +DECISION_GTK_1_OR_2!= ${WX_CONFIG} --static --libs | ${GREP} glib-2.0 +.else +DECISION_GTK_1_OR_2= "" +.endif + +.if (${DECISION_GTK_1_OR_2} != "") +USE_GNOME+= gtk20 +CONFIGURE_ARGS+= --enable-gtk2 +PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 +PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} +.else +USE_GNOME+= gtk12 +.endif + +.include <bsd.port.post.mk> diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile index 8099b69b1670..c719a2f90346 100644 --- a/x11-toolkits/py-wxPython24/Makefile +++ b/x11-toolkits/py-wxPython24/Makefile @@ -26,8 +26,7 @@ WX_CONFIG= ${X11BASE}/bin/wx-config USE_GMAKE= yes USE_PYTHON= yes USE_PYDISTUTILS=yes -USE_GNOME= gtk12 -MAKE_ENV= WX_CONFIG="${WX_CONFIG}" +PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" DEMO_DIR= ${PYTHONPREFIX_SITELIBDIR}/wxPython/demo post-build: @@ -48,4 +47,22 @@ post-install: .endfor .endfor -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if exists(${WX_CONFIG}) +# detect if wxgtk was linked against gtk1 or gtk2 +DECISION_GTK_1_OR_2!= ${WX_CONFIG} --static --libs | ${GREP} glib-2.0 +.else +DECISION_GTK_1_OR_2= "" +.endif + +.if (${DECISION_GTK_1_OR_2} != "") +USE_GNOME+= gtk20 +CONFIGURE_ARGS+= --enable-gtk2 +PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 +PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} +.else +USE_GNOME+= gtk12 +.endif + +.include <bsd.port.post.mk> diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile index 8099b69b1670..c719a2f90346 100644 --- a/x11-toolkits/py-wxPython26/Makefile +++ b/x11-toolkits/py-wxPython26/Makefile @@ -26,8 +26,7 @@ WX_CONFIG= ${X11BASE}/bin/wx-config USE_GMAKE= yes USE_PYTHON= yes USE_PYDISTUTILS=yes -USE_GNOME= gtk12 -MAKE_ENV= WX_CONFIG="${WX_CONFIG}" +PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" DEMO_DIR= ${PYTHONPREFIX_SITELIBDIR}/wxPython/demo post-build: @@ -48,4 +47,22 @@ post-install: .endfor .endfor -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if exists(${WX_CONFIG}) +# detect if wxgtk was linked against gtk1 or gtk2 +DECISION_GTK_1_OR_2!= ${WX_CONFIG} --static --libs | ${GREP} glib-2.0 +.else +DECISION_GTK_1_OR_2= "" +.endif + +.if (${DECISION_GTK_1_OR_2} != "") +USE_GNOME+= gtk20 +CONFIGURE_ARGS+= --enable-gtk2 +PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 +PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} +.else +USE_GNOME+= gtk12 +.endif + +.include <bsd.port.post.mk> diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile index 8099b69b1670..c719a2f90346 100644 --- a/x11-toolkits/py-wxPython28/Makefile +++ b/x11-toolkits/py-wxPython28/Makefile @@ -26,8 +26,7 @@ WX_CONFIG= ${X11BASE}/bin/wx-config USE_GMAKE= yes USE_PYTHON= yes USE_PYDISTUTILS=yes -USE_GNOME= gtk12 -MAKE_ENV= WX_CONFIG="${WX_CONFIG}" +PYDISTUTILS_BUILDARGS= WX_CONFIG="${WX_CONFIG}" DEMO_DIR= ${PYTHONPREFIX_SITELIBDIR}/wxPython/demo post-build: @@ -48,4 +47,22 @@ post-install: .endfor .endfor -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if exists(${WX_CONFIG}) +# detect if wxgtk was linked against gtk1 or gtk2 +DECISION_GTK_1_OR_2!= ${WX_CONFIG} --static --libs | ${GREP} glib-2.0 +.else +DECISION_GTK_1_OR_2= "" +.endif + +.if (${DECISION_GTK_1_OR_2} != "") +USE_GNOME+= gtk20 +CONFIGURE_ARGS+= --enable-gtk2 +PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 +PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} +.else +USE_GNOME+= gtk12 +.endif + +.include <bsd.port.post.mk> |