diff options
author | fjoe <fjoe@FreeBSD.org> | 2003-11-10 07:07:32 +0800 |
---|---|---|
committer | fjoe <fjoe@FreeBSD.org> | 2003-11-10 07:07:32 +0800 |
commit | c36eb650b100b3414b74abc00885d9d6139ed6aa (patch) | |
tree | 4994cdd47aba711b0373317e4b7c709bff5190b3 /x11-toolkits | |
parent | a7178f4cebd0595a3962f7f6bc280125e92afd83 (diff) | |
download | freebsd-ports-gnome-c36eb650b100b3414b74abc00885d9d6139ed6aa.tar.gz freebsd-ports-gnome-c36eb650b100b3414b74abc00885d9d6139ed6aa.tar.zst freebsd-ports-gnome-c36eb650b100b3414b74abc00885d9d6139ed6aa.zip |
- Update to 2.4.2.4.
- Use wxgtk2 by default, provide WITH_GTK1 knob.
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/py-wxPython/Makefile | 20 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython24/Makefile | 20 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython24/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython26/Makefile | 20 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython26/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython28/Makefile | 20 | ||||
-rw-r--r-- | x11-toolkits/py-wxPython28/distinfo | 2 |
8 files changed, 28 insertions, 60 deletions
diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile index f47d1f767f5e..65d05eb363f0 100644 --- a/x11-toolkits/py-wxPython/Makefile +++ b/x11-toolkits/py-wxPython/Makefile @@ -6,8 +6,7 @@ # PORTNAME= wxPython -PORTVERSION= 2.4.1.2 -PORTREVISION= 1 +PORTVERSION= 2.4.2.4 CATEGORIES= x11-toolkits python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wxpython @@ -17,13 +16,10 @@ DISTNAME= ${PORTNAME}Src-${PORTVERSION} MAINTAINER= ports@FreeBSD.ORG COMMENT= Python bindings for the wxWindows/GTK GUI toolkit -LIB_DEPENDS= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython -WX_CONFIG= ${X11BASE}/bin/wx-config - USE_GMAKE= yes USE_PYTHON= yes USE_PYDISTUTILS=yes @@ -50,20 +46,16 @@ post-install: .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 -.else -DECISION_GTK_1_OR_2= "" -.endif +.if !defined(WITH_GTK1) +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config -.if ${DECISION_GTK_1_OR_2:M*glib-2.0} != "" -USE_GNOME+= gtk20 CONFIGURE_ARGS+= --enable-gtk2 PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} .else -USE_GNOME+= gtk12 +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/py-wxPython/distinfo b/x11-toolkits/py-wxPython/distinfo index c9eec43e1b71..cb8f7410866b 100644 --- a/x11-toolkits/py-wxPython/distinfo +++ b/x11-toolkits/py-wxPython/distinfo @@ -1 +1 @@ -MD5 (wxPythonSrc-2.4.1.2.tar.gz) = 515fa95c5c0497404a858213b6586411 +MD5 (wxPythonSrc-2.4.2.4.tar.gz) = ea4eb68e10a0c2a9be643b35dcb78e41 diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile index f47d1f767f5e..65d05eb363f0 100644 --- a/x11-toolkits/py-wxPython24/Makefile +++ b/x11-toolkits/py-wxPython24/Makefile @@ -6,8 +6,7 @@ # PORTNAME= wxPython -PORTVERSION= 2.4.1.2 -PORTREVISION= 1 +PORTVERSION= 2.4.2.4 CATEGORIES= x11-toolkits python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wxpython @@ -17,13 +16,10 @@ DISTNAME= ${PORTNAME}Src-${PORTVERSION} MAINTAINER= ports@FreeBSD.ORG COMMENT= Python bindings for the wxWindows/GTK GUI toolkit -LIB_DEPENDS= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython -WX_CONFIG= ${X11BASE}/bin/wx-config - USE_GMAKE= yes USE_PYTHON= yes USE_PYDISTUTILS=yes @@ -50,20 +46,16 @@ post-install: .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 -.else -DECISION_GTK_1_OR_2= "" -.endif +.if !defined(WITH_GTK1) +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config -.if ${DECISION_GTK_1_OR_2:M*glib-2.0} != "" -USE_GNOME+= gtk20 CONFIGURE_ARGS+= --enable-gtk2 PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} .else -USE_GNOME+= gtk12 +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/py-wxPython24/distinfo b/x11-toolkits/py-wxPython24/distinfo index c9eec43e1b71..cb8f7410866b 100644 --- a/x11-toolkits/py-wxPython24/distinfo +++ b/x11-toolkits/py-wxPython24/distinfo @@ -1 +1 @@ -MD5 (wxPythonSrc-2.4.1.2.tar.gz) = 515fa95c5c0497404a858213b6586411 +MD5 (wxPythonSrc-2.4.2.4.tar.gz) = ea4eb68e10a0c2a9be643b35dcb78e41 diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile index f47d1f767f5e..65d05eb363f0 100644 --- a/x11-toolkits/py-wxPython26/Makefile +++ b/x11-toolkits/py-wxPython26/Makefile @@ -6,8 +6,7 @@ # PORTNAME= wxPython -PORTVERSION= 2.4.1.2 -PORTREVISION= 1 +PORTVERSION= 2.4.2.4 CATEGORIES= x11-toolkits python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wxpython @@ -17,13 +16,10 @@ DISTNAME= ${PORTNAME}Src-${PORTVERSION} MAINTAINER= ports@FreeBSD.ORG COMMENT= Python bindings for the wxWindows/GTK GUI toolkit -LIB_DEPENDS= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython -WX_CONFIG= ${X11BASE}/bin/wx-config - USE_GMAKE= yes USE_PYTHON= yes USE_PYDISTUTILS=yes @@ -50,20 +46,16 @@ post-install: .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 -.else -DECISION_GTK_1_OR_2= "" -.endif +.if !defined(WITH_GTK1) +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config -.if ${DECISION_GTK_1_OR_2:M*glib-2.0} != "" -USE_GNOME+= gtk20 CONFIGURE_ARGS+= --enable-gtk2 PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} .else -USE_GNOME+= gtk12 +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/py-wxPython26/distinfo b/x11-toolkits/py-wxPython26/distinfo index c9eec43e1b71..cb8f7410866b 100644 --- a/x11-toolkits/py-wxPython26/distinfo +++ b/x11-toolkits/py-wxPython26/distinfo @@ -1 +1 @@ -MD5 (wxPythonSrc-2.4.1.2.tar.gz) = 515fa95c5c0497404a858213b6586411 +MD5 (wxPythonSrc-2.4.2.4.tar.gz) = ea4eb68e10a0c2a9be643b35dcb78e41 diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile index f47d1f767f5e..65d05eb363f0 100644 --- a/x11-toolkits/py-wxPython28/Makefile +++ b/x11-toolkits/py-wxPython28/Makefile @@ -6,8 +6,7 @@ # PORTNAME= wxPython -PORTVERSION= 2.4.1.2 -PORTREVISION= 1 +PORTVERSION= 2.4.2.4 CATEGORIES= x11-toolkits python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wxpython @@ -17,13 +16,10 @@ DISTNAME= ${PORTNAME}Src-${PORTVERSION} MAINTAINER= ports@FreeBSD.ORG COMMENT= Python bindings for the wxWindows/GTK GUI toolkit -LIB_DEPENDS= wx_gtk-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython -WX_CONFIG= ${X11BASE}/bin/wx-config - USE_GMAKE= yes USE_PYTHON= yes USE_PYDISTUTILS=yes @@ -50,20 +46,16 @@ post-install: .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 -.else -DECISION_GTK_1_OR_2= "" -.endif +.if !defined(WITH_GTK1) +LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 +WX_CONFIG= ${X11BASE}/bin/wxgtk2-2.4-config -.if ${DECISION_GTK_1_OR_2:M*glib-2.0} != "" -USE_GNOME+= gtk20 CONFIGURE_ARGS+= --enable-gtk2 PYDISTUTILS_BUILDARGS+= WXPORT=gtk2 PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS} .else -USE_GNOME+= gtk12 +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/py-wxPython28/distinfo b/x11-toolkits/py-wxPython28/distinfo index c9eec43e1b71..cb8f7410866b 100644 --- a/x11-toolkits/py-wxPython28/distinfo +++ b/x11-toolkits/py-wxPython28/distinfo @@ -1 +1 @@ -MD5 (wxPythonSrc-2.4.1.2.tar.gz) = 515fa95c5c0497404a858213b6586411 +MD5 (wxPythonSrc-2.4.2.4.tar.gz) = ea4eb68e10a0c2a9be643b35dcb78e41 |