From 98574fa1445ba3682dffba92eee4328eb1772082 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 15 Jun 2006 20:40:15 +0000
Subject: Split out deinstall portions of INSTALL scripts into DEINSTALL
 scripts. This avoids the need for a confusing line of the form:

	DEINSTALL_TEMPLATE+=	path/to/INSTALL

in the package Makefile, and actually removes the need to specify it
altogether since by convention, the existence of the DEINSTALL script
is enough to add it to DEINSTALL_TEMPLATE.
---
 databases/shared-mime-info/DEINSTALL  |  9 +++++++++
 databases/shared-mime-info/INSTALL    |  5 +----
 databases/shared-mime-info/Makefile   |  4 +---
 fonts/ghostscript-cidfonts/DEINSTALL  | 18 ++++++++++++++++++
 fonts/ghostscript-cidfonts/INSTALL    | 23 +++++------------------
 fonts/ghostscript-cidfonts/Makefile   |  4 +---
 fonts/ghostscript-cmaps/DEINSTALL     | 18 ++++++++++++++++++
 fonts/ghostscript-cmaps/INSTALL       | 21 ++++-----------------
 fonts/ghostscript-cmaps/Makefile      |  4 +---
 mail/mutt-devel/DEINSTALL             |  7 +++++++
 mail/mutt-devel/INSTALL               |  6 +-----
 mail/mutt-devel/Makefile              |  3 +--
 mail/mutt/DEINSTALL                   |  7 +++++++
 mail/mutt/INSTALL                     |  6 +-----
 mail/mutt/Makefile                    |  3 +--
 misc/openoffice2-bin/DEINSTALL        | 15 +++++++++++++++
 misc/openoffice2-bin/INSTALL          | 20 ++++----------------
 misc/openoffice2-bin/Makefile         |  4 +---
 print/apsfilter/DEINSTALL             | 18 ++++++++++++++++++
 print/apsfilter/INSTALL               | 18 ++----------------
 print/apsfilter/Makefile              |  4 +---
 print/foomatic-filters-cups/DEINSTALL | 10 ++++++++++
 print/foomatic-filters-cups/INSTALL   |  8 +-------
 print/foomatic-filters-cups/Makefile  |  4 +---
 print/foomatic-filters/Makefile       |  4 ++--
 print/foomatic-ppds-cups/DEINSTALL    | 10 ++++++++++
 print/foomatic-ppds-cups/INSTALL      |  8 +-------
 print/foomatic-ppds-cups/Makefile     |  4 +---
 sysutils/desktop-file-utils/DEINSTALL |  9 +++++++++
 sysutils/desktop-file-utils/INSTALL   |  5 +----
 sysutils/desktop-file-utils/Makefile  |  4 +---
 textproc/scrollkeeper/DEINSTALL       |  9 +++++++++
 textproc/scrollkeeper/INSTALL         |  5 +----
 textproc/scrollkeeper/Makefile        |  4 +---
 x11/gtk/DEINSTALL                     | 11 +++++++++++
 x11/gtk/INSTALL                       |  7 +------
 x11/gtk/Makefile                      |  6 +-----
 37 files changed, 178 insertions(+), 147 deletions(-)
 create mode 100644 databases/shared-mime-info/DEINSTALL
 create mode 100644 fonts/ghostscript-cidfonts/DEINSTALL
 create mode 100644 fonts/ghostscript-cmaps/DEINSTALL
 create mode 100644 mail/mutt-devel/DEINSTALL
 create mode 100644 mail/mutt/DEINSTALL
 create mode 100644 misc/openoffice2-bin/DEINSTALL
 create mode 100644 print/apsfilter/DEINSTALL
 create mode 100644 print/foomatic-filters-cups/DEINSTALL
 create mode 100644 print/foomatic-ppds-cups/DEINSTALL
 create mode 100644 sysutils/desktop-file-utils/DEINSTALL
 create mode 100644 textproc/scrollkeeper/DEINSTALL
 create mode 100644 x11/gtk/DEINSTALL

