diff options
| author | jlam <jlam> | 2001-07-13 07:09:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-07-13 07:09:17 +0000 |
| commit | 03a6dd6fa68b8924591bf7640f135f0b395084b2 (patch) | |
| tree | 6f97936deeb9a539bc07b5007be8c72a20640428 /print/cups | |
| parent | bb13b45fb37e28767db6b8129d33334a3c80e8ed (diff) | |
| download | pkgsrc-03a6dd6fa68b8924591bf7640f135f0b395084b2.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 'print/cups')
| -rw-r--r-- | print/cups/Makefile | 3 | ||||
| -rw-r--r-- | print/cups/pkg/DEINSTALL | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 98f496459e3..608a482af1e 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/06/19 08:39:33 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2001/07/13 07:09:23 jlam Exp $ DISTNAME= cups-${VERS}-source PKGNAME= cups-${VERS} @@ -85,6 +85,7 @@ FILES_SUBST+= CAT=${CAT:Q} FILES_SUBST+= CHGRP=${CHGRP:Q} FILES_SUBST+= CHMOD=${CHMOD:Q} FILES_SUBST+= CHOWN=${CHOWN:Q} +FILES_SUBST+= CMP=${CMP:Q} FILES_SUBST+= CP=${CP:Q} FILES_SUBST+= GREP=${GREP:Q} FILES_SUBST+= MKDIR=${MKDIR:Q} diff --git a/print/cups/pkg/DEINSTALL b/print/cups/pkg/DEINSTALL index ac6524d3288..79370d3d8b9 100644 --- a/print/cups/pkg/DEINSTALL +++ b/print/cups/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.6 2001/01/28 02:05:38 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.7 2001/07/13 07:09:23 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -9,6 +9,7 @@ USER="@CUPS_USER@" GROUP="@CUPS_GROUP@" CAT="@CAT@" +CMP="@CMP@" RM="@RM@" RMDIR="@RMDIR@" TRUE="@TRUE@" @@ -29,7 +30,7 @@ DEINSTALL) do FILE=${CONFDIR}/${file} SAMPLEFILE=${SAMPLECONFDIR}/${file} - if diff -q ${FILE} ${SAMPLEFILE} >/dev/null + if ${CMP} -s ${FILE} ${SAMPLEFILE} then ${RM} -f ${FILE} fi |