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.

4 files changed, 22 insertions, 18 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
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 3d848ee24c4..d35adc38b1c 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/06/12 20:33:07 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/07/13 07:09:21 jlam Exp $
 
 DISTNAME=	vtun-2.4
 CATEGORIES=	net
@@ -30,19 +30,20 @@ VTUN_SYSCONFDIR?=${LOCALBASE}/etc
 CONFIGURE_ARGS+=--sysconfdir=${VTUN_SYSCONFDIR}
 BUILD_DEFS+=	VTUN_SYSCONFDIR
 
+FILES_SUBST=		VTUN_SYSCONFDIR=${VTUN_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+=		RM=${RM:Q}
+FILES_SUBST+=		RMDIR=${RMDIR:Q}
+FILES_SUBST+=		TRUE=${TRUE:Q}  
+FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+
 pre-install:
-	@${SED}	-e "s|@CAT@|${CAT}|g"					\
-		-e "s|@RM@|${RM}|g"					\
-		-e "s|@RMDIR@|${RMDIR}|g"				\
-		-e "s|@TRUE@|${TRUE}|g"					\
-		-e "s|@VTUN_SYSCONFDIR@|${VTUN_SYSCONFDIR}|g"		\
-		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	@${SED}	-e "s|@CAT@|${CAT}|g"					\
-		-e "s|@CHMOD@|${CHMOD}|g"				\
-		-e "s|@CP@|${CP}|g"					\
-		-e "s|@MKDIR@|${MKDIR}|g"				\
-		-e "s|@VTUN_SYSCONFDIR@|${VTUN_SYSCONFDIR}|g"		\
-		${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vtund ${PREFIX}/sbin
diff --git a/net/vtun/pkg/DEINSTALL b/net/vtun/pkg/DEINSTALL
index a4e741db4a1..7f6fd3a3c3a 100644
--- a/net/vtun/pkg/DEINSTALL
+++ b/net/vtun/pkg/DEINSTALL
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 2001/05/13 19:02:48 kim Exp $
+# $NetBSD: DEINSTALL,v 1.2 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}.example
-		if diff -q ${FILE} ${SAMPLEFILE} >/dev/null
+		if ${CMP} -s ${FILE} ${SAMPLEFILE}
 		then
 			${RM} -f ${FILE}
 		fi