diff --git a/databases/shared-mime-info/DEINSTALL b/databases/shared-mime-info/DEINSTALL
new file mode 100644
index 00000000000..02f5e54120d
--- /dev/null
+++ b/databases/shared-mime-info/DEINSTALL
@@ -0,0 +1,9 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:15 jlam Exp $
+
+MIMEDB_PATH="@MIMEDB_PATH@"
+
+case ${STAGE} in
+POST-DEINSTALL)
+	${RM} -rf ${MIMEDB_PATH}
+	;;
+esac
diff --git a/databases/shared-mime-info/INSTALL b/databases/shared-mime-info/INSTALL
index f339cab5445..307a7ca9217 100644
--- a/databases/shared-mime-info/INSTALL
+++ b/databases/shared-mime-info/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1 2004/08/31 11:43:44 jmmv Exp $
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:15 jlam Exp $
 
 MIMEDB_PATH="@MIMEDB_PATH@"
 UPDATE_MIMEDB="@UPDATE_MIMEDB@"
@@ -7,7 +7,4 @@ case ${STAGE} in
 POST-INSTALL)
 	${UPDATE_MIMEDB} ${MIMEDB_PATH} >/dev/null
 	;;
-POST-DEINSTALL)
-	${RM} -rf ${MIMEDB_PATH}
-	;;
 esac
diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
index 99400a6974f..b0fbad32302 100644
--- a/databases/shared-mime-info/Makefile
+++ b/databases/shared-mime-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/08 09:56:43 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/06/15 20:40:15 jlam Exp $
 #
 
 DISTNAME=	shared-mime-info-0.17
@@ -28,8 +28,6 @@ CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 CFLAGS+=		-c99
 .endif
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-
 FILES_SUBST+=		MIMEDB_PATH="${PREFIX}/share/mime"
 FILES_SUBST+=		UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database"
 
diff --git a/fonts/ghostscript-cidfonts/DEINSTALL b/fonts/ghostscript-cidfonts/DEINSTALL
new file mode 100644
index 00000000000..28c6a69ac56
--- /dev/null
+++ b/fonts/ghostscript-cidfonts/DEINSTALL
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:15 jlam Exp $
+
+ADOBE_RESOURCEDIR="@ADOBE_RESOURCEDIR@"
+GS_RESOURCEDIR="@GS_RESOURCEDIR@"
+PKG_INFO="@PKG_INFO@"
+
+case ${STAGE} in
+DEINSTALL)
+	${PKG_INFO} -qL adobe-cidfonts | ${GREP} "/Resource/CIDFont/" |
+	while read src; do
+		base=`${BASENAME} $src`
+		dest="${GS_RESOURCEDIR}/CIDFont/$base"
+		${RM} -f $dest
+	done
+	;;
+esac
diff --git a/fonts/ghostscript-cidfonts/INSTALL b/fonts/ghostscript-cidfonts/INSTALL
index b4150270d6c..b03909424d2 100644
--- a/fonts/ghostscript-cidfonts/INSTALL
+++ b/fonts/ghostscript-cidfonts/INSTALL
@@ -1,32 +1,19 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1.1.1 2002/09/13 22:35:01 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:15 jlam Exp $
 
 ADOBE_RESOURCEDIR="@ADOBE_RESOURCEDIR@"
 GS_RESOURCEDIR="@GS_RESOURCEDIR@"
 PKG_INFO="@PKG_INFO@"
 
-FONTFILES=`								\
-	${PKG_INFO} -f adobe-cidfonts |					\
-	${AWK} '/File:.*\/Resource\/CIDFont\// { print $2 }'		\
-`
-
 case ${STAGE} in
 POST-INSTALL)
