diff options
| author | ade <ade@FreeBSD.org> | 2000-09-26 05:01:47 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2000-09-26 05:01:47 +0800 |
| commit | 23cba07a83ab7ceb4010fe46528c3ca47dce3ca5 (patch) | |
| tree | 20255413c0af13b9d9d96ed5b1bfdee53b23407c /x11/libgnome | |
| parent | 206febe5cea9cbc08528d52860515326b96df23a (diff) | |
| download | freebsd-ports-gnome-23cba07a83ab7ceb4010fe46528c3ca47dce3ca5.tar.gz freebsd-ports-gnome-23cba07a83ab7ceb4010fe46528c3ca47dce3ca5.tar.zst freebsd-ports-gnome-23cba07a83ab7ceb4010fe46528c3ca47dce3ca5.zip | |
Allow gnomelibs to DTRT in the case where ${LOCALBASE} is not /usr/local
Original suggestion by: nectar
Rewritten patch by: ade (so don't blame nectar for this!)
Diffstat (limited to 'x11/libgnome')
| -rw-r--r-- | x11/libgnome/Makefile | 6 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-ac | 4 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-ag | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 7f67247a395a..565e13bc49bd 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 f73a45521ae8..0d8f8a75ea9d 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 6b5481c4e7b9..a928239a2373 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"))){ |