summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjlam <jlam>2003-11-23 06:46:54 +0000
committerjlam <jlam>2003-11-23 06:46:54 +0000
commit946c59199094bc55051f1538a7e82371ac5b860d (patch)
tree631958ba0fdf089cb2cadbfb5effb37e8441a952 /pkgtools
parentfae9fd28032cff7b9c70d249262dc97dd1a9860a (diff)
downloadpkgsrc-946c59199094bc55051f1538a7e82371ac5b860d.tar.gz
Update the host.def file during view (de)installation. Also deal with
the font program symlinks at both view-deinstall and normal deinstallation time since the files aren't listed in the PLIST (the font programs are handled completely by the INSTALL/DEINSTALL scripts).
Diffstat (limited to 'pkgtools')
-rwxr-xr-xpkgtools/xpkgwedge/DEINSTALL16
-rw-r--r--pkgtools/xpkgwedge/INSTALL4
-rw-r--r--pkgtools/xpkgwedge/Makefile5
-rw-r--r--pkgtools/xpkgwedge/PLIST5
4 files changed, 22 insertions, 8 deletions
diff --git a/pkgtools/xpkgwedge/DEINSTALL b/pkgtools/xpkgwedge/DEINSTALL
index f0e31eb2c2e..c5b1fa5a31f 100755
--- a/pkgtools/xpkgwedge/DEINSTALL
+++ b/pkgtools/xpkgwedge/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.5 2003/09/19 00:53:58 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.6 2003/11/23 06:46:54 jlam Exp $
FONT_PROGS="@FONT_PROGS@"
X11BASE=@X11BASE@
@@ -9,7 +9,7 @@ SITEDEF=${PKG_PREFIX}/lib/X11/config/site.def
SV4LIB=${PKG_PREFIX}/lib/X11/config/sv4Lib.tmpl
case ${STAGE} in
-POST-DEINSTALL)
+VIEW-DEINSTALL)
for prog in ${FONT_PROGS}; do
if [ -f ${PKG_PREFIX}/bin/$prog -a \
${PKG_PREFIX} != ${X11BASE} ]; then
@@ -31,6 +31,18 @@ POST-DEINSTALL)
;;
esac
${ECHO} "done."
+ ;;
+
+DEINSTALL)
+ for prog in ${FONT_PROGS}; do
+ if [ -f ${PKG_PREFIX}/bin/$prog -a \
+ ${PKG_PREFIX} != ${X11BASE} ]; then
+ ${RM} -f ${PKG_PREFIX}/bin/$prog
+ fi
+ done
+ ;;
+
+POST-DEINSTALL)
${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE}
;;
esac
diff --git a/pkgtools/xpkgwedge/INSTALL b/pkgtools/xpkgwedge/INSTALL
index 25e71287335..35f6b52cf08 100644
--- a/pkgtools/xpkgwedge/INSTALL
+++ b/pkgtools/xpkgwedge/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.6 2003/09/19 00:53:58 jlam Exp $
+# $NetBSD: INSTALL,v 1.7 2003/11/23 06:46:54 jlam Exp $
FONT_PROGS="@FONT_PROGS@"
X11BASE=@X11BASE@
@@ -23,7 +23,9 @@ POST-INSTALL)
${PKG_PREFIX}/bin/$prog
fi
done
+ ;;
+VIEW-INSTALL)
if [ ${PKG_PREFIX} = ${X11BASE} -o -f ${HOSTDEF} ]; then
${ECHO} -n "Updating ${HOSTDEF}..."
${CP} -f ${HOSTDEF} ${HOSTDEF}.bak
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index ce2f10e9e9e..3eaa6c9ec05 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2003/10/18 10:12:09 grant Exp $
+# $NetBSD: Makefile,v 1.43 2003/11/23 06:46:54 jlam Exp $
DISTNAME= xpkgwedge-1.8
WRKSRC= ${WRKDIR}
@@ -10,6 +10,8 @@ MAINTAINER= jlam@NetBSD.org
HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/Packages.txt
COMMENT= Allows X11 pkgs to be built and used outside of $${X11BASE}
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
EXTRACT_ONLY= # empty
NO_CONFIGURE= # defined
NO_BUILDLINK= # defined
@@ -19,6 +21,7 @@ USE_X11= YES
USE_PKGINSTALL= YES
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+INSTALLATION_DIRS= bin lib/X11/config
# FONT_PROGS are symlinked from ${X11BASE}/bin to ${PREFIX}/bin to allow
# ${PREFIX}/bin/${prog} to always work.
diff --git a/pkgtools/xpkgwedge/PLIST b/pkgtools/xpkgwedge/PLIST
index cff345a9b0d..afec216fda7 100644
--- a/pkgtools/xpkgwedge/PLIST
+++ b/pkgtools/xpkgwedge/PLIST
@@ -1,6 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2003/09/19 09:43:07 wiz Exp $
-bin/bdftopcf
-bin/fstobdf
-bin/mkfontdir
+@comment $NetBSD: PLIST,v 1.4 2003/11/23 06:46:54 jlam Exp $
bin/pkgxmkmf
lib/X11/config/xpkgwedge.def