From 6bd0765af7e172f63338e1591991ae18424e7d39 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. --- pkgtools/libkver/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkgtools/libkver') diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile index d405714dd2b..5bccf71e6db 100644 --- a/pkgtools/libkver/Makefile +++ b/pkgtools/libkver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:27 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2006/03/14 01:14:32 jlam Exp $ DISTNAME= libkver-${VERSION} CATEGORIES= pkgtools @@ -34,9 +34,6 @@ PLIST_SUBST+= HAS_SYSCTL="@comment " FILES_SUBST+= HAS_SYSCTL=false .endif -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL - INSTALLATION_DIRS+= lib man/man3 man/cat3 .if empty(LDD_SYSCTL:M*libc*) INSTALLATION_DIRS+= sbin -- cgit v1.2.3