diff options
Diffstat (limited to 'pkgtools')
-rw-r--r-- | pkgtools/buildlink-x11/Makefile | 13 | ||||
-rw-r--r-- | pkgtools/buildlink-x11/pkg/DEINSTALL | 6 | ||||
-rw-r--r-- | pkgtools/xpkgwedge/Makefile | 13 | ||||
-rwxr-xr-x | pkgtools/xpkgwedge/pkg/DEINSTALL | 6 |
4 files changed, 10 insertions, 28 deletions
diff --git a/pkgtools/buildlink-x11/Makefile b/pkgtools/buildlink-x11/Makefile index 6ffccea0626..5d827a5119d 100644 --- a/pkgtools/buildlink-x11/Makefile +++ b/pkgtools/buildlink-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/07/05 17:23:00 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/07/13 07:09:21 jlam Exp $ DISTNAME= buildlink-x11-0.6 CATEGORIES= pkgtools devel x11 @@ -19,19 +19,10 @@ USE_X11BASE= # 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/buildlink-x11/pkg/DEINSTALL b/pkgtools/buildlink-x11/pkg/DEINSTALL index 57514d082cd..700edae5d2c 100644 --- a/pkgtools/buildlink-x11/pkg/DEINSTALL +++ b/pkgtools/buildlink-x11/pkg/DEINSTALL @@ -1,12 +1,12 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1.1.1 2001/07/02 21:00:44 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2001/07/13 07:09:21 jlam Exp $ PKGNAME=$1 STAGE=$2 +CMP="@CMP@" CP="@CP@" -DIFF="@DIFF@" GREP="@GREP@" RM="@RM@" RMDIR="@RMDIR@" @@ -26,7 +26,7 @@ POST-DEINSTALL) ( ${GREP} -v buildlinkX11 ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF} ${RM} -f ${HOSTDEF}.bak if [ ${PKG_PREFIX} != ${X11BASE} ] && \ - ${DIFF} -q ${X11_HOSTDEF} ${HOSTDEF} >/dev/null + ${CMP} -s ${X11_HOSTDEF} ${HOSTDEF} then ${RM} -f ${HOSTDEF} fi 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 |