- Update to 0.1.0.10 [1]

- Polish the Makefile and packing list

PR:		ports/82386 [1]
Submitted by:	maintainer [1]

8 files changed, 18 insertions, 40 deletions

diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index d908ef37b192..2ec1367dbd69 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tor
-PORTVERSION=	0.0.9.9
-# PORTREVISION=	1
+PORTVERSION=	0.1.0.10
 CATEGORIES=	security net
 MASTER_SITES=	http://tor.eff.org/dist/
 
@@ -15,9 +14,9 @@ MAINTAINER=	freebsd-ports@rikrose.net
 COMMENT=	An anonymizing overlay network for TCP
 
 RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
+LIB_DEPENDS=	event-1.1:${PORTSDIR}/devel/libevent
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 
@@ -39,6 +38,6 @@ pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${CP} ${WRKSRC}/contrib/tor.sh ${LOCALBASE}/etc/rc.d/tor.sh.sample
+	${INSTALL_DATA} ${WRKSRC}/contrib/tor.sh ${PREFIX}/etc/rc.d/tor.sh.sample
 
 .include <bsd.port.mk>
diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo
index 2d9efda42e8e..e2b9e3175702 100644
--- a/security/tor-devel/distinfo
+++ b/security/tor-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (tor-0.0.9.9.tar.gz) = a9979fc4d20d7e3734d7b8a51e60a7d5
-SIZE (tor-0.0.9.9.tar.gz) = 574809
+MD5 (tor-0.1.0.10.tar.gz) = a7d27084ebe3f407c0c3fdaf61fb5631
+SIZE (tor-0.1.0.10.tar.gz) = 629877
diff --git a/security/tor-devel/files/patch-contrib-tor.sh.in b/security/tor-devel/files/patch-contrib-tor.sh.in
index 74fa8978a719..ebf4e9359cbd 100644
--- a/security/tor-devel/files/patch-contrib-tor.sh.in
+++ b/security/tor-devel/files/patch-contrib-tor.sh.in
@@ -1,5 +1,5 @@
---- contrib/tor.sh.in.orig	Sat Jan 29 20:41:19 2005
-+++ contrib/tor.sh.in	Sat Jan 29 20:46:14 2005
+--- contrib/tor.sh.in.orig	Sat Jun 18 13:27:28 2005
++++ contrib/tor.sh.in	Sat Jun 18 13:29:00 2005
 @@ -5,12 +5,12 @@
  # chkconfig: 2345 90 10
  # description: Onion Router
@@ -9,21 +9,11 @@
 +TORUSER=_tor
 +TORGROUP=_tor
  TORBIN=@BINDIR@/tor
--TORPID=@LOCALSTATEDIR@/run/tor/tor.pid
+ TORPID=@LOCALSTATEDIR@/run/tor/tor.pid
 -TORLOG=@LOCALSTATEDIR@/log/tor/tor.log
 -TORDATA=@LOCALSTATEDIR@/lib/tor
-+TORPID=/var/run/tor.pid
 +TORLOG=/var/log/tor.log
 +TORDATA=/var/db/tor/data
  
  TORCONF=@CONFDIR@/torrc
  # Strictly speaking, we don't need to su if we have --user and --group.
-@@ -36,7 +36,7 @@
-         if  [ "x$TORUSER" = "x" ]; then
-             $TORBIN -f $TORCONF $TORARGS
-         else
--            /bin/su -c "$TORBIN -f $TORCONF $TORARGS" $TORUSER
-+            /usr/bin/su $TORUSER -c "$TORBIN -f $TORCONF $TORARGS"
-         fi
-         RETVAL=$?
-         if [ $RETVAL -eq 0 ]; then
diff --git a/security/tor-devel/pkg-plist b/security/tor-devel/pkg-plist
index 8bfe05579563..3835e929d3d7 100644
--- a/security/tor-devel/pkg-plist
+++ b/security/tor-devel/pkg-plist
@@ -4,4 +4,4 @@ bin/torify
 etc/rc.d/tor.sh.sample
 etc/tor/torrc.sample
 etc/tor/tor-tsocks.conf.sample
