diff options
| author | hubertf <hubertf> | 2001-07-10 00:57:10 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2001-07-10 00:57:10 +0000 |
| commit | 26ac595226d4d999b3c2077af6e27133da354c73 (patch) | |
| tree | 17bf232494fd9f7a68face341a93395dca8c8b1c /pkgtools | |
| parent | dc779dc568bfeb4f48a482c73e2086368cd96cf0 (diff) | |
| download | pkgsrc-26ac595226d4d999b3c2077af6e27133da354c73.tar.gz | |
I don't know why I don't have a $X11_HOSTDEF, still I have none.
(Solaris 88/x86, of course with X running :)
Make xpkgwedge not wedge in this config.
Diffstat (limited to 'pkgtools')
| -rwxr-xr-x | pkgtools/xpkgwedge/pkg/DEINSTALL | 3 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/pkg/INSTALL | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgtools/xpkgwedge/pkg/DEINSTALL b/pkgtools/xpkgwedge/pkg/DEINSTALL index 3ea0cc983df..841fcd8bad9 100755 --- a/pkgtools/xpkgwedge/pkg/DEINSTALL +++ b/pkgtools/xpkgwedge/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.7 2001/06/18 05:17:15 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.8 2001/07/10 00:57:11 hubertf Exp $ PKGNAME=$1 STAGE=$2 @@ -26,6 +26,7 @@ POST-DEINSTALL) ( ${GREP} -v xpkgwedge ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF} ${RM} -f ${HOSTDEF}.bak if [ ${PKG_PREFIX} != ${X11BASE} ] && \ + [ -f ${X11_HOSTDEF} ] && \ ${DIFF} -q ${X11_HOSTDEF} ${HOSTDEF} >/dev/null then ${RM} -f ${HOSTDEF} diff --git a/pkgtools/xpkgwedge/pkg/INSTALL b/pkgtools/xpkgwedge/pkg/INSTALL index 2e289d31443..ecf5caaba92 100644 --- a/pkgtools/xpkgwedge/pkg/INSTALL +++ b/pkgtools/xpkgwedge/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.2 2001/06/18 05:17:15 jlam Exp $ +# $NetBSD: INSTALL,v 1.3 2001/07/10 00:57:10 hubertf Exp $ PKGNAME=$1 STAGE=$2 @@ -24,7 +24,12 @@ POST-INSTALL) ${CP} -f ${HOSTDEF} ${HOSTDEF}.bak else echo -n "Creating ${HOSTDEF}..." - ${CP} -f ${X11_HOSTDEF} ${HOSTDEF}.bak + if [ -f ${X11_HOSTDEF} ] + then + ${CP} -f ${X11_HOSTDEF} ${HOSTDEF}.bak + else + ${CP} -f /dev/null ${HOSTDEF}.bak + fi fi ( echo '#include <xpkgwedge.def>'; \ ${GREP} -v xpkgwedge ${HOSTDEF}.bak; \ |