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.
---
 ham/dpbox/Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'ham')

diff --git a/ham/dpbox/Makefile b/ham/dpbox/Makefile
index 9a8c7d4b0c8..689971eddc7 100644
--- a/ham/dpbox/Makefile
+++ b/ham/dpbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:41 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/14 01:14:29 jlam Exp $
 #
 
 DISTNAME=	dpbox-60000
@@ -21,14 +21,13 @@ MAKE_ENV+=	prefix=${PREFIX:Q}
 
 DPBOX_CONF_DIR=	${PREFIX}/share/dpbox/conf
 DPBOX_SPOOL_DIR=/var/spool/dpbox
-DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
+FILES_SUBST+=	DPBOX_CONF_DIR=${DPBOX_CONF_DIR}			\
+		DPBOX_SPOOL_DIR=${DPBOX_SPOOL_DIR}
+DEINSTALL_SRC=	${PKGDIR}/DEINSTALL
+INSTALL_SRC=	# empty
 
 post-build:
-	@cd ${PKGDIR}; \
-	${SED} -e 's#@DPBOX_CONF_DIR@#${DPBOX_CONF_DIR}#g' \
-	       -e 's#@DPBOX_SPOOL_DIR@#${DPBOX_SPOOL_DIR}#g' \
-	       < DEINSTALL > ${WRKDIR}/DEINSTALL; \
 	${SED} -e 's#@prefix@#${PREFIX}#g' \
-	       < ${FILESDIR}/dpbox.ini > ${WRKDIR}/dpbox-6.00.00/dpbox.ini
+		< ${FILESDIR}/dpbox.ini > ${WRKDIR}/dpbox-6.00.00/dpbox.ini
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3