diff options
| author | jlam <jlam> | 2001-07-13 07:09:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-07-13 07:09:17 +0000 |
| commit | 9301100af50bc784e0f352cf457e9090fc7b005d (patch) | |
| tree | 6f97936deeb9a539bc07b5007be8c72a20640428 /net/samba | |
| parent | 1142e8b40d1d1d9f6ce4570b4e17182c30da66e4 (diff) | |
| download | pkgsrc-9301100af50bc784e0f352cf457e9090fc7b005d.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 'net/samba')
| -rw-r--r-- | net/samba/Makefile | 3 | ||||
| -rw-r--r-- | net/samba/pkg/DEINSTALL | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 83add6fe815..a3f45eeebfa 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2001/06/24 07:55:22 taca Exp $ +# $NetBSD: Makefile,v 1.60 2001/07/13 07:09:20 jlam Exp $ DISTNAME= samba-2.2.0a PKGNAME= samba-2.2.0nb2 @@ -77,6 +77,7 @@ FILES_SUBST+= PREFIX=${PREFIX} 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+= ECHO=${ECHO:Q} FILES_SUBST+= MKDIR=${MKDIR:Q} diff --git a/net/samba/pkg/DEINSTALL b/net/samba/pkg/DEINSTALL index ec73f7f892a..9e78126dc49 100644 --- a/net/samba/pkg/DEINSTALL +++ b/net/samba/pkg/DEINSTALL @@ -1,11 +1,12 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.4 2001/06/19 09:06:05 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.5 2001/07/13 07:09:21 jlam Exp $ PKGNAME=$1 STAGE=$2 CAT="@CAT@" +CMP="@CMP@" RM="@RM@" RMDIR="@RMDIR@" TRUE="@TRUE@" @@ -25,7 +26,7 @@ DEINSTALL) do FILE=${CONFDIR}/${file} SAMPLEFILE=${SAMPLECONFDIR}/${file}.sample - if diff -q ${FILE} ${SAMPLEFILE} >/dev/null + if ${CMP} -s ${FILE} ${SAMPLEFILE} then ${RM} -f ${FILE} fi |