-	for file in ${FONTFILES}; do
-		base=`${BASENAME} $file`
-		dest="${GS_RESOURCEDIR}/CIDFont/$base"
-		src="../../../../$file"
-		${RM} -f $dest
-		${LN} -sf $src $dest
-	done
-	;;
-
-DEINSTALL)
-	for file in ${FONTFILES}; do
-		base=`${BASENAME} $file`
+	${PKG_INFO} -qL adobe-cidfonts | ${GREP} "/Resource/CIDFont/" |
+	while read src; do
+		base=`${BASENAME} $src`
 		dest="${GS_RESOURCEDIR}/CIDFont/$base"
 		${RM} -f $dest
+		${LN} -fs $src $dest
 	done
 	;;
 esac
diff --git a/fonts/ghostscript-cidfonts/Makefile b/fonts/ghostscript-cidfonts/Makefile
index cbb5e6f69eb..48bbf579412 100644
--- a/fonts/ghostscript-cidfonts/Makefile
+++ b/fonts/ghostscript-cidfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:28 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/06/15 20:40:15 jlam Exp $
 
 DISTNAME=	ghostscript-cidfonts-20000901
 PKGREVISION=	2
@@ -21,8 +21,6 @@ NO_CONFIGURE=		yes
 NO_BUILD=		yes
 USE_TOOLS+=		gs:run
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-
 FILES_SUBST+=		ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q}
 FILES_SUBST+=		GS_RESOURCEDIR=${GS_RESOURCEDIR:Q}
 FILES_SUBST+=		PKG_INFO=${PKG_INFO:Q}
diff --git a/fonts/ghostscript-cmaps/DEINSTALL b/fonts/ghostscript-cmaps/DEINSTALL
new file mode 100644
index 00000000000..153f73d96a8
--- /dev/null
+++ b/fonts/ghostscript-cmaps/DEINSTALL
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:15 jlam Exp $
+
+ADOBE_RESOURCEDIR="@ADOBE_RESOURCEDIR@"
+GS_RESOURCEDIR="@GS_RESOURCEDIR@"
+PKG_INFO="@PKG_INFO@"
+
+case ${STAGE} in
+DEINSTALL)
+	${PKG_INFO} -qL adobe-cmaps | ${GREP} "/Resource/CMap/" |
+	while read src; do
+		base=`${BASENAME} $src`
+		dest="${GS_RESOURCEDIR}/CMap/$base"
+		${RM} -f $dest
+	done
+	;;
+esac
diff --git a/fonts/ghostscript-cmaps/INSTALL b/fonts/ghostscript-cmaps/INSTALL
index aca4e99dc24..6e54273bd10 100644
--- a/fonts/ghostscript-cmaps/INSTALL
+++ b/fonts/ghostscript-cmaps/INSTALL
@@ -1,32 +1,19 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2002/09/13 22:38:33 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2006/06/15 20:40:15 jlam Exp $
 
 ADOBE_RESOURCEDIR="@ADOBE_RESOURCEDIR@"
 GS_RESOURCEDIR="@GS_RESOURCEDIR@"
 PKG_INFO="@PKG_INFO@"
 
-FONTFILES=`								\
-	${PKG_INFO} -f adobe-cmaps |					\
-	${AWK} '/File:.*\/Resource\/CMap\// { print $2 }'		\
-`
-
 case ${STAGE} in
 POST-INSTALL)
-	for file in ${FONTFILES}; do
-		base=`${BASENAME} $file`
+	${PKG_INFO} -qL adobe-cmaps | ${GREP} "/Resource/CMap/" |
+	while read src; do
+		base=`${BASENAME} $src`
 		dest="${GS_RESOURCEDIR}/CMap/$base"
-		src="../../../../$file"
 		${RM} -f $dest
 		${LN} -sf $src $dest
 	done
 	;;
-
-DEINSTALL)
-	for file in ${FONTFILES}; do
-		base=`${BASENAME} $file`
-		dest="${GS_RESOURCEDIR}/CMap/$base"
-		${RM} -f $dest
-	done
-	;;
 esac
