[pkgsrc/trunk]: pkgsrc/pkgtools/xpkgwedge Update the host.def file during vie...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3581dbbfad1f
branches:  trunk
changeset: 463654:3581dbbfad1f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Nov 23 06:46:54 2003 +0000

description:
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:

 pkgtools/xpkgwedge/DEINSTALL |  16 ++++++++++++++--
 pkgtools/xpkgwedge/INSTALL   |   4 +++-
 pkgtools/xpkgwedge/Makefile  |   5 ++++-
 pkgtools/xpkgwedge/PLIST     |   5 +----
 4 files changed, 22 insertions(+), 8 deletions(-)

diffs (93 lines):

diff -r fb2b4ce7160c -r 3581dbbfad1f pkgtools/xpkgwedge/DEINSTALL
--- a/pkgtools/xpkgwedge/DEINSTALL      Sun Nov 23 06:06:02 2003 +0000
+++ b/pkgtools/xpkgwedge/DEINSTALL      Sun Nov 23 06:46:54 2003 +0000
@@ -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 @@
 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 @@
                ;;
        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 -r fb2b4ce7160c -r 3581dbbfad1f pkgtools/xpkgwedge/INSTALL
--- a/pkgtools/xpkgwedge/INSTALL        Sun Nov 23 06:06:02 2003 +0000
+++ b/pkgtools/xpkgwedge/INSTALL        Sun Nov 23 06:46:54 2003 +0000
@@ -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 @@
                                ${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 -r fb2b4ce7160c -r 3581dbbfad1f pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Sun Nov 23 06:06:02 2003 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Sun Nov 23 06:46:54 2003 +0000
@@ -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 @@
 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_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 -r fb2b4ce7160c -r 3581dbbfad1f pkgtools/xpkgwedge/PLIST
--- a/pkgtools/xpkgwedge/PLIST  Sun Nov 23 06:06:02 2003 +0000
+++ b/pkgtools/xpkgwedge/PLIST  Sun Nov 23 06:46:54 2003 +0000
@@ -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