summaryrefslogtreecommitdiff
path: root/net/tor
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-14 01:14:26 +0000
committerjlam <jlam@pkgsrc.org>2006-03-14 01:14:26 +0000
commitdaad0f3d6ce8b344ce91e35e98ea05abf8e03f2d (patch)
tree2d76c0a00d07e0939789aa971b834f332c4820c3 /net/tor
parentb1472309671a67b16cab03410ae83bb9d6007baa (diff)
downloadpkgsrc-daad0f3d6ce8b344ce91e35e98ea05abf8e03f2d.tar.gz
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.
Diffstat (limited to 'net/tor')
-rw-r--r--net/tor/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 09245b12ec8..2357decf8f8 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/23 03:39:25 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:31 jlam Exp $
#
DISTNAME= tor-0.1.0.17
@@ -34,8 +34,6 @@ CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \
RCD_SCRIPT= tor
-INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
-
FILES_SUBST+= PKG_HOME=${PKG_HOME:Q}
FILES_SUBST+= TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q}