diff --git a/fonts/ghostscript-cmaps/Makefile b/fonts/ghostscript-cmaps/Makefile
index e6622759d5f..e114ce75a08 100644
--- a/fonts/ghostscript-cmaps/Makefile
+++ b/fonts/ghostscript-cmaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:28 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/06/15 20:40:15 jlam Exp $
 
 DISTNAME=	ghostscript-cmaps-20020913
 PKGREVISION=	2
@@ -21,8 +21,6 @@ USE_TOOLS+=		gs:run
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-
 FILES_SUBST+=		ADOBE_RESOURCEDIR=${ADOBE_RESOURCEDIR:Q}
 FILES_SUBST+=		GS_RESOURCEDIR=${GS_RESOURCEDIR:Q}
 FILES_SUBST+=		PKG_INFO=${PKG_INFO:Q}
diff --git a/mail/mutt-devel/DEINSTALL b/mail/mutt-devel/DEINSTALL
new file mode 100644
index 00000000000..37c6800c5a5
--- /dev/null
+++ b/mail/mutt-devel/DEINSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -f @DOCDIR@/samples
+	;;
+esac
diff --git a/mail/mutt-devel/INSTALL b/mail/mutt-devel/INSTALL
index 2b586fde291..ce15b7d4513 100644
--- a/mail/mutt-devel/INSTALL
+++ b/mail/mutt-devel/INSTALL
@@ -1,12 +1,8 @@
-# $NetBSD: INSTALL,v 1.3 2004/07/21 22:37:10 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2006/06/15 20:40:16 jlam Exp $
 
 case ${STAGE} in
 POST-INSTALL)
 	${RM} -f @DOCDIR@/samples
 	${LN} -sf ../../examples/mutt @DOCDIR@/samples
 	;;
-
-DEINSTALL)
-	${RM} -f @DOCDIR@/samples
-	;;
 esac
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 2f8a87c45ac..5cc8e01a9e8 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/13 18:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2006/06/15 20:40:16 jlam Exp $
 
 DISTNAME=		mutt-1.5.11
 PKGREVISION=		4
@@ -44,7 +44,6 @@ CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 
 LDFLAGS+=		${_STRIPFLAG_CC}
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 DOCDIR=			${PREFIX}/share/doc/mutt
 EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
diff --git a/mail/mutt/DEINSTALL b/mail/mutt/DEINSTALL
new file mode 100644
index 00000000000..37c6800c5a5
--- /dev/null
+++ b/mail/mutt/DEINSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -f @DOCDIR@/samples
+	;;
+esac
diff --git a/mail/mutt/INSTALL b/mail/mutt/INSTALL
index cba0b055973..ce15b7d4513 100644
--- a/mail/mutt/INSTALL
+++ b/mail/mutt/INSTALL
@@ -1,12 +1,8 @@
-# $NetBSD: INSTALL,v 1.3 2004/08/05 07:19:25 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2006/06/15 20:40:16 jlam Exp $
 
 case ${STAGE} in
 POST-INSTALL)
 	${RM} -f @DOCDIR@/samples
 	${LN} -sf ../../examples/mutt @DOCDIR@/samples
 	;;
-
-DEINSTALL)
-	${RM} -f @DOCDIR@/samples
-	;;
 esac
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index d36c499eade..234b4b9f45b 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2006/05/22 07:00:55 rillig Exp $
+# $NetBSD: Makefile,v 1.141 2006/06/15 20:40:16 jlam Exp $
 
 DISTNAME=		mutt-1.4.2.1i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -71,7 +71,6 @@ CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 
 LDFLAGS+=		${_STRIPFLAG_CC}
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 DOCDIR=			${PREFIX}/share/doc/mutt
 EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
