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.
---
 sysutils/desktop-file-utils/DEINSTALL | 9 +++++++++
 sysutils/desktop-file-utils/INSTALL   | 5 +----
 sysutils/desktop-file-utils/Makefile  | 4 +---
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 sysutils/desktop-file-utils/DEINSTALL

(limited to 'sysutils/desktop-file-utils')

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"
 
-- 
cgit v1.2.3