diff options
author | jlam <jlam@pkgsrc.org> | 2001-06-18 05:17:14 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-06-18 05:17:14 +0000 |
commit | 95b00c292cdd0a4bcb96d23dadc961b03fe0f96f (patch) | |
tree | ccae99880e0378f2d09d516074a07db207dbfc83 /pkgtools/xpkgwedge | |
parent | 5fc276d091a2982cd80f05237053241f0c5f754c (diff) | |
download | pkgsrc-95b00c292cdd0a4bcb96d23dadc961b03fe0f96f.tar.gz |
Use FILES_SUBST instead of repeating substitution pattern for all the
files, and substitute for a few more utilities instead of using unqualified
names for programs.
Diffstat (limited to 'pkgtools/xpkgwedge')
-rw-r--r-- | pkgtools/xpkgwedge/Makefile | 25 | ||||
-rwxr-xr-x | pkgtools/xpkgwedge/pkg/DEINSTALL | 32 | ||||
-rw-r--r-- | pkgtools/xpkgwedge/pkg/INSTALL | 28 |
3 files changed, 53 insertions, 32 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index bf1dbb0fa9b..a3a39df8e16 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/06/16 08:53:48 veego Exp $ +# $NetBSD: Makefile,v 1.23 2001/06/18 05:17:14 jlam Exp $ # DISTNAME= xpkgwedge-1.2 @@ -27,6 +27,16 @@ DIFF= ${LOCALBASE}/bin/gdiff DIFF= /usr/bin/diff .endif +FILES_SUBST= X11BASE=${X11BASE} +FILES_SUBST+= PREFIX=${PREFIX} +FILES_SUBST+= CP=${CP:Q} +FILES_SUBST+= DIFF=${DIFF:Q} +FILES_SUBST+= GREP=${GREP:Q} +FILES_SUBST+= RM=${RM:Q} +FILES_SUBST+= RMDIR=${RMDIR:Q} +FILES_SUBST+= TRUE=${TRUE:Q} +FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} + pre-extract: @if [ ! -f ${X11BASE}/include/X11/X.h ]; then \ ${ECHO} 'xpkgwedge requires $$X11BASE to point to the real X distribution.'; \ @@ -36,14 +46,11 @@ pre-extract: fi do-build: - ${SED} -e "s,@X11BASE@,${X11BASE},g" \ - -e "s,@PREFIX@,${PREFIX},g" \ - < ${FILESDIR}/pkgxmkmf.in > ${WRKDIR}/pkgxmkmf - ${SED} -e "s,@X11BASE@,${X11BASE},g" \ - -e "s,@DIFF@,${DIFF},g" \ - < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} -e "s,@X11BASE@,${X11BASE},g" \ - < ${PKGDIR}/INSTALL > ${INSTALL_FILE} + ${SED} ${FILES_SUBST_SED} ${FILESDIR}/pkgxmkmf.in > ${WRKDIR}/pkgxmkmf + +pre-install: + ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} + ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/config diff --git a/pkgtools/xpkgwedge/pkg/DEINSTALL b/pkgtools/xpkgwedge/pkg/DEINSTALL index e7ce9fcba9b..3ea0cc983df 100755 --- a/pkgtools/xpkgwedge/pkg/DEINSTALL +++ b/pkgtools/xpkgwedge/pkg/DEINSTALL @@ -1,31 +1,39 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.6 2001/01/13 16:21:21 tron Exp $ +# $NetBSD: DEINSTALL,v 1.7 2001/06/18 05:17:15 jlam Exp $ PKGNAME=$1 STAGE=$2 +CP="@CP@" +DIFF="@DIFF@" +GREP="@GREP@" +RM="@RM@" +RMDIR="@RMDIR@" +TRUE="@TRUE@" + +X11BASE=@X11BASE@ +X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def +HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def + case ${STAGE} in DEINSTALL) ;; -POST-DEINSTALL) - X11BASE=@X11BASE@ - X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def - HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def +POST-DEINSTALL) echo -n "Updating ${HOSTDEF}..." - cp -f ${HOSTDEF} ${HOSTDEF}.bak - ( grep -v xpkgwedge ${HOSTDEF}.bak || true ) \ - > ${HOSTDEF} - rm -f ${HOSTDEF}.bak + ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak + ( ${GREP} -v xpkgwedge ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF} + ${RM} -f ${HOSTDEF}.bak if [ ${PKG_PREFIX} != ${X11BASE} ] && \ - @DIFF@ -q ${X11_HOSTDEF} ${HOSTDEF} >/dev/null + ${DIFF} -q ${X11_HOSTDEF} ${HOSTDEF} >/dev/null then - rm -f ${HOSTDEF} + ${RM} -f ${HOSTDEF} fi echo "done." - rmdir -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || true + ${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE} ;; + *) echo "Unexpected argument: ${STAGE}" exit 1 diff --git a/pkgtools/xpkgwedge/pkg/INSTALL b/pkgtools/xpkgwedge/pkg/INSTALL index 33791450445..2e289d31443 100644 --- a/pkgtools/xpkgwedge/pkg/INSTALL +++ b/pkgtools/xpkgwedge/pkg/INSTALL @@ -1,32 +1,38 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1 2000/10/23 17:32:08 jlam Exp $ +# $NetBSD: INSTALL,v 1.2 2001/06/18 05:17:15 jlam Exp $ PKGNAME=$1 STAGE=$2 +CP="@CP@" +GREP="@GREP@" +RM="@RM@" + +X11BASE=@X11BASE@ +X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def +HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def + case ${STAGE} in PRE-INSTALL) ;; -POST-INSTALL) - X11BASE=@X11BASE@ - X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def - HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def +POST-INSTALL) if [ ${PKG_PREFIX} = ${X11BASE} -o -f ${HOSTDEF} ] then echo -n "Updating ${HOSTDEF}..." - cp -f ${HOSTDEF} ${HOSTDEF}.bak + ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak else echo -n "Creating ${HOSTDEF}..." - cp -f ${X11_HOSTDEF} ${HOSTDEF}.bak + ${CP} -f ${X11_HOSTDEF} ${HOSTDEF}.bak fi - ( echo '#include <xpkgwedge.def>'; \ - grep -v xpkgwedge ${HOSTDEF}.bak ) \ - > ${HOSTDEF} - rm -f ${HOSTDEF}.bak + ( echo '#include <xpkgwedge.def>'; \ + ${GREP} -v xpkgwedge ${HOSTDEF}.bak; \ + ) > ${HOSTDEF} + ${RM} -f ${HOSTDEF}.bak echo "done." ;; + *) echo "Unexpected argument: ${STAGE}" exit 1 |