summaryrefslogtreecommitdiff
path: root/net/tor
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2005-02-14 18:51:58 +0000
committerjschauma <jschauma@pkgsrc.org>2005-02-14 18:51:58 +0000
commit0360cbf25872557822c7f4d7a1eee8546c24a319 (patch)
tree88fe3521eee8f0144f1e6d14cb6c35ba9bd5a0c7 /net/tor
parent094100f2ee1382fdbdd7a1a79ff7c4d4834e7746 (diff)
downloadpkgsrc-0360cbf25872557822c7f4d7a1eee8546c24a319.tar.gz
Make this work correctly as a binary package.
Bump PKGREVISION.
Diffstat (limited to 'net/tor')
-rw-r--r--net/tor/INSTALL15
-rw-r--r--net/tor/Makefile12
2 files changed, 21 insertions, 6 deletions
diff --git a/net/tor/INSTALL b/net/tor/INSTALL
new file mode 100644
index 00000000000..f107394c016
--- /dev/null
+++ b/net/tor/INSTALL
@@ -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 --git a/net/tor/Makefile b/net/tor/Makefile
index ced22199200..283535c11e6 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -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 @@ CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \
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 @@ post-patch:
-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 @@ post-install:
${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"