summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornetchild <netchild@FreeBSD.org>2006-01-21 12:50:13 +0000
committernetchild <netchild@FreeBSD.org>2006-01-21 12:50:13 +0000
commit538121db8cb6d927163a58c494f09bc832cc0d98 (patch)
treebfb8d32cccddfdd9fe42d922bb99afbe3bd3a285
parentf197148d379176a0541e0601d7ec2b94c87df8dc (diff)
downloadFreeBSD-ports-538121db8cb6d927163a58c494f09bc832cc0d98.zip
FreeBSD-ports-538121db8cb6d927163a58c494f09bc832cc0d98.tar.gz
Check if /usr/X11R6/lib is in the ld.so.conf. If it isn't (that's
only the case in non-default linux_base ports): moan. Suggested by: Boris Samorodov <bsam@ipt.ru>
-rw-r--r--x11/linux-XFree86-libs/Makefile2
-rw-r--r--x11/linux-XFree86-libs/files/pkg-install.in9
2 files changed, 9 insertions, 2 deletions
diff --git a/x11/linux-XFree86-libs/Makefile b/x11/linux-XFree86-libs/Makefile
index 5c0d048..8f2655c 100644
--- a/x11/linux-XFree86-libs/Makefile
+++ b/x11/linux-XFree86-libs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= XFree86-libs
PORTVERSION= 4.3.99.902
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 linux
MASTER_SITES= ${MASTER_SITE_SUSE} \
ftp://ftp.in2p3.fr/pub/linux/suse/update/9.1/rpm/i586/ \
diff --git a/x11/linux-XFree86-libs/files/pkg-install.in b/x11/linux-XFree86-libs/files/pkg-install.in
index ad62ac8..8a60e55 100644
--- a/x11/linux-XFree86-libs/files/pkg-install.in
+++ b/x11/linux-XFree86-libs/files/pkg-install.in
@@ -4,5 +4,12 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin
export PATH
if [ "$2" = "POST-INSTALL" ]; then
- chroot %%LINUXBASE%% /sbin/ldconfig
+ grep -q /usr/X11R6/lib %%LINUXBASE%%/etc/ld.so.conf
+ if [ $? -eq 0 ]; then
+ %%LINUXBASE%%/sbin/ldconfig
+ else
+ echo '*************************'
+ echo 'WARNING: You do not have /usr/X11R6/lib in %%LINUXBASE%%/etc/ld.so.conf (probably because you do not use the default linux_base port and those non-default linux_base ports have a bug in this regard), please add it and run %%LINUXBASE%%/sbin/ldconfig as root to be able to use applications which make use of the linux X11 port.' | fmt
+ echo '*************************'
+ fi
fi
OpenPOWER on IntegriCloud