diff options
| author | tron <tron@pkgsrc.org> | 2001-01-13 16:21:20 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-01-13 16:21:20 +0000 |
| commit | d20f1acd71b8ad971f98f7fc95dc0bcdb2ccf7f6 (patch) | |
| tree | 9e519275d77fe4065dbd30437d85d40fbee838c7 /pkgtools | |
| parent | 7751f03c8fc161425789514ef00f24c0b47a6a7b (diff) | |
| download | pkgsrc-d20f1acd71b8ad971f98f7fc95dc0bcdb2ccf7f6.tar.gz | |
Use "gdiff" from "diffutils" package under Solaris.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 14 | ||||
| -rwxr-xr-x | pkgtools/xpkgwedge/pkg/DEINSTALL | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 6bbbb6476e0..b390cc0b566 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2000/10/23 17:32:07 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/01/13 16:21:20 tron Exp $ # DISTNAME= xpkgwedge-1.0 @@ -18,6 +18,15 @@ DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL MESSAGE_FILE= ${WRKDIR}/MESSAGE +.include "../../mk/bsd.prefs.mk" + +.if (${OPSYS} == SunOS) +DEPENDS+= diffutils>=2.7:../../textproc/diffutils +DIFF= ${LOCALBASE}/bin/giff +.else +DIFF= /usr/bin/diff +.endif + pre-extract: @if [ ! -f ${X11BASE}/include/X11/X.h ]; then \ ${ECHO} 'xpkgwedge requires $$X11BASE to point to the real X distribution.'; \ @@ -30,9 +39,8 @@ do-build: ${SED} -e "s,@X11BASE@,${X11BASE},g" \ -e "s,@PREFIX@,${PREFIX},g" \ < ${FILESDIR}/pkgxmkmf.in > ${WRKDIR}/pkgxmkmf - -post-build: ${SED} -e "s,@X11BASE@,${X11BASE},g" \ + -e "s,@DIFF@,${DIFF},g" \ < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} -e "s,@X11BASE@,${X11BASE},g" \ < ${PKGDIR}/INSTALL > ${INSTALL_FILE} diff --git a/pkgtools/xpkgwedge/pkg/DEINSTALL b/pkgtools/xpkgwedge/pkg/DEINSTALL index 896deeaefab..e7ce9fcba9b 100755 --- a/pkgtools/xpkgwedge/pkg/DEINSTALL +++ b/pkgtools/xpkgwedge/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.5 2000/10/23 17:32:08 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.6 2001/01/13 16:21:21 tron Exp $ PKGNAME=$1 STAGE=$2 @@ -19,7 +19,7 @@ POST-DEINSTALL) > ${HOSTDEF} rm -f ${HOSTDEF}.bak if [ ${PKG_PREFIX} != ${X11BASE} ] && \ - diff -q ${X11_HOSTDEF} ${HOSTDEF} >/dev/null + @DIFF@ -q ${X11_HOSTDEF} ${HOSTDEF} >/dev/null then rm -f ${HOSTDEF} fi |