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. --- sysutils/xcdroast/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sysutils/xcdroast') diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index 92b6aa9dc36..ff24313a740 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2006/03/09 21:04:45 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2006/03/14 01:14:34 jlam Exp $ DISTNAME= xcdroast-${DIST_VER} PKGNAME= xcdroast-${DIST_VER:S/alpha/a/} @@ -35,8 +35,6 @@ DOCFILES= DOCUMENTATION FAQ README.nonroot manual/xcdroast-manual.pdf HTMLDIR= ${PREFIX}/share/doc/html/xcdroast CONF_FILES= /dev/null ${PKG_SYSCONFDIR}/xcdroast.conf -INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL - pre-build: cd ${WRKSRC}/src; for file in io.c wavplay.c; do \ ${SED} -e "s|@DEVOSSAUDIO@|${DEVOSSAUDIO}|g" \ -- cgit v1.2.3