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 /www/ap-ssl | |
| 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 'www/ap-ssl')
| -rw-r--r-- | www/ap-ssl/Makefile | 3 | ||||
| -rw-r--r-- | www/ap-ssl/pkg/DEINSTALL | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index e50dfcad4db..14534607681 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2001/06/09 06:50:24 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2001/07/13 07:09:24 jlam Exp $ DISTNAME= mod_ssl-2.8.4-1.3.20 PKGNAME= ap-ssl-2.8.4 @@ -36,6 +36,7 @@ INSTALL_FILE= ${WRKDIR}/INSTALL FILES_SUBST= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} FILES_SUBST+= CAT=${CAT:Q} FILES_SUBST+= CHMOD=${CHMOD:Q} +FILES_SUBST+= CMP=${CMP:Q} FILES_SUBST+= CP=${CP:Q} FILES_SUBST+= MKDIR=${MKDIR:Q} FILES_SUBST+= PREFIX=${PREFIX} diff --git a/www/ap-ssl/pkg/DEINSTALL b/www/ap-ssl/pkg/DEINSTALL index dd98806fed8..c75f7cd978d 100644 --- a/www/ap-ssl/pkg/DEINSTALL +++ b/www/ap-ssl/pkg/DEINSTALL @@ -1,11 +1,12 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2001/04/29 20:36:48 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2001/07/13 07:09:24 jlam Exp $ PKGNAME=$1 STAGE=$2 CAT="@CAT@" +CMP="@CMP@" RM="@RM@" SERVERROOT="@APACHE_SYSCONFDIR@" @@ -30,7 +31,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 |