From 37d19c7afa4a5ef02edf983359828715fb867580 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 14 Jul 2005 07:53:41 +0000 Subject: Fix the build of this port on both FreeBSD >= 5.3 as well as FreeBSD < 5.3. The problem stems from a change in .MAKEFLAGS that was MFC'd into 5.3-RELEASE. In those versions, .MAKEFLAGS contains PYTHON_VERSION, and this overwrites the PYTHON_VERSION in the gnomevfs Makefile. This is one of these ports that should probably survive on 4.X for a bit longer. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4245 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/py-gnome2/Makefile | 10 ++++++++-- x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_makefile.in | 11 +++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_makefile.in diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index 398ff1268..641690518 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.20 2005/07/01 18:11:44 marcus Exp $ +# $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.21 2005/07/12 04:11:03 marcus Exp $ # PORTNAME= gnome @@ -36,6 +36,12 @@ EG_DST_DIR= ${PREFIX}/share/examples/py-gnome CONFLICTS= py*-gnome-1* +.include + +.if ${OSVERSION} >= 503001 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gnomevfs_Makefile.in +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \ ${WRKSRC}/gnomevfs/Makefile.in @@ -49,4 +55,4 @@ post-install: ${FIND} ${EG_DST_DIR} -type f -print | ${XARGS} ${CHMOD} 0444 .endif -.include +.include diff --git a/x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_makefile.in b/x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_makefile.in new file mode 100644 index 000000000..30912b7f1 --- /dev/null +++ b/x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_makefile.in @@ -0,0 +1,11 @@ +--- 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: -- cgit v1.2.3