diff --git a/misc/openoffice2-bin/DEINSTALL b/misc/openoffice2-bin/DEINSTALL
new file mode 100644
index 00000000000..f28fe9f7268
--- /dev/null
+++ b/misc/openoffice2-bin/DEINSTALL
@@ -0,0 +1,15 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $
+#
+# This file contains the contents of the OOo rpm pre-uninstall,
+# post-uninstall scripts.
+
+PRODUCTINSTALLLOCATION=${PKG_PREFIX}/openoffice.org@VER@
+
+case ${STAGE} in
+DEINSTALL)
+	if [ -h $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ]
+	then
+	  ${RM} $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1
+	fi
+	;;
+esac
diff --git a/misc/openoffice2-bin/INSTALL b/misc/openoffice2-bin/INSTALL
index dfb1fb35187..067ac40aae9 100644
--- a/misc/openoffice2-bin/INSTALL
+++ b/misc/openoffice2-bin/INSTALL
@@ -1,15 +1,11 @@
-# $NetBSD: INSTALL,v 1.2 2006/01/04 15:29:41 ghen Exp $
-
-# This file contains the contents of the OOo rpm 
-# pre-install, post-install, pre-uninstall and post-uninstall scripts
+# $NetBSD: INSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
+#
+# This file contains the contents of the OOo rpm pre-install, post-install
+# scripts.
 
 PRODUCTINSTALLLOCATION=${PKG_PREFIX}/openoffice.org@VER@
 
 case ${STAGE} in
-PRE-INSTALL)
-	# nothing to do
-	;;
-
 POST-INSTALL)
 	if [ ! -f $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ]
 	then
@@ -19,12 +15,4 @@ POST-INSTALL)
 	  fi
 	fi
 	;;
-
-DEINSTALL)
-	if [ -h $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ]
-	then
-	  ${RM} $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1
-	fi
-	;;
-
 esac
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index 95f3d850057..eb5c24a5fa1 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/05/22 22:22:04 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/06/15 20:40:16 jlam Exp $
 
 PKGNAME=		openoffice-bin-2.0.2
 CATEGORIES=		misc
@@ -42,8 +42,6 @@ PLIST_SRC+=		${WRKDIR}/PLIST
 #
 ARCH=	${MACHINE_ARCH:C/i[3-6]86/i386/g}
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-
 .if ${OPSYS} == "NetBSD"
 .  if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 .    if !exists(/emul/svr4/usr/lib/ld.so)
diff --git a/print/apsfilter/DEINSTALL b/print/apsfilter/DEINSTALL
new file mode 100644
index 00000000000..9193e158d26
--- /dev/null
+++ b/print/apsfilter/DEINSTALL
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} ${PKG_SYSCONFDIR}/basedir
+
+	${CAT} << EOF
+===========================================================================
+If you will not be using apsfilter any longer, you may want to remove
+apsfilter's configuration directory (${PKG_SYSCONFDIR}) and the
+SETUP.cfg configuration file from apsfilter's directory
+(${PKG_PREFIX}/share/apsfilter/SETUP.cfg).
+===========================================================================
+EOF
+	;;
+esac
diff --git a/print/apsfilter/INSTALL b/print/apsfilter/INSTALL
index 49e95e50432..5eb01ded6ba 100644
--- a/print/apsfilter/INSTALL
+++ b/print/apsfilter/INSTALL
@@ -1,23 +1,9 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2002/11/26 11:26:32 jmmv Exp $
-
-PREFIX="@PREFIX@"
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:16 jlam Exp $
 
 case ${STAGE} in
 POST-INSTALL)
-	${LN} -s ${PREFIX}/share/apsfilter ${PKG_SYSCONFDIR}/basedir
-	;;
-DEINSTALL)
-	${RM} ${PKG_SYSCONFDIR}/basedir
-
-	cat << EOF
-===========================================================================
-If you will not be using apsfilter any longer, you may want to remove
-apsfilter's configuration directory (${PKG_SYSCONFDIR}) and the
-SETUP.cfg configuration file from apsfilter's directory
-(${PREFIX}/share/apsfilter/SETUP.cfg).
-===========================================================================
-EOF
+	${LN} -s ${PKG_PREFIX}/share/apsfilter ${PKG_SYSCONFDIR}/basedir
 	;;
 esac
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 61244a669f5..016388b0a62 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/06/15 20:40:16 jlam Exp $
 #
 
 DISTNAME=	apsfilter-7.2.6
