summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/gnome-libs/Makefile6
-rw-r--r--x11/gnome-libs/files/patch-ac4
-rw-r--r--x11/gnome-libs/files/patch-ag6
-rw-r--r--x11/gnomelibs/Makefile6
-rw-r--r--x11/gnomelibs/files/patch-ac4
-rw-r--r--x11/gnomelibs/files/patch-ag6
-rw-r--r--x11/libgnome/Makefile6
-rw-r--r--x11/libgnome/files/patch-ac4
-rw-r--r--x11/libgnome/files/patch-ag6
9 files changed, 30 insertions, 18 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 7f67247..565e13b 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomelibs
PORTVERSION= 1.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-libs
@@ -47,4 +47,8 @@ pre-patch:
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+post-patch:
+ @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/gnome-config.in ${WRKSRC}/libgnome/gnome-util.c
+
.include <bsd.port.mk>
diff --git a/x11/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac
index f73a455..0d8f8a7 100644
--- a/x11/gnome-libs/files/patch-ac
+++ b/x11/gnome-libs/files/patch-ac
@@ -5,7 +5,7 @@
pkgincludedir=${includedir}/@PACKAGE@
MODULE_VERSION=@PACKAGE@-@VERSION@
-module_dirs="$libdir"
-+module_dirs="$sysconfdir:/usr/local/etc"
++module_dirs="$sysconfdir:%%LOCALBASE%%/etc"
# stolen from autoconf
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
@@ -28,7 +28,7 @@
- ${libdir}/<LIBRARY>Conf.sh
+ ${sysconfdir}/<LIBRARY>Conf.sh
-+and /usr/local/etc/<LIBRARY>Conf.sh
++and %%LOCALBASE%%/etc/<LIBRARY>Conf.sh
-is looked in for the necessary information. Those currently installed
+are looked in for the necessary information. Those currently installed
diff --git a/x11/gnome-libs/files/patch-ag b/x11/gnome-libs/files/patch-ag
index 6b5481c..a928239 100644
--- a/x11/gnome-libs/files/patch-ag
+++ b/x11/gnome-libs/files/patch-ag
@@ -6,9 +6,9 @@
static char *shells [] = {
- "/bin/bash", "/bin/zsh", "/bin/tcsh", "/bin/ksh",
- "/bin/csh", "/bin/sh", 0
-+ "/bin/csh", "/bin/sh", "/bin/tcsh", "/usr/local/bin/tcsh",
-+ "/usr/local/bin/bash", "/usr/local/bin/ksh",
-+ "/usr/local/bin/zsh", "/usr/local/sbin/scsh", 0
++ "/bin/csh", "/bin/sh", "/bin/tcsh", "%%LOCALBASE%%/bin/tcsh",
++ "%%LOCALBASE%%/bin/bash", "%%LOCALBASE%%/bin/ksh",
++ "%%LOCALBASE%%/bin/zsh", "%%LOCALBASE%%/sbin/scsh", 0
};
if ((shell = getenv ("SHELL"))){
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 7f67247..565e13b 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomelibs
PORTVERSION= 1.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-libs
@@ -47,4 +47,8 @@ pre-patch:
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+post-patch:
+ @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/gnome-config.in ${WRKSRC}/libgnome/gnome-util.c
+
.include <bsd.port.mk>
diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac
index f73a455..0d8f8a7 100644
--- a/x11/gnomelibs/files/patch-ac
+++ b/x11/gnomelibs/files/patch-ac
@@ -5,7 +5,7 @@
pkgincludedir=${includedir}/@PACKAGE@
MODULE_VERSION=@PACKAGE@-@VERSION@
-module_dirs="$libdir"
-+module_dirs="$sysconfdir:/usr/local/etc"
++module_dirs="$sysconfdir:%%LOCALBASE%%/etc"
# stolen from autoconf
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
@@ -28,7 +28,7 @@
- ${libdir}/<LIBRARY>Conf.sh
+ ${sysconfdir}/<LIBRARY>Conf.sh
-+and /usr/local/etc/<LIBRARY>Conf.sh
++and %%LOCALBASE%%/etc/<LIBRARY>Conf.sh
-is looked in for the necessary information. Those currently installed
+are looked in for the necessary information. Those currently installed
diff --git a/x11/gnomelibs/files/patch-ag b/x11/gnomelibs/files/patch-ag
index 6b5481c..a928239 100644
--- a/x11/gnomelibs/files/patch-ag
+++ b/x11/gnomelibs/files/patch-ag
@@ -6,9 +6,9 @@
static char *shells [] = {
- "/bin/bash", "/bin/zsh", "/bin/tcsh", "/bin/ksh",
- "/bin/csh", "/bin/sh", 0
-+ "/bin/csh", "/bin/sh", "/bin/tcsh", "/usr/local/bin/tcsh",
-+ "/usr/local/bin/bash", "/usr/local/bin/ksh",
-+ "/usr/local/bin/zsh", "/usr/local/sbin/scsh", 0
++ "/bin/csh", "/bin/sh", "/bin/tcsh", "%%LOCALBASE%%/bin/tcsh",
++ "%%LOCALBASE%%/bin/bash", "%%LOCALBASE%%/bin/ksh",
++ "%%LOCALBASE%%/bin/zsh", "%%LOCALBASE%%/sbin/scsh", 0
};
if ((shell = getenv ("SHELL"))){
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 7f67247..565e13b 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomelibs
PORTVERSION= 1.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-libs
@@ -47,4 +47,8 @@ pre-patch:
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+post-patch:
+ @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ ${WRKSRC}/gnome-config.in ${WRKSRC}/libgnome/gnome-util.c
+
.include <bsd.port.mk>
diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac
index f73a455..0d8f8a7 100644
--- a/x11/libgnome/files/patch-ac
+++ b/x11/libgnome/files/patch-ac
@@ -5,7 +5,7 @@
pkgincludedir=${includedir}/@PACKAGE@
MODULE_VERSION=@PACKAGE@-@VERSION@
-module_dirs="$libdir"
-+module_dirs="$sysconfdir:/usr/local/etc"
++module_dirs="$sysconfdir:%%LOCALBASE%%/etc"
# stolen from autoconf
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
@@ -28,7 +28,7 @@
- ${libdir}/<LIBRARY>Conf.sh
+ ${sysconfdir}/<LIBRARY>Conf.sh
-+and /usr/local/etc/<LIBRARY>Conf.sh
++and %%LOCALBASE%%/etc/<LIBRARY>Conf.sh
-is looked in for the necessary information. Those currently installed
+are looked in for the necessary information. Those currently installed
diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag
index 6b5481c..a928239 100644
--- a/x11/libgnome/files/patch-ag
+++ b/x11/libgnome/files/patch-ag
@@ -6,9 +6,9 @@
static char *shells [] = {
- "/bin/bash", "/bin/zsh", "/bin/tcsh", "/bin/ksh",
- "/bin/csh", "/bin/sh", 0
-+ "/bin/csh", "/bin/sh", "/bin/tcsh", "/usr/local/bin/tcsh",
-+ "/usr/local/bin/bash", "/usr/local/bin/ksh",
-+ "/usr/local/bin/zsh", "/usr/local/sbin/scsh", 0
++ "/bin/csh", "/bin/sh", "/bin/tcsh", "%%LOCALBASE%%/bin/tcsh",
++ "%%LOCALBASE%%/bin/bash", "%%LOCALBASE%%/bin/ksh",
++ "%%LOCALBASE%%/bin/zsh", "%%LOCALBASE%%/sbin/scsh", 0
};
if ((shell = getenv ("SHELL"))){
OpenPOWER on IntegriCloud