diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-13 07:09:17 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-13 07:09:17 +0000 |
| commit | 9820a22a904f7576bb8724416da2edafe7a03b8e (patch) | |
| tree | 6f97936deeb9a539bc07b5007be8c72a20640428 /mail/mutt | |
| parent | d3bc280f5563750d61a3f8c7dcd95a634e4fda1a (diff) | |
| download | pkgsrc-9820a22a904f7576bb8724416da2edafe7a03b8e.tar.gz | |
In package Makefiles, create FILES_SUBST instead of duplicating sed
expression for substituting in DEINSTALL/INSTALL scripts. Use "${CMP} -s"
instead of "diff -q" since the former is more portable across OSes.
Diffstat (limited to 'mail/mutt')
| -rw-r--r-- | mail/mutt/Makefile | 3 | ||||
| -rw-r--r-- | mail/mutt/pkg/DEINSTALL | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index becd21154f4..90895ed137d 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2001/06/20 07:31:58 jlam Exp $ +# $NetBSD: Makefile,v 1.74 2001/07/13 07:09:18 jlam Exp $ DISTNAME= mutt-1.2.5i CATEGORIES= mail @@ -50,6 +50,7 @@ INSTALL_FILE= ${WRKDIR}/INSTALL FILES_SUBST= CAT=${CAT:Q} FILES_SUBST+= CHMOD=${CHMOD:Q} +FILES_SUBST+= CMP=${CMP:Q} FILES_SUBST+= CP=${CP:Q} FILES_SUBST+= RM=${RM:Q} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} diff --git a/mail/mutt/pkg/DEINSTALL b/mail/mutt/pkg/DEINSTALL index 357c47e1754..1a58deb6a5f 100644 --- a/mail/mutt/pkg/DEINSTALL +++ b/mail/mutt/pkg/DEINSTALL @@ -1,11 +1,12 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.2 2001/07/12 06:05:28 tron Exp $ +# $NetBSD: DEINSTALL,v 1.3 2001/07/13 07:09:19 jlam Exp $ PKGNAME=$1 STAGE=$2 CAT="@CAT@" +CMP="@CMP@" RM="@RM@" SAMPLECONFDIR=${PKG_PREFIX}/share/doc/mutt/samples @@ -22,7 +23,7 @@ DEINSTALL) do FILE=${CONFDIR}/${file} SAMPLEFILE=${SAMPLECONFDIR}/${file} - if cmp -s ${FILE} ${SAMPLEFILE} + if ${CMP} -s ${FILE} ${SAMPLEFILE} then ${RM} -f ${FILE} fi |