@@ -32,8 +32,6 @@ PKG_SYSCONFSUBDIR?=	apsfilter
 CONF_FILES=	${PREFIX}/share/apsfilter/template/apsfilterrc \
 		${PKG_SYSCONFDIR}/apsfilterrc
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-
 post-patch:
 	for i in bin/apsfilter.in SETUP.in tools/prtmgmt; do		\
 		${SED} "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/$$i	\
diff --git a/print/foomatic-filters-cups/DEINSTALL b/print/foomatic-filters-cups/DEINSTALL
new file mode 100644
index 00000000000..b7b4bf6f3a6
--- /dev/null
+++ b/print/foomatic-filters-cups/DEINSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $
+
+CUPS_FILTERDIR="@CUPS_FILTERDIR@"
+
+case ${STAGE} in
+DEINSTALL)
+	${ECHO} "Removing foomatic-rip filter from CUPS."
+	${RM} -f ${CUPS_FILTERDIR}/foomatic-rip
+	;;
+esac
diff --git a/print/foomatic-filters-cups/INSTALL b/print/foomatic-filters-cups/INSTALL
index df9e9a15583..46293f9233b 100644
--- a/print/foomatic-filters-cups/INSTALL
+++ b/print/foomatic-filters-cups/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2005/12/17 18:26:15 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:16 jlam Exp $
 
 CUPS_FILTERDIR="@CUPS_FILTERDIR@"
 
@@ -8,11 +8,5 @@ POST-INSTALL)
 	${TEST} -f ${CUPS_FILTERDIR}/foomatic-rip ||
 	{ ${ECHO} "Adding foomatic-rip filter to CUPS.";
 	  ${LN} -s ${PKG_PREFIX}/bin/foomatic-rip ${CUPS_FILTERDIR}; }
-	  
-	;;
-
-DEINSTALL)
-	${ECHO} "Removing foomatic-rip filter from CUPS."
-	${RM} -f ${CUPS_FILTERDIR}/foomatic-rip
 	;;
 esac
diff --git a/print/foomatic-filters-cups/Makefile b/print/foomatic-filters-cups/Makefile
index 5a4133f8c3d..b53d88b2d9f 100644
--- a/print/foomatic-filters-cups/Makefile
+++ b/print/foomatic-filters-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/15 20:40:16 jlam Exp $
 
 .include "../../print/foomatic-filters/Makefile.common"
 
@@ -22,8 +22,6 @@ EVAL_PREFIX+=		CUPS_PREFIX=cups
 CUPS_FILTERDIR=		${CUPS_PREFIX:Q}/libexec/cups/filter
 FILES_SUBST+=		CUPS_FILTERDIR=${CUPS_FILTERDIR}
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-
 do-build:	# empty
 do-install:	# empty
 
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index daba1209cfe..5f81c28aa01 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/04 16:26:55 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/06/15 20:40:16 jlam Exp $
 
 .include "Makefile.common"
 
@@ -36,7 +36,7 @@ DEPENDS+=	{cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
 DEPENDS+=	${TEXTTOPS_DEPENDS}:../../print/mpage
 .endif
 
-DEINSTALL_TEMPLATE+=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
+DEINSTALL_TEMPLATE+=	${.CURDIR}/../../print/foomatic-filters-cups/DEINSTALL
 INSTALL_TEMPLATE+=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
 
 EGDIR=		${PREFIX}/share/examples/foomatic
diff --git a/print/foomatic-ppds-cups/DEINSTALL b/print/foomatic-ppds-cups/DEINSTALL
new file mode 100644
index 00000000000..3733be7d0c4
--- /dev/null
+++ b/print/foomatic-ppds-cups/DEINSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $
+
+CUPS_DATADIR="@CUPS_DATADIR@"
+
+case ${STAGE} in
+DEINSTALL)
+	${ECHO} "Removing Foomatic PPDs from CUPS PPD database."
+	${RM} -f ${CUPS_DATADIR}/foomatic-ppds
+	;;
+esac
diff --git a/print/foomatic-ppds-cups/INSTALL b/print/foomatic-ppds-cups/INSTALL
index d964aa0cea1..1b1fd03f8f9 100644
--- a/print/foomatic-ppds-cups/INSTALL
+++ b/print/foomatic-ppds-cups/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2005/12/17 18:41:43 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:16 jlam Exp $
 
 CUPS_DATADIR="@CUPS_DATADIR@"
 
