From e12ecdbd708365848e04bc672888e189a6d97a6c Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Tue, 17 Feb 2004 12:40:01 +0000
Subject: Move the install script from files/install.tmpl to INSTALL, as we
 usually do.

---
 x11/gnome2-applets/INSTALL            | 13 +++++++++++++
 x11/gnome2-applets/Makefile           |  7 +++++--
 x11/gnome2-applets/files/install.tmpl | 13 -------------
 3 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 x11/gnome2-applets/INSTALL
 delete mode 100644 x11/gnome2-applets/files/install.tmpl

(limited to 'x11')

diff --git a/x11/gnome2-applets/INSTALL b/x11/gnome2-applets/INSTALL
new file mode 100644
index 00000000000..52d2605b158
--- /dev/null
+++ b/x11/gnome2-applets/INSTALL
@@ -0,0 +1,13 @@
+# $NetBSD: INSTALL,v 1.1 2004/02/17 12:40:01 jmmv Exp $
+#
+# Set default list of macros.
+#
+
+case ${STAGE} in
+POST-INSTALL)
+	GCONF_CONFIG_SOURCE="${GCONF2_CONFIG_SOURCE}" \
+		${LOCALBASE}/libexec/gnome-applets/mc-install-default-macros
+	;;
+*)
+	;;
+esac
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 1b023336956..c99743ca95a 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/14 21:26:46 minskim Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/17 12:40:01 jmmv Exp $
 #
 
 DISTNAME=		gnome-applets-2.4.2
@@ -61,7 +61,10 @@ PLIST_SUBST+=		BATTSTAT="@comment "
 .endif
 
 .include "../../devel/GConf2/schemas.mk"
-INSTALL_EXTRA_TMPL+=	${FILESDIR}/install.tmpl
+
+# This must come after GConf2's schemas.mk because it will modify default
+# values for keys created during the registration of .schemas files.
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome2-applets/files/install.tmpl b/x11/gnome2-applets/files/install.tmpl
deleted file mode 100644
index f78ec5e42cb..00000000000
--- a/x11/gnome2-applets/files/install.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: install.tmpl,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
-#
-# Set default list of macros.
-#
-
-case ${STAGE} in
-POST-INSTALL)
-	GCONF_CONFIG_SOURCE="${GCONF2_CONFIG_SOURCE}" \
-		${LOCALBASE}/libexec/gnome-applets/mc-install-default-macros
-	;;
-*)
-	;;
-esac
-- 
cgit v1.2.3