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, 11 deletions

diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 2a0ee0de302..ba7af5e5c84 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:26 jlam Exp $
 
 DISTNAME=		gqmpeg-0.91.1
 PKGREVISION=		4
@@ -23,8 +23,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		GNOME_DATADIR=${PREFIX}/share
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index afe8107fa84..4116e9a46aa 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: Makefile,v 1.89 2006/03/14 01:14:26 jlam Exp $
 
 DISTNAME=		gqmpeg-0.20.0
 PKGREVISION=		9
@@ -19,8 +19,6 @@ USE_DIRS+=		xdg-1.2
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--without-included-gettext
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 61ff9f37f24..0ffb0c03bb8 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2006/03/14 01:14:26 jlam Exp $
 
 DISTNAME=	xmcd-3.0.2
 PKGREVISION=    9
@@ -15,9 +15,6 @@ PATCH_DIST_STRIP=	-p1
 
 WRKSRC=			${WRKDIR}/xmcd-3.0
 
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
-
 USE_IMAKE=		yes
 MAKE_ENV+=		BATCH_BINDIR=${PREFIX}/bin
 MAKE_ENV+=		BATCH_LIBDIR=${PREFIX}/lib/X11
diff --git a/audio/xmms-meta-input/Makefile b/audio/xmms-meta-input/Makefile
index cf229d48c77..3f9f90f2892 100644
--- a/audio/xmms-meta-input/Makefile
+++ b/audio/xmms-meta-input/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:18 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/14 01:14:26 jlam Exp $
 #
 
 DISTNAME=		xmms-meta-input-0.4
@@ -11,6 +11,8 @@ HOMEPAGE=		http://www.corbac.com/page3.html
 COMMENT=		XMMS plugin wrapper for shell scripts
 
 INSTALLATION_DIRS=	lib/xmms/Input
+DEINSTALL_SRC=		${PKGDIR}/DEINSTALL
+INSTALL_SRC=		# empty
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libmetainput.so ${PREFIX}/lib/xmms/Input