From daad0f3d6ce8b344ce91e35e98ea05abf8e03f2d 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. --- parallel/glunix/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'parallel') diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile index 032bff1010f..44b04d1cc0b 100644 --- a/parallel/glunix/Makefile +++ b/parallel/glunix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/02/05 23:10:34 joerg Exp $ +# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:32 jlam Exp $ DISTNAME= glunix-release-1-0a PKGNAME= glunix-1.0a @@ -43,6 +43,9 @@ USER_CMD= ${LOCALBASE}/sbin/user GROUP_CMD= ${LOCALBASE}/sbin/group .endif +DEINSTALL_SRC= ${PKGDIR}/DEINSTALL +INSTALL_SRC= ${PKGDIR}/INSTALL + post-patch: cd ${WRKSRC}; \ for f in progs/glupart/glupart.c \ -- cgit v1.2.3