mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

Allow gnomelibs to DTRT in the case where ${LOCALBASE} is not /usr/local

Browse Source 
Original suggestion by:	nectar
Rewritten patch by:	ade (so don't blame nectar for this!)
This commit is contained in:
Ade Lovett 2000-09-25 21:01:47 +00:00
parent 8ed38918f6
commit d78d6a0392
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=33113
9 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/gnome-libs/Makefile
View File

@ -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>

4
x11/gnome-libs/files/patch-ac
View File

@ -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

6
x11/gnome-libs/files/patch-ag
View File

@ -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"))){

6
x11/gnomelibs/Makefile
View File

@ -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>

4
x11/gnomelibs/files/patch-ac
View File

@ -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

6
x11/gnomelibs/files/patch-ag
View File

@ -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"))){

6
x11/libgnome/Makefile
View File

@ -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>

4
x11/libgnome/files/patch-ac
View File

@ -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

6
x11/libgnome/files/patch-ag
View File

@ -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"))){