[pkgsrc/pkgsrc-2004Q2]: pkgsrc/mk Pullup ticket 49 to the pkgsrc-2004Q2 branc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d1e70c5f1d00
branches:  pkgsrc-2004Q2
changeset: 476718:d1e70c5f1d00
user:      agc <agc%pkgsrc.org@localhost>
date:      Thu Jul 08 08:40:33 2004 +0000

description:
Pullup ticket 49 to the pkgsrc-2004Q2 branch, requested by Grant Beattie.

Fixes for ${TEST} portability.

        Module Name:    pkgsrc
        Committed By:   grant
        Date:           Sat Jul  3 21:59:04 UTC 2004

        Modified Files:
                pkgsrc/mk: bsd.pkg.mk

        Log Message:
        replace use of ${TEST} -e with -f or -d as appropriate. use consistent
        shell syntax.

        this allows the pkgsrc framework to work with IRIX 5.3 and Solaris'
        sh(1) built-in test(1).

diffstat:

 mk/bsd.pkg.mk |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (91 lines):

diff -r 5e63c5dedb60 -r d1e70c5f1d00 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Jul 08 08:38:16 2004 +0000
+++ b/mk/bsd.pkg.mk     Thu Jul 08 08:40:33 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1468.2.2 2004/07/06 22:15:54 agc Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1468.2.3 2004/07/08 08:40:33 agc Exp $
 #
 # This file is in the public domain.
 #
@@ -2706,7 +2706,7 @@
        }                                       \
        /.*\/lib[^\/]+\.so$$/ {                 \
                lines[NR] = $$0;                \
-               if (system("${TEST} -e ${PREFIX}/" $$0) == 0) { \
+               if (system("${TEST} -f ${PREFIX}/" $$0) == 0) { \
                        next;                   \
                }                               \
                libtool_release($$0);           \
@@ -4008,7 +4008,7 @@
 .PHONY: binpkg-list
 .if !target(binpkg-list)
 binpkg-list:
-       @if [ -e ${PACKAGES} ]; then                                    \
+       @if ${TEST} -d ${PACKAGES}; then                                        \
                cd ${PACKAGES};                                         \
                case ${.CURDIR} in                                      \
                */pkgsrc/packages)                                      \
@@ -4166,7 +4166,7 @@
 .PHONY: README.html
 README.html: .PRECIOUS
        @${SETENV} AWK=${AWK} BMAKE=${MAKE} ../../mk/scripts/mkdatabase -f $@.tmp1
-       @if [ -e ${PACKAGES} ]; then                                    \
+       @if ${TEST} -d ${PACKAGES}; then                                        \
                cd ${PACKAGES};                                         \
                case `${PWD_CMD}` in                                    \
                        ${_PKGSRCDIR}/packages)                         \
@@ -4272,7 +4272,7 @@
 .if !target(show-license)
 show-license show-licence:
        @if [ "${LICENSE}" != "" ]; then                                \
-               if [ -e ${_PKGSRCDIR}/licenses/${LICENSE} ]; then       \
+               if ${TEST} -f ${_PKGSRCDIR}/licenses/${LICENSE}; then   \
                        if [ "${PAGER}" != "" ]; then                   \
                                ${PAGER} ${_PKGSRCDIR}/licenses/${LICENSE};\
                        else                                            \
@@ -4593,30 +4593,30 @@
                ${ECHO} ${COMMENT:Q} > ${_PKG_DBDIR}/${PKGNAME}/+COMMENT; \
                ${CP} ${BUILD_VERSION_FILE} ${_PKG_DBDIR}/${PKGNAME}/+BUILD_VERSION; \
                ${CP} ${BUILD_INFO_FILE} ${_PKG_DBDIR}/${PKGNAME}/+BUILD_INFO; \
-               if ${TEST} -e ${SIZE_PKG_FILE}; then                    \
+               if ${TEST} -f ${SIZE_PKG_FILE}; then                    \
                        ${CP} ${SIZE_PKG_FILE} ${_PKG_DBDIR}/${PKGNAME}/+SIZE_PKG; \
                fi ;                                                    \
-               if ${TEST} -e ${SIZE_ALL_FILE}; then                    \
+               if ${TEST} -f ${SIZE_ALL_FILE}; then                    \
                        ${CP} ${SIZE_ALL_FILE} ${_PKG_DBDIR}/${PKGNAME}/+SIZE_ALL; \
                fi ;                                                    \
-               if ${TEST} -e ${PRESERVE_FILE}; then                    \
+               if ${TEST} -f ${PRESERVE_FILE}; then                    \
                        ${CP} ${PRESERVE_FILE} ${_PKG_DBDIR}/${PKGNAME}/+PRESERVE; \
                fi ;                                                    \
                if [ "${PKG_INSTALLATION_TYPE}" = "pkgviews" ]; then    \
                        ${TOUCH} ${_PKG_DBDIR}/${PKGNAME}/+VIEWS;       \
                fi ;                                                    \
                if [ -n "${INSTALL_FILE}" ]; then                       \
-                       if ${TEST} -e ${INSTALL_FILE}; then             \
+                       if ${TEST} -f ${INSTALL_FILE}; then             \
                                ${CP} ${INSTALL_FILE} ${_PKG_DBDIR}/${PKGNAME}/+INSTALL; \
                        fi;                                             \
                fi;                                                     \
                if [ -n "${DEINSTALL_FILE}" ]; then                     \
-                       if ${TEST} -e ${DEINSTALL_FILE}; then           \
+                       if ${TEST} -f ${DEINSTALL_FILE}; then           \
                                ${CP} ${DEINSTALL_FILE} ${_PKG_DBDIR}/${PKGNAME}/+DEINSTALL; \
                        fi;                                             \
                fi;                                                     \
                if [ -n "${MESSAGE}" ]; then                            \
-                       if ${TEST} -e ${MESSAGE}; then                  \
+                       if ${TEST} -f ${MESSAGE}; then                  \
                                ${CP} ${MESSAGE} ${_PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
                        fi;                                             \
                fi;                                                     \
@@ -4625,7 +4625,7 @@
                        if ${TEST} -z "$$realdep"; then                 \
                                ${ECHO} "$$dep not installed - dependency NOT registered" ; \
                        elif [ -d ${_PKG_DBDIR}/$$realdep ]; then       \
-                               if ${TEST} ! -e ${_PKG_DBDIR}/$$realdep/+REQUIRED_BY; then \
+                               if ${TEST} ! -f ${_PKG_DBDIR}/$$realdep/+REQUIRED_BY; then \
                                        ${TOUCH} ${_PKG_DBDIR}/$$realdep/+REQUIRED_BY; \
                                fi;                                     \
                                ${AWK} 'BEGIN { found = 0; }            \