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.

4 files changed, 6 insertions, 12 deletions

diff --git a/devel/GConf2/schemas.mk b/devel/GConf2/schemas.mk
index 9489cc8fff3..e504f5fcf29 100644
--- a/devel/GConf2/schemas.mk
+++ b/devel/GConf2/schemas.mk
@@ -1,4 +1,4 @@
-# $NetBSD: schemas.mk,v 1.13 2005/12/29 06:21:36 jlam Exp $
+# $NetBSD: schemas.mk,v 1.14 2006/03/14 01:14:27 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GConf2 schema files.  It takes care of registering them in the GConf2
@@ -47,8 +47,8 @@ FILES_SUBST+=		GCONF2_CONFIG_SOURCE=${GCONF2_CONFIG_SOURCE:Q}
 FILES_SUBST+=		GCONF2_ENTRIES=${GCONF2_ENTRIES:Q}
 FILES_SUBST+=		GCONF2_SCHEMAS=${GCONF2_SCHEMAS:Q}
 FILES_SUBST+=		GCONF2_SCHEMAS_DIR=${GCONF2_SCHEMAS_DIR:Q}
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../devel/GConf2/files/install.tmpl
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl
+INSTALL_TEMPLATE+=	${.CURDIR}/../../devel/GConf2/files/install.tmpl
+DEINSTALL_TEMPLATE+=	${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl
 .endif
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/gconf$$/ { next; }
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index c72f0e29361..5e8b4adc510 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/03/04 21:29:16 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:27 jlam Exp $
 #
 
 DISTNAME=	isect-1.6.2
@@ -17,8 +17,6 @@ INFO_FILES=		isect.info
 
 RCD_SCRIPTS=	isect
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 DOCDIR=		${PREFIX}/share/doc/isect
 EGDIR=		${PREFIX}/share/examples/isect
 
diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install
index efef8ad2957..c70babdd8dd 100644
--- a/devel/rt3/Makefile.install
+++ b/devel/rt3/Makefile.install
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.install,v 1.2 2005/12/05 20:50:07 rillig Exp $
+# $NetBSD: Makefile.install,v 1.3 2006/03/14 01:14:27 jlam Exp $
 
 RT_SHARE_DIR=		${PREFIX}/share/rt3
 RT_EXAMPLE_DIR= 	${PREFIX}/share/examples/rt3
@@ -38,7 +38,6 @@ CONF_FILES_PERMS+=	${RT_EXAMPLE_DIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
 ${ROOT_USER} ${RT_GROUP} 0500
 .endfor
 
-INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
 FILES_SUBST+=		RTVARDIR=${RT_VAR_DIR:Q} RTLOCALDIR=${RT_LOCAL_DIR:Q}
 FILES_SUBST+=		WEBUSER=${APACHE_USER:Q} WEBGROUP=${APACHE_GROUP:Q}
 
diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 675bc609e9d..d152acfdb2d 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/14 01:14:27 jlam Exp $
 
 DISTNAME=	w32api-2.5-src
 PKGNAME=	w32api-2.5
@@ -22,9 +22,6 @@ CRTWRKSRC=	${WRKDIR}/pe-crt-1.2.1
 PE_CPPFLAGS+=	-I${WRKSRC}/include
 MAKE_FLAGS+=	PE_CPPFLAGS=${PE_CPPFLAGS:Q}
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 # Building no import libraries but two static libraries.
 do-build:
 	cd ${WRKSRC}/lib \