diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-30 12:58:50 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-30 12:58:50 +0800 |
| commit | 77955200f648894fbe45dd90674088586b641e9d (patch) | |
| tree | 6017606c642b7eaa217acadce2a2b8a10f2f9486 | |
| parent | 63986bab736ad1046268e7ae4786ad96abf3a26b (diff) | |
| download | marcuscom-ports-77955200f648894fbe45dd90674088586b641e9d.tar marcuscom-ports-77955200f648894fbe45dd90674088586b641e9d.tar.gz marcuscom-ports-77955200f648894fbe45dd90674088586b641e9d.tar.bz2 marcuscom-ports-77955200f648894fbe45dd90674088586b641e9d.tar.lz marcuscom-ports-77955200f648894fbe45dd90674088586b641e9d.tar.xz marcuscom-ports-77955200f648894fbe45dd90674088586b641e9d.tar.zst marcuscom-ports-77955200f648894fbe45dd90674088586b641e9d.zip | |
No longer need this patch for X11R6 and add a patch for /usr/local ->
${LOCALBASE}.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8941 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | graphics/dia/Makefile | 8 | ||||
| -rw-r--r-- | graphics/dia/files/patch-lib_intl.c | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 98ad91067..a603a0be6 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -3,7 +3,7 @@ # Whom: saper@system.pl # # $FreeBSD: ports/graphics/dia/Makefile,v 1.63 2007/03/29 16:57:40 marcus Exp $ -# $MCom: ports/graphics/dia/Makefile,v 1.12 2007/05/02 19:26:39 marcus Exp $ +# $MCom: ports/graphics/dia/Makefile,v 1.13 2007/05/19 21:36:11 marcus Exp $ # PORTNAME= dia @@ -50,9 +50,13 @@ PLIST_SUB= PYTHON:="@comment " USE_GNOME+= libgnomeui CONFIGURE_ARGS+= --enable-gnome --enable-bonobo PKGNAMESUFFIX= -gnome -.else +GNOME_ENABLED= yes +.endif post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/lib/intl.c +.ifndef (GNOME_ENABLED) @${FIND} ${WRKSRC} -name Makefile.in | \ ${XARGS} ${REINPLACE_CMD} -e \ 's,\(^GTK_LIBS.*\),\1 ${PTHREAD_LIBS}, ; \ diff --git a/graphics/dia/files/patch-lib_intl.c b/graphics/dia/files/patch-lib_intl.c deleted file mode 100644 index 5449af46d..000000000 --- a/graphics/dia/files/patch-lib_intl.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/intl.c.orig Mon Mar 17 14:06:02 2003 -+++ lib/intl.c Mon Mar 17 14:07:10 2003 -@@ -65,6 +65,7 @@ - read_aliases ("/usr/share/locale/locale.alias"); - read_aliases ("/usr/local/share/locale/locale.alias"); - read_aliases ("/usr/lib/X11/locale/locale.alias"); -+ read_aliases ("/usr/X11R6/lib/X11/locale/locale.alias"); - read_aliases ("/usr/openwin/lib/locale/locale.alias"); - } - while((p=g_hash_table_lookup(alias_table,lang)) && strcmp(p, lang)) |