From 6bd0765af7e172f63338e1591991ae18424e7d39 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 14 Mar 2006 01:14:26 +0000
Subject: 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.
---
 www/htdig/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'www/htdig')

diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index a6646e049e3..5973f08e32d 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/04 21:30:58 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/03/14 01:14:34 jlam Exp $
 
 DISTNAME=	htdig-3.1.6
 PKGREVISION=	3
@@ -30,7 +30,6 @@ CONFIGURE_ENV+=	PDF_PARSER="${LOCALBASE}/bin/acroread"
 CXXFLAGS+=	-Wno-deprecated
 CPPFLAGS+=	${CXXFLAGS}
 
-INSTALL_EXTRA_TMPL=     ${PKGDIR}/INSTALL
 PKG_SYSCONFSUBDIR=	htdig
 
 DBDIR?=		${VARBASE}/db/htdig
-- 
cgit v1.2.3