Modify the pkginstall framework so that it manages all aspects of

INSTALL/DEINSTALL script creation within pkgsrc.

If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts.  If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:

	INSTALL_SRC=	${PKGDIR}/INSTALL
	DEINSTALL_SRC=	# emtpy

As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts.  By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).

In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework.  The only public variables relating to the templates are:

	INSTALL_SRC		INSTALL_TEMPLATE
	DEINSTALL_SRC		DEINSTALL_TEMPLATE
				HEADER_TEMPLATE

The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.

6 files changed, 15 insertions, 11 deletions

diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index a5ea82452e2..1b79238ced3 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/02/05 23:09:14 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2006/03/14 01:14:28 jlam Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
@@ -20,6 +20,8 @@ DIST_SUBDIR=		${PKGNAME_NOREV}-20050216-2
 WRKSRC=			${WRKDIR}
 USE_TOOLS+=		bison lex
 MAKE_ENV+=		YACC=${TOOLS_CMDLINE_YACC:Q}
+DEINSTALL_SRC=		${PKGDIR}/DEINSTALL
+INSTALL_SRC=		# empty
 
 LIBS.SunOS+=		-lm
 
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 0279d65f0f0..fad61af87b8 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/03/06 00:18:16 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2006/03/14 01:14:29 jlam Exp $
 
 DISTNAME=		gnome-games-2.12.3
 PKGREVISION=		1
@@ -22,8 +22,6 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_MSGFMT_PLURALS=	yes
 
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
diff --git a/games/ivan/Makefile b/games/ivan/Makefile
index 756c49647a4..0cbfdcfdb98 100644
--- a/games/ivan/Makefile
+++ b/games/ivan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:09:16 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/14 01:14:29 jlam Exp $
 #
 
 DISTNAME=		ivan-0.50
@@ -13,9 +13,11 @@ COMMENT=		Graphical roguelike featuring deep gameplay
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
-
 CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/share
 
+DEINSTALL_SRC=		${PKGDIR}/DEINSTALL
+INSTALL_SRC=		# empty
+
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/tetrinetx/Makefile b/games/tetrinetx/Makefile
index b90afc8cf90..3ea2b62dc9d 100644
--- a/games/tetrinetx/Makefile
+++ b/games/tetrinetx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/02/14 17:03:54 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2006/03/14 01:14:29 jlam Exp $
 
 DISTNAME=	tetrinetx-1.13.16+qirc-1.40c
 PKGNAME=	tetrinetx-1.13.16
@@ -13,6 +13,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 SHAREDIR=	${PREFIX}/share/tetrinetx
 BINARY=		tetrix.netbsd
 RCD_SCRIPTS=	tetrinetx
+DEINSTALL_SRC=	${PKGDIR}/DEINSTALL
+INSTALL_SRC=	# empty
 
 LIBS.SunOS+=	-lsocket -lnsl -lresolv
 
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index 8251bbbf158..5191a85e0a5 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:25 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/14 01:14:29 jlam Exp $
 
 DISTNAME=		xmris.4.0.5
 PKGNAME=		xmris-4.05
@@ -14,8 +14,6 @@ COMMENT=		Version of the Mr Do video arcade game for X
 USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
 
-DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
-
 post-patch:
 	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile-pre
 	@${SED} -e 's@XXXVARBASEXXX@${VARBASE}@g'	\
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index 69992b2633d..4a153b7683e 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/09 21:04:44 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:29 jlam Exp $
 #
 
 DISTNAME=	xscavenger-1.4.4
@@ -17,6 +17,8 @@ USE_IMAKE=		yes
 CONFIGURE_DIRS=		src
 BUILD_DIRS=		${CONFIGURE_DIRS}
 NO_INSTALL_MANPAGES=	yes
+DEINSTALL_SRC=		${PKGDIR}/DEINSTALL
+INSTALL_SRC=		# empty
 
 CPPFLAGS+=	-DSOUNDDEV="\"${DEVOSSSOUND}\""