aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSADA Kenji <sada@FreeBSD.org>2000-03-11 17:52:08 +0000
committerSADA Kenji <sada@FreeBSD.org>2000-03-11 17:52:08 +0000
commitb262f5384f1b10e34cc0cd8e8509efa91d2b764a (patch)
tree69d258f2ed88dea895bb23d97f7cd0ea1064a498
parentbd979c55e768343562bcedd6df4217371e33052c (diff)
downloadports-b262f5384f1b10e34cc0cd8e8509efa91d2b764a.tar.gz
ports-b262f5384f1b10e34cc0cd8e8509efa91d2b764a.zip
Enable warning message with compat22 libs for package users.
Maintainer admitted this on ports-ML. (message-id: <20000309102434.P54218@shale.csir.co.za>) # Sorry Jeremy, the tree would be frozen soon.
Notes
Notes: svn path=/head/; revision=26763
-rw-r--r--x11/XFree86-aoutlibs/Makefile2
-rw-r--r--x11/XFree86-aoutlibs/pkg-req5
2 files changed, 4 insertions, 3 deletions
diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile
index 9c3958efb925..ff3e2b05721f 100644
--- a/x11/XFree86-aoutlibs/Makefile
+++ b/x11/XFree86-aoutlibs/Makefile
@@ -23,7 +23,7 @@ PORTOBJFORMAT= aout
USE_X_PREFIX= yes
pre-configure:
- @${SETENV} ${SCRIPTS_ENV} ARCH=${ARCH} ${SH} \
+ @${SETENV} ${SCRIPTS_ENV} ${SH} \
${PKGDIR}/REQ ${PKGNAME} INSTALL
do-install:
diff --git a/x11/XFree86-aoutlibs/pkg-req b/x11/XFree86-aoutlibs/pkg-req
index a337c2fc9e53..aabd9bc76fbe 100644
--- a/x11/XFree86-aoutlibs/pkg-req
+++ b/x11/XFree86-aoutlibs/pkg-req
@@ -2,9 +2,10 @@
env=/usr/bin/env
fgrep=/usr/bin/fgrep
ldconfig=/sbin/ldconfig
-if [ x$2 = xINSTALL -a x$ARCH = xi386 ]; then
+ld_so=/usr/libexec/ld.so
+if [ x$2 = xINSTALL ]; then
$env OBJFORMAT=aout $ldconfig -r | $fgrep -q -e '-lc.3'
- if [ $? -ne 0 ]; then
+ if [ $? -ne 0 -o ! -x $ld_so ]; then
cat <<END
*********************************************************************