summaryrefslogtreecommitdiff
path: root/pkgtools/xpkgwedge
diff options
context:
space:
mode:
authorjlam <jlam>2001-07-13 07:09:17 +0000
committerjlam <jlam>2001-07-13 07:09:17 +0000
commit03a6dd6fa68b8924591bf7640f135f0b395084b2 (patch)
tree6f97936deeb9a539bc07b5007be8c72a20640428 /pkgtools/xpkgwedge
parentbb13b45fb37e28767db6b8129d33334a3c80e8ed (diff)
downloadpkgsrc-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 'pkgtools/xpkgwedge')
-rw-r--r--pkgtools/xpkgwedge/Makefile13
-rwxr-xr-xpkgtools/xpkgwedge/pkg/DEINSTALL6
2 files changed, 5 insertions, 14 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 46ab684aa6d..68611586dbf 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/07/10 00:58:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.28 2001/07/13 07:09:22 jlam Exp $
#
DISTNAME= xpkgwedge-1.6
@@ -18,19 +18,10 @@ NO_CHECKSUM= # defined
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
INSTALL_FILE= ${WRKDIR}/INSTALL
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == SunOS)
-DEPENDS+= diffutils>=2.7:../../devel/diffutils
-DIFF= ${LOCALBASE}/bin/gdiff
-.else
-DIFF= /usr/bin/diff
-.endif
-
FILES_SUBST= X11BASE=${X11BASE}
FILES_SUBST+= PREFIX=${PREFIX}
+FILES_SUBST+= CMP=${CMP:Q}
FILES_SUBST+= CP=${CP:Q}
-FILES_SUBST+= DIFF=${DIFF:Q}
FILES_SUBST+= GREP=${GREP:Q}
FILES_SUBST+= RM=${RM:Q}
FILES_SUBST+= RMDIR=${RMDIR:Q}
diff --git a/pkgtools/xpkgwedge/pkg/DEINSTALL b/pkgtools/xpkgwedge/pkg/DEINSTALL
index 841fcd8bad9..ce75e844876 100755
--- a/pkgtools/xpkgwedge/pkg/DEINSTALL
+++ b/pkgtools/xpkgwedge/pkg/DEINSTALL
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $NetBSD: DEINSTALL,v 1.8 2001/07/10 00:57:11 hubertf Exp $
+# $NetBSD: DEINSTALL,v 1.9 2001/07/13 07:09:22 jlam Exp $
PKGNAME=$1
STAGE=$2
+CMP="@CMP@"
CP="@CP@"
-DIFF="@DIFF@"
GREP="@GREP@"
RM="@RM@"
RMDIR="@RMDIR@"
@@ -27,7 +27,7 @@ POST-DEINSTALL)
${RM} -f ${HOSTDEF}.bak
if [ ${PKG_PREFIX} != ${X11BASE} ] && \
[ -f ${X11_HOSTDEF} ] && \
- ${DIFF} -q ${X11_HOSTDEF} ${HOSTDEF} >/dev/null
+ ${CMP} -s ${X11_HOSTDEF} ${HOSTDEF}
then
${RM} -f ${HOSTDEF}
fi