@@ -9,11 +9,5 @@ POST-INSTALL)
 	{ ${ECHO} "Adding Foomatic PPDs to CUPS PPD database.";
 	  ${LN} -fs ${PKG_PREFIX}/share/foomatic/ppd			\
 		${CUPS_DATADIR}/foomatic-ppds; }
-	  
-	;;
-
-DEINSTALL)
-	${ECHO} "Removing Foomatic PPDs from CUPS PPD database."
-	${RM} -f ${CUPS_DATADIR}/foomatic-ppds
 	;;
 esac
diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile
index 56c5f9acb03..5834d16ca23 100644
--- a/print/foomatic-ppds-cups/Makefile
+++ b/print/foomatic-ppds-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/15 20:40:16 jlam Exp $
 
 .include "../../print/foomatic-ppds/Makefile.common"
 
@@ -22,8 +22,6 @@ EVAL_PREFIX+=		CUPS_PREFIX=cups
 CUPS_DATADIR=		${CUPS_PREFIX:Q}/share/cups/model
 FILES_SUBST+=		CUPS_DATADIR=${CUPS_DATADIR}
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-
 do-build:	# empty
 do-install:	# empty
 
diff --git a/sysutils/desktop-file-utils/DEINSTALL b/sysutils/desktop-file-utils/DEINSTALL
new file mode 100644
index 00000000000..2a817c19388
--- /dev/null
+++ b/sysutils/desktop-file-utils/DEINSTALL
@@ -0,0 +1,9 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $
+
+APPLICATIONS_PATH="@APPLICATIONS_PATH@"
+
+case ${STAGE} in
+POST-DEINSTALL)
+	${RM} -f ${APPLICATIONS_PATH}/mimeinfo.cache
+	;;
+esac
diff --git a/sysutils/desktop-file-utils/INSTALL b/sysutils/desktop-file-utils/INSTALL
index 89dda1b58e3..13d69a0e706 100644
--- a/sysutils/desktop-file-utils/INSTALL
+++ b/sysutils/desktop-file-utils/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2004/09/21 17:03:53 jmmv Exp $
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:16 jlam Exp $
 
 APPLICATIONS_PATH="@APPLICATIONS_PATH@"
 UPDATE_DESKTOPDB="@UPDATE_DESKTOPDB@"
@@ -7,7 +7,4 @@ case ${STAGE} in
 POST-INSTALL)
 	${UPDATE_DESKTOPDB} ${APPLICATIONS_PATH}
 	;;
-POST-DEINSTALL)
-	${RM} -f ${APPLICATIONS_PATH}/mimeinfo.cache
-	;;
 esac
diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile
index db1f30440b8..26da1e50856 100644
--- a/sysutils/desktop-file-utils/Makefile
+++ b/sysutils/desktop-file-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/04/28 18:36:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/06/15 20:40:16 jlam Exp $
 #
 
 DISTNAME=	desktop-file-utils-0.11
@@ -18,8 +18,6 @@ USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	EMACS=no
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-
 FILES_SUBST+=		APPLICATIONS_PATH="${PREFIX}/share/applications"
 FILES_SUBST+=		UPDATE_DESKTOPDB="${PREFIX}/bin/update-desktop-database"
 
