[pkgsrc/trunk]: pkgsrc/net/tor Make this work correctly as a binary package.

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6144033df3f5
branches:  trunk
changeset: 489016:6144033df3f5
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Mon Feb 14 18:51:58 2005 +0000

description:
Make this work correctly as a binary package.
Bump PKGREVISION.

diffstat:

 net/tor/INSTALL  |  15 +++++++++++++++
 net/tor/Makefile |  12 ++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r 0def4d330591 -r 6144033df3f5 net/tor/INSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tor/INSTALL   Mon Feb 14 18:51:58 2005 +0000
@@ -0,0 +1,15 @@
+#!@SH@
+#
+# $NetBSD: INSTALL,v 1.1 2005/02/14 18:51:58 jschauma Exp $
+
+PKG_HOME="@PKG_HOME@"
+TOR_USER="@TOR_USER@"
+TOR_GROUP="@TOR_GROUP@"
+
+case "${STAGE}" in
+PRE-INSTALL)
+    ${MKDIR} ${PKG_SYSCONFDIR}/tor
+    ${MKDIR} -m 0700 ${PKG_HOME}
+    ${CHOWN} ${TOR_USER}:${TOR_GROUP} ${PKG_HOME}
+    ;;
+esac
diff -r 0def4d330591 -r 6144033df3f5 net/tor/Makefile
--- a/net/tor/Makefile  Mon Feb 14 16:56:38 2005 +0000
+++ b/net/tor/Makefile  Mon Feb 14 18:51:58 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/02/13 20:27:53 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2005/02/14 18:51:58 jschauma Exp $
 #
 
 DISTNAME=              tor-0.0.9.4
+PKGREVISION=           1
 CATEGORIES=            net security
 MASTER_SITES=          http://tor.eff.org/dist/
 
@@ -38,7 +39,10 @@
 
 RCD_SCRIPT=            tor
 
-.include "../../mk/bsd.prefs.mk"
+INSTALL_EXTRA_TMPL=    ${.CURDIR}/INSTALL
+
+FILES_SUBST+=          PKG_HOME=${PKG_HOME}
+FILES_SUBST+=          TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP}
 
 .if !empty(PKGSRC_COMPILER:Mmipspro)
 CFLAGS+=               -c99
@@ -53,9 +57,6 @@
                -e 's|@RCD_SCRIPTS_SHELL@|${RCD_SCRIPTS_SHELL}|g'       \
                ${FILESDIR}/tor.in > ${WRKSRC}/tor.pkgsrc.rc
 
-pre-install:
-       ${MKDIR} -m 0700 ${PKG_HOME}
-
 post-install:
        ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/tor
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tor
@@ -64,7 +65,6 @@
        ${INSTALL_DATA} ${WRKSRC}/contrib/tor-tsocks.conf               \
                ${PREFIX}/share/examples/tor/tor-tsocks.conf
        ${INSTALL_DATA} ${WRKSRC}/tor.pkgsrc.rc ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/tor
-       ${CHOWN} ${TOR_USER}:${TOR_GROUP} ${PKG_HOME}
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"