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. --- emulators/suse100_gtk2/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'emulators/suse100_gtk2') diff --git a/emulators/suse100_gtk2/Makefile b/emulators/suse100_gtk2/Makefile index 07beecbd236..edcfa0ed360 100644 --- a/emulators/suse100_gtk2/Makefile +++ b/emulators/suse100_gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/03/09 20:38:51 tonio Exp $ +# $NetBSD: Makefile,v 1.2 2006/03/14 01:14:28 jlam Exp $ DISTNAME= suse_gtk2-${SUSE_VERSION} CATEGORIES= emulators @@ -23,7 +23,6 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC # Initialize gtk/pango modules. FILES_SUBST+= EMULDIR=${EMULDIR:Q} PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q} -INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL .if exists(Makefile.${MACHINE_ARCH}) .include "Makefile.${MACHINE_ARCH}" -- cgit v1.2.3