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 /www/apache | |
| 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 'www/apache')
| -rw-r--r-- | www/apache/Makefile | 3 | ||||
| -rw-r--r-- | www/apache/pkg/DEINSTALL | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 1671be451fc..8c6a1f5cd8a 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2001/07/09 02:45:09 hubertf Exp $ +# $NetBSD: Makefile,v 1.75 2001/07/13 07:09:24 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -97,6 +97,7 @@ FILES_SUBST= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} FILES_SUBST+= CAT=${CAT:Q} FILES_SUBST+= CHMOD=${CHMOD:Q} FILES_SUBST+= CHOWN=${CHOWN:Q} +FILES_SUBST+= CMP=${CMP:Q} FILES_SUBST+= CP=${CP:Q} FILES_SUBST+= MKDIR=${MKDIR:Q} FILES_SUBST+= PREFIX=${PREFIX} diff --git a/www/apache/pkg/DEINSTALL b/www/apache/pkg/DEINSTALL index 13fc444fab7..029f5f0f568 100644 --- a/www/apache/pkg/DEINSTALL +++ b/www/apache/pkg/DEINSTALL @@ -1,11 +1,12 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.8 2001/05/02 22:22:43 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.9 2001/07/13 07:09:25 jlam Exp $ PKGNAME=$1 STAGE=$2 CAT="@CAT@" +CMP="@CMP@" RM="@RM@" RMDIR="@RMDIR@" TRUE="@TRUE@" @@ -28,7 +29,7 @@ DEINSTALL) do FILE=${CONFDIR}/${file} SAMPLEFILE=${SAMPLECONFDIR}/${file}.default - if diff -q ${FILE} ${SAMPLEFILE} >/dev/null + if ${CMP} -s ${FILE} ${SAMPLEFILE} then ${RM} -f ${FILE} fi |