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. --- databases/mysql5-server/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'databases/mysql5-server') diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile index f3c1f726501..c7c2819899c 100644 --- a/databases/mysql5-server/Makefile +++ b/databases/mysql5-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:32 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/03/14 01:14:27 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -18,8 +18,6 @@ CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER:Q} PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pthreads -DEINSTALL_EXTRA_TMPL= ${.CURDIR}/DEINSTALL - PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL_DATADIR}:${SH} PKG_GROUPS= ${MYSQL_GROUP} RCD_SCRIPTS= mysqld -- cgit v1.2.3