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.

10 files changed, 47 insertions, 41 deletions

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