diff options
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/buildlink-x11/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/pkg/DEINSTALL | 9 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/pkg/INSTALL | 13 |
3 files changed, 14 insertions, 11 deletions
diff --git a/pkgtools/buildlink-x11/Makefile b/pkgtools/buildlink-x11/Makefile index 6581fe7a710..32d6fa33457 100644 --- a/pkgtools/buildlink-x11/Makefile +++ b/pkgtools/buildlink-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/08/08 07:23:28 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/08/19 16:22:25 tron Exp $ DISTNAME= buildlink-x11-0.7 CATEGORIES= pkgtools devel x11 @@ -23,6 +23,7 @@ FILES_SUBST= X11BASE=${X11BASE} FILES_SUBST+= PREFIX=${PREFIX} FILES_SUBST+= CMP=${CMP:Q} FILES_SUBST+= CP=${CP:Q} +FILES_SUBST+= ECHO=${ECHO:Q} FILES_SUBST+= GREP=${GREP:Q} FILES_SUBST+= LN=${LN:Q} FILES_SUBST+= MV=${MV:Q} diff --git a/pkgtools/buildlink-x11/pkg/DEINSTALL b/pkgtools/buildlink-x11/pkg/DEINSTALL index d1480f7cf24..b8299ed5c52 100644 --- a/pkgtools/buildlink-x11/pkg/DEINSTALL +++ b/pkgtools/buildlink-x11/pkg/DEINSTALL @@ -1,12 +1,13 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.3 2001/08/08 07:23:28 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.4 2001/08/19 16:22:26 tron Exp $ PKGNAME=$1 STAGE=$2 CMP="@CMP@" CP="@CP@" +ECHO="@ECHO@" GREP="@GREP@" MV="@MV@" RM="@RM@" @@ -26,7 +27,7 @@ DEINSTALL) ;; POST-DEINSTALL) - echo -n "Updating ${HOSTDEF}..." + ${ECHO} -n "Updating ${HOSTDEF}..." ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak ( ${GREP} -v buildlinkX11 ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF} ${RM} -f ${HOSTDEF}.bak @@ -35,7 +36,7 @@ POST-DEINSTALL) then ${RM} -f ${HOSTDEF} fi - echo "done." + ${ECHO} "done." ${RM} -f ${X11_RULES} ${X11_DIST_RULES} if [ ${PKG_PREFIX} = ${X11BASE} ] @@ -47,7 +48,7 @@ POST-DEINSTALL) ;; *) - echo "Unexpected argument: ${STAGE}" + ${ECHO} "Unexpected argument: ${STAGE}" exit 1 ;; esac diff --git a/pkgtools/buildlink-x11/pkg/INSTALL b/pkgtools/buildlink-x11/pkg/INSTALL index 58ff29d9213..7db6813d0fd 100644 --- a/pkgtools/buildlink-x11/pkg/INSTALL +++ b/pkgtools/buildlink-x11/pkg/INSTALL @@ -1,11 +1,12 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2001/08/08 07:23:28 jlam Exp $ +# $NetBSD: INSTALL,v 1.3 2001/08/19 16:22:26 tron Exp $ PKGNAME=$1 STAGE=$2 CP="@CP@" +ECHO="@ECHO@" GREP="@GREP@" LN="@LN@" MV="@MV@" @@ -36,21 +37,21 @@ POST-INSTALL) if [ ${PKG_PREFIX} = ${X11BASE} -o -f ${HOSTDEF} ] then - echo -n "Updating ${HOSTDEF}..." + ${ECHO} -n "Updating ${HOSTDEF}..." ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak else - echo -n "Creating ${HOSTDEF}..." + ${ECHO} -n "Creating ${HOSTDEF}..." ${CP} -f ${X11_HOSTDEF} ${HOSTDEF}.bak fi ( ${GREP} -v buildlinkX11 ${HOSTDEF}.bak; \ - echo '#include <buildlinkX11.def>'; \ + ${ECHO} '#include <buildlinkX11.def>'; \ ) > ${HOSTDEF} ${RM} -f ${HOSTDEF}.bak - echo "done." + ${ECHO} "done." ;; *) - echo "Unexpected argument: ${STAGE}" + ${ECHO} "Unexpected argument: ${STAGE}" exit 1 ;; esac |