diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-14 15:53:41 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-14 15:53:41 +0800 |
| commit | 37d19c7afa4a5ef02edf983359828715fb867580 (patch) | |
| tree | 9ea771bd5d4cfc1204f66862d9b002e9ebfa5312 /x11-toolkits | |
| parent | 25fb8dd51d56631e790a649177ff662d6be82b37 (diff) | |
| download | marcuscom-ports-37d19c7afa4a5ef02edf983359828715fb867580.tar marcuscom-ports-37d19c7afa4a5ef02edf983359828715fb867580.tar.gz marcuscom-ports-37d19c7afa4a5ef02edf983359828715fb867580.tar.bz2 marcuscom-ports-37d19c7afa4a5ef02edf983359828715fb867580.tar.lz marcuscom-ports-37d19c7afa4a5ef02edf983359828715fb867580.tar.xz marcuscom-ports-37d19c7afa4a5ef02edf983359828715fb867580.tar.zst marcuscom-ports-37d19c7afa4a5ef02edf983359828715fb867580.zip | |
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
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/py-gnome2/Makefile | 10 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome2/files/extra-patch-gnomevfs_makefile.in | 11 |
2 files changed, 19 insertions, 2 deletions
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 <marcus@FreeBSD.org> # # $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 <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 @@ -49,4 +55,4 @@ post-install: ${FIND} ${EG_DST_DIR} -type f -print | ${XARGS} ${CHMOD} 0444 .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> 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: |