Update to 2.12.4.

4 files changed, 18 insertions, 21 deletions

diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 82778d999d96..4a639c9aa66f 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.24 2005/10/03 16:28:50 marcus Exp $
+#   $MCom: ports-stable/x11-toolkits/py-gnome2/Makefile,v 1.2 2006/03/14 13:28:11 marcus Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.12.3
+PORTVERSION=	2.12.4
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -30,7 +30,8 @@ USE_GNOME=	gnomehack libgnomeui pygtk2
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
@@ -39,10 +40,6 @@ CONFLICTS=	py*-gnome-1*
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 503001
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gnomevfs_Makefile.in
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
 		${WRKSRC}/gnomevfs/Makefile.in
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index 344cd3eb746b..ca2f9bdae19b 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.12.3.tar.bz2) = 20c4414a837d0c6efc2f324f9142974c
-SHA256 (gnome2/gnome-python-2.12.3.tar.bz2) = b1db4b5628f11f2d3138976dfe4f00423b40daf4dc5ee4949c86dea58154590a
-SIZE (gnome2/gnome-python-2.12.3.tar.bz2) = 376690
+MD5 (gnome2/gnome-python-2.12.4.tar.bz2) = 94347f1bff86ffcce76111fa8dac1efc
+SHA256 (gnome2/gnome-python-2.12.4.tar.bz2) = 721268f92c0dc0a2a2480779e16545d05846090c469976c0913560beb7d8645e
+SIZE (gnome2/gnome-python-2.12.4.tar.bz2) = 377341
diff --git a/x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_Makefile.in b/x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_Makefile.in
index 30912b7f1a09..e69de29bb2d1 100644
--- a/x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_Makefile.in
+++ b/x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_Makefile.in
@@ -1,11 +0,0 @@
---- gnomevfs/Makefile.in.orig	Thu Jul 14 03:25:16 2005
-+++ gnomevfs/Makefile.in	Thu Jul 14 03:25:26 2005
-@@ -278,7 +278,7 @@
- libpythonmethod_la_CFLAGS = $(GNOME_VFS_MODULE_CFLAGS) -DGNOME_VFS_PYTHON_DIR="\"$(vfsmethoddir)\""
- libpythonmethod_la_SOURCES = gnome-vfs-python-method.c
- libpythonmethod_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "vfs_module_(init|shutdown)"
--libpythonmethod_la_LIBADD = $(GNOME_VFS_MODULE_LIBS) -lpython$(PYTHON_VERSION)
-+libpythonmethod_la_LIBADD = $(GNOME_VFS_MODULE_LIBS) -l$(PYTHON_VERSION)
- all: all-am
- 
- .SUFFIXES:
diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure
new file mode 100644
index 000000000000..af6b9c5e0154
--- /dev/null
+++ b/x11-toolkits/py-gnome2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Mar 14 08:23:11 2006
++++ configure	Tue Mar 14 08:24:01 2006
+@@ -21329,7 +21329,7 @@ if $build_pyvfsmodule; then
+ echo "$as_me:$LINENO: checking for libraries required to embed python" >&5
+ echo $ECHO_N "checking for libraries required to embed python... $ECHO_C" >&6
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+-PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
++PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION} ${PTHREAD_LIBS}"
+ 
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $PYTHON_LIBS"