- Update to 1.1.18

- Minor Makefile cleanup
- Change of default $tor_datadir

PR:		ports/93692
Submitted by:	Peter Thoenen (maintainer)
Approved by:	flz (mentor)

4 files changed, 15 insertions, 16 deletions

diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index e57f6d53f41f..17060e5c47b2 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	tor
-PORTVERSION=	0.1.1.13
+PORTVERSION=	0.1.1.18
 CATEGORIES=	security net
 MASTER_SITES=	http://tor.eff.org/dist/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rc
 
 MAINTAINER=	peter.thoenen@yahoo.com
 COMMENT=	An anonymizing overlay network for TCP
@@ -23,7 +23,6 @@ USE_OPENSSL=	yes
 
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
-PKG_MESSAGE=	${WRKSRC}/pkg-message
 
 CONFLICTS=	tor-[0-9]*
 
@@ -45,13 +44,11 @@ pre-install:
 		${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${MKDIR} /var/run/tor
-	@${CHOWN} _tor:_tor /var/run/tor
 	@${TOUCH} /var/log/tor
 	@${CHOWN} _tor:_tor /var/log/tor
 	@${MKDIR} /var/db/tor
 	@${MKDIR} /var/db/tor/data
-	@${CHOWN} -R _tor:_tor /var/db/tor
+	@${CHOWN} _tor:_tor /var/db/tor
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo
index a0681c38a81f..95678ededf0c 100644
--- a/security/tor-devel/distinfo
+++ b/security/tor-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (tor-0.1.1.13-alpha.tar.gz) = 5cdf6c5ed20efd7048ee1257cbcc1b4e
-SHA256 (tor-0.1.1.13-alpha.tar.gz) = cb15a83ed8ad87d67c0685b20a41096c32211f20ae321f39ed110d7ace38e29f
-SIZE (tor-0.1.1.13-alpha.tar.gz) = 756583
+MD5 (tor-0.1.1.18-rc.tar.gz) = 1e67150f74b23db92fdf8000a5ed107b
+SHA256 (tor-0.1.1.18-rc.tar.gz) = 98c6ae87a41ceafbc98fea7128bba8ffce2857610ef367da3a4c0d9fcc963193
+SIZE (tor-0.1.1.18-rc.tar.gz) = 811574
diff --git a/security/tor-devel/files/pkg-message.in b/security/tor-devel/files/pkg-message.in
index 379e6e2227d4..872f6f0b198c 100644
--- a/security/tor-devel/files/pkg-message.in
+++ b/security/tor-devel/files/pkg-message.in
@@ -1,6 +1,5 @@
-=====================================================================================
-
+================================================================================
 To enable the tor server, set tor_enable="YES" in your /etc/rc.conf
-and edit %%PREFIX%%/etc/tor/torrc
-
-=====================================================================================
+and edit %%PREFIX%%/etc/tor/torrc.  Also note that the rc.subr script overrides
+many torrc options and is tunable.  See %%PREFIX%%/etc/rc.d/tor.sh for details
+================================================================================
diff --git a/security/tor-devel/files/tor.in b/security/tor-devel/files/tor.in
index 3840408ddb36..a1ab5ec559d2 100644
--- a/security/tor-devel/files/tor.in
+++ b/security/tor-devel/files/tor.in
@@ -12,7 +12,10 @@
 # tor_conf (str):	Points to your tor conf file
 #			Default: %%PREFIX%%/etc/tor/torrc
 # tor_user (str):	Tor Daemon user. Default _tor
-# tor_groupr (str):	Tor Daemon group. Default _tor
+# tor_group (str):	Tor Daemon group. Default _tor
+# tor_datadir (str):	Tor DataDir.  Defaults /var/db/tor
+# 			This will overide your torrc as it is
+# 			a command line option.
 #
 
 . %%RC_SUBR%%
@@ -28,7 +31,7 @@ load_rc_config ${name}
 : ${tor_group="_tor"}
 : ${tor_pidfile="/var/run/tor/tor.pid"}
 : ${tor_logfile="/var/log/tor"}
-: ${tor_datadir="/var/run/tor"}
+: ${tor_datadir="/var/db/tor"}
 
 required_files=${tor_conf}
 required_dirs=${tor_datadir}