From 9112c47201d0e89217f980ba46c1421d911dc5de Mon Sep 17 00:00:00 2001 From: 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. --- news/leafnode/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'news') diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 85e11203a05..d9dfcc0ba90 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/02/05 23:10:33 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/03/14 01:14:31 jlam Exp $ DISTNAME= leafnode-1.11.3.rel PKGNAME= ${DISTNAME:S/.rel//} @@ -14,8 +14,6 @@ COMMENT= NNTP server for small (dialup) sites CONFLICTS+= cyrus-imapd<2.2.10nb2 WRKSRC= ${WRKDIR}/${DISTNAME} -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL LEAFNODE_SPOOL?= /var/spool/leafnode LEAFNODE_LOCKDIR?= /var/spool/lock/leafnode -- cgit v1.2.3