[pkgsrc/pkgsrc-2004Q2]: pkgsrc/mk Complete the pullup of ticket 49, from Gran...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52ff443b4939
branches:  pkgsrc-2004Q2
changeset: 476722:52ff443b4939
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Jul 09 06:55:13 2004 +0000

description:
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.

diffstat:

 mk/buildlink2/fake-la |  6 +++---
 mk/defs.SunOS.mk      |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 5f24e24a2cda -r 52ff443b4939 mk/buildlink2/fake-la
--- a/mk/buildlink2/fake-la     Thu Jul 08 10:43:00 2004 +0000
+++ b/mk/buildlink2/fake-la     Fri Jul 09 06:55:13 2004 +0000
@@ -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 @@
                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 @@
 
 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 -r 5f24e24a2cda -r 52ff443b4939 mk/defs.SunOS.mk
--- a/mk/defs.SunOS.mk  Thu Jul 08 10:43:00 2004 +0000
+++ b/mk/defs.SunOS.mk  Fri Jul 09 06:55:13 2004 +0000
@@ -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 @@
 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