-@dirrm etc/tor
+@unexec rmdir %D/etc/tor 2>/dev/null || true
diff --git a/security/tor/Makefile b/security/tor/Makefile
index d908ef37b192..2ec1367dbd69 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tor
-PORTVERSION=	0.0.9.9
-# PORTREVISION=	1
+PORTVERSION=	0.1.0.10
 CATEGORIES=	security net
 MASTER_SITES=	http://tor.eff.org/dist/
 
@@ -15,9 +14,9 @@ MAINTAINER=	freebsd-ports@rikrose.net
 COMMENT=	An anonymizing overlay network for TCP
 
 RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
+LIB_DEPENDS=	event-1.1:${PORTSDIR}/devel/libevent
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 
@@ -39,6 +38,6 @@ pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${CP} ${WRKSRC}/contrib/tor.sh ${LOCALBASE}/etc/rc.d/tor.sh.sample
+	${INSTALL_DATA} ${WRKSRC}/contrib/tor.sh ${PREFIX}/etc/rc.d/tor.sh.sample
 
 .include <bsd.port.mk>
diff --git a/security/tor/distinfo b/security/tor/distinfo
index 2d9efda42e8e..e2b9e3175702 100644
--- a/security/tor/distinfo
+++ b/security/tor/distinfo
@@ -1,2 +1,2 @@
-MD5 (tor-0.0.9.9.tar.gz) = a9979fc4d20d7e3734d7b8a51e60a7d5
-SIZE (tor-0.0.9.9.tar.gz) = 574809
+MD5 (tor-0.1.0.10.tar.gz) = a7d27084ebe3f407c0c3fdaf61fb5631
+SIZE (tor-0.1.0.10.tar.gz) = 629877
diff --git a/security/tor/files/patch-contrib-tor.sh.in b/security/tor/files/patch-contrib-tor.sh.in
index 74fa8978a719..ebf4e9359cbd 100644
--- a/security/tor/files/patch-contrib-tor.sh.in
+++ b/security/tor/files/patch-contrib-tor.sh.in
@@ -1,5 +1,5 @@
---- contrib/tor.sh.in.orig	Sat Jan 29 20:41:19 2005
-+++ contrib/tor.sh.in	Sat Jan 29 20:46:14 2005
+--- contrib/tor.sh.in.orig	Sat Jun 18 13:27:28 2005
++++ contrib/tor.sh.in	Sat Jun 18 13:29:00 2005
 @@ -5,12 +5,12 @@
  # chkconfig: 2345 90 10
  # description: Onion Router
@@ -9,21 +9,11 @@
 +TORUSER=_tor
 +TORGROUP=_tor
  TORBIN=@BINDIR@/tor
--TORPID=@LOCALSTATEDIR@/run/tor/tor.pid
+ TORPID=@LOCALSTATEDIR@/run/tor/tor.pid
 -TORLOG=@LOCALSTATEDIR@/log/tor/tor.log
 -TORDATA=@LOCALSTATEDIR@/lib/tor
-+TORPID=/var/run/tor.pid
 +TORLOG=/var/log/tor.log
 +TORDATA=/var/db/tor/data
  
  TORCONF=@CONFDIR@/torrc
  # Strictly speaking, we don't need to su if we have --user and --group.
-@@ -36,7 +36,7 @@
-         if  [ "x$TORUSER" = "x" ]; then
-             $TORBIN -f $TORCONF $TORARGS
-         else
--            /bin/su -c "$TORBIN -f $TORCONF $TORARGS" $TORUSER
-+            /usr/bin/su $TORUSER -c "$TORBIN -f $TORCONF $TORARGS"
-         fi
-         RETVAL=$?
-         if [ $RETVAL -eq 0 ]; then
diff --git a/security/tor/pkg-plist b/security/tor/pkg-plist
index 8bfe05579563..3835e929d3d7 100644
--- a/security/tor/pkg-plist
+++ b/security/tor/pkg-plist
@@ -4,4 +4,4 @@ bin/torify
 etc/rc.d/tor.sh.sample
 etc/tor/torrc.sample
 etc/tor/tor-tsocks.conf.sample
-@dirrm etc/tor
+@unexec rmdir %D/etc/tor 2>/dev/null || true