diff options
| author | agc <agc> | 2004-07-09 06:55:13 +0000 |
|---|---|---|
| committer | agc <agc> | 2004-07-09 06:55:13 +0000 |
| commit | 95e8b7b19b0a28eb9908d9afc96659a2cb5727ae (patch) | |
| tree | 85db7007001bf5244b7fe0aaad58f5fc9e318ba7 | |
| parent | 4072b2f173fea52a4b6d8fee25ccc8686b9ef920 (diff) | |
| download | pkgsrc-95e8b7b19b0a28eb9908d9afc96659a2cb5727ae.tar.gz | |
Complete the pullup of ticket 49, from Grant Beattie.
Module Name: pkgsrc
Committed By: grant
Date: Sat Jul 3 22:00:03 UTC 2004
Modified Files:
pkgsrc/mk/buildlink2: fake-la
Log Message:
replace ${TEST} -e with -f.
and
Module Name: pkgsrc
Committed By: grant
Date: Sat Jul 3 22:04:57 UTC 2004
Modified Files:
pkgsrc/mk: defs.SunOS.mk
Log Message:
use built-in test(1) now that bsd.pkg.mk is ${TEST} -e free.
and
Module Name: pkgsrc
Committed By: heinz
Date: Tue Jul 6 20:47:15 UTC 2004
Modified Files:
pkgsrc/mk/buildlink2: fake-la
Log Message:
Option "-e" for "test" is not portable.
| -rw-r--r-- | mk/buildlink2/fake-la | 6 | ||||
| -rw-r--r-- | mk/defs.SunOS.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/buildlink2/fake-la b/mk/buildlink2/fake-la index 78ddee08b1a..2ff487e5750 100644 --- a/mk/buildlink2/fake-la +++ b/mk/buildlink2/fake-la @@ -1,6 +1,6 @@ #!@BUILDLINK_SHELL@ # -# $NetBSD: fake-la,v 1.11 2004/02/21 10:35:57 jlam Exp $ +# $NetBSD: fake-la,v 1.11.4.1 2004/07/09 06:55:13 agc Exp $ AR="@AR@" AWK="@AWK@" @@ -52,7 +52,7 @@ case $libname in libbase=`${ECHO} $libname | ${SED} -e "s/\.a$//"` ltlib="$realdir/$libbase.la" # If there's already a libtool .la file, use it. - if ${TEST} -e "$ltlib" ; then + if ${TEST} -f "$ltlib" ; then current=`${SED} -n -e'/^current=[[:digit:]]/{ s/^current=//; p; };' "$ltlib"` rev=`${SED} -n -e'/^revision=[[:digit:]]/{ s/^revision=//; p; };' "$ltlib"` current=$(($current + 0)) @@ -100,7 +100,7 @@ old_library=`${SED} -n -e"/^old_library='/{ s/^old_library='//; s/'$//; p; };" " for file in $dlname $library_names $old_library do - if ! [ -e $realdir/$file ] + if ${TEST} ! -r $realdir/$file then removal_pattern="$removal_pattern -e s,$file\([^.0-9]\),\1,g" fi diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 8fbd3c6086a..d70b62e9baf 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.87 2004/06/18 11:22:41 kristerw Exp $ +# $NetBSD: defs.SunOS.mk,v 1.87.2.1 2004/07/09 06:55:13 agc Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -81,7 +81,7 @@ SU?= /usr/bin/su TAIL?= /usr/xpg4/bin/tail TAR?= ${LOCALBASE}/bin/tar TEE?= /usr/bin/tee -TEST?= /usr/bin/test +TEST?= test TOUCH?= /usr/bin/touch TR?= /usr/bin/tr TRUE?= /usr/bin/true |