diff --git a/textproc/scrollkeeper/DEINSTALL b/textproc/scrollkeeper/DEINSTALL
new file mode 100644
index 00000000000..f2a06d32617
--- /dev/null
+++ b/textproc/scrollkeeper/DEINSTALL
@@ -0,0 +1,9 @@
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $
+
+SCROLLKEEPER_DATADIR="@SCROLLKEEPER_DATADIR@"
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -rf ${SCROLLKEEPER_DATADIR}
+	;;
+esac
diff --git a/textproc/scrollkeeper/INSTALL b/textproc/scrollkeeper/INSTALL
index 0e53377b4e3..25fc60a6413 100644
--- a/textproc/scrollkeeper/INSTALL
+++ b/textproc/scrollkeeper/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.2 2004/01/23 16:55:37 jmmv Exp $
+# $NetBSD: INSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
 
 SCROLLKEEPER_REBUILDDB="@SCROLLKEEPER_REBUILDDB@"
 SCROLLKEEPER_DATADIR="@SCROLLKEEPER_DATADIR@"
@@ -11,7 +11,4 @@ POST-INSTALL)
 	${MKDIR} ${SCROLLKEEPER_DATADIR}/db
 	${SCROLLKEEPER_REBUILDDB} -q -p ${SCROLLKEEPER_DATADIR}/db > /dev/null 2>&1
 	;;
-DEINSTALL)
-	${RM} -rf ${SCROLLKEEPER_DATADIR}
-	;;
 esac
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index f0008c3f356..6f3aa91723a 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/06/04 21:09:30 schwarz Exp $
+# $NetBSD: Makefile,v 1.41 2006/06/15 20:40:16 jlam Exp $
 #
 
 DISTNAME=		scrollkeeper-0.3.14
@@ -34,8 +34,6 @@ CONFIGURE_ARGS+=	--with-omfdirs=${PREFIX}/share/omf
 CONFIGURE_ARGS+=	--with-omfdirs=${LOCALBASE}/share/omf:${X11PREFIX}/share/omf
 .endif
 
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-
 SCROLLKEEPER_DATADIR=	${PREFIX}/libdata/scrollkeeper
 SCROLLKEEPER_REBUILDDB=	${PREFIX}/bin/scrollkeeper-rebuilddb
 FILES_SUBST+=		SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q}
diff --git a/x11/gtk/DEINSTALL b/x11/gtk/DEINSTALL
new file mode 100644
index 00000000000..0b1d0a2eb5f
--- /dev/null
+++ b/x11/gtk/DEINSTALL
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	if [ "${PKG_PREFIX}" != "${LOCALBASE}" ]; then
+		${RM} -f ${LOCALBASE}/share/aclocal/gtk.m4
+	fi
+	;;
+esac
diff --git a/x11/gtk/INSTALL b/x11/gtk/INSTALL
index bd87789dd77..db22277df73 100644
--- a/x11/gtk/INSTALL
+++ b/x11/gtk/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2004/01/18 01:11:40 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2006/06/15 20:40:16 jlam Exp $
 
 case ${STAGE} in
 POST-INSTALL)
@@ -9,9 +9,4 @@ POST-INSTALL)
 			${LOCALBASE}/share/aclocal/gtk.m4
 	fi
 	;;
-DEINSTALL)
-	if [ "${PKG_PREFIX}" != "${LOCALBASE}" ]; then
-		${RM} -f ${LOCALBASE}/share/aclocal/gtk.m4
-	fi
-	;;
 esac
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 2674737d727..dfb6aad60b6 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2006/04/29 16:58:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.119 2006/06/15 20:40:16 jlam Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		9
@@ -44,10 +44,6 @@ GTK_MAJOR_VERSION=	${GTK_VERSION:C/\..*//}
 GTK_MINOR_VERSION=	${GTK_VERSION:C/[^.]*\.//:C/\..*//}
 GTK_MICRO_VERSION=	${GTK_VERSION:C/.*\.//}
 
-.if ${PKG_INSTALLATION_TYPE} == "overwrite"
-DEINSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
-.endif
-
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Mmipspro*)
-- 
cgit v1.2.3