5 files changed, 37 insertions, 34 deletions

diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index b485e9335fee..575a4b9407b7 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -1,16 +1,18 @@
-# ports collection makefile for: 		tor
-# Date created: 				2004.05.28
-# Whom:						freebsd-ports@rikrose.net
+# ports collection makefile for:	tor-devel
+# Date created:				2005.10.20
+# Whom:					eol1@yahoo.com
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tor
-PORTVERSION=	0.1.0.14
+PORTVERSION=	0.1.1.8
 CATEGORIES=	security net
 MASTER_SITES=	http://tor.eff.org/dist/
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha
 
-MAINTAINER=	freebsd-ports@rikrose.net
+MAINTAINER=	eol1@yahoo.com
 COMMENT=	An anonymizing overlay network for TCP
 
 RUN_DEPENDS=	tsocks:${PORTSDIR}/net/tsocks
@@ -20,6 +22,8 @@ GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 
+CONFLICTS=	tor-[0-9]*
+
 MANCOMPRESSED=	no
 MAN1=		tor.1 tor-resolve.1 torify.1
 
diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo
index b7e0032bec88..fffaf18f2f57 100644
--- a/security/tor-devel/distinfo
+++ b/security/tor-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (tor-0.1.0.14.tar.gz) = a3698218371ed0e647886fef0545bb44
-SIZE (tor-0.1.0.14.tar.gz) = 631723
+MD5 (tor-0.1.1.8-alpha.tar.gz) = 10c40e2518f63747f1e3a349bf480139
+SIZE (tor-0.1.1.8-alpha.tar.gz) = 703116
diff --git a/security/tor-devel/files/patch-contrib-tor.sh.in b/security/tor-devel/files/patch-contrib-tor.sh.in
index c271ee2e4d54..1a9ff5774218 100644
--- a/security/tor-devel/files/patch-contrib-tor.sh.in
+++ b/security/tor-devel/files/patch-contrib-tor.sh.in
@@ -1,9 +1,9 @@
---- contrib/tor.sh.in.orig	Sun Jun  5 15:44:43 2005
-+++ contrib/tor.sh.in	Fri Sep  2 13:25:51 2005
+--- contrib/tor.sh.in.orig Sun Jun  5 15:44:43 2005
++++ contrib/tor.sh.in  Fri Sep  2 13:25:51 2005
 @@ -5,12 +5,12 @@
  # chkconfig: 2345 90 10
  # description: Onion Router
- 
+
 -TORUSER=
 -TORGROUP=
 +TORUSER=_tor
@@ -14,7 +14,7 @@
 -TORDATA=@LOCALSTATEDIR@/lib/tor
 +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.
 @@ -48,7 +48,7 @@
diff --git a/security/tor-devel/pkg-install b/security/tor-devel/pkg-install
index 8e68cf08e203..fbbea4b722f0 100644
--- a/security/tor-devel/pkg-install
+++ b/security/tor-devel/pkg-install
@@ -6,30 +6,30 @@ if [ x"$2" = xPRE-INSTALL ]; then
     GROUP="_tor"
     GID="256"
 
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
-		    echo "Added group \"${GROUP}\"."
-	    else
-		    echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-	    	exit 1
-		fi
-	fi
+   if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
+       echo "You already have a group \"${GROUP}\", so I will use it."
+   else
+       if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
+           echo "Added group \"${GROUP}\"."
+       else
+           echo "Adding group \"${GROUP}\" failed..."
+           echo "Please create it, and try again."
+           exit 1
+       fi
+   fi
 
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+   if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
+       echo "You already have a user \"${USER}\", so I will use it."
+   else
+       if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
            -d /var/db/tor \
            -s /bin/sh \
            -c "Tor anonymising router"; then
-	        echo "Added user \"${USER}\"."
-	    else
-	        echo "Adding user \"${USER}\" failed..."
-	        echo "Please create it, and try again."
-	        exit 1
-	    fi
-	fi
+           echo "Added user \"${USER}\"."
+       else
+           echo "Adding user \"${USER}\" failed..."
+           echo "Please create it, and try again."
+           exit 1
+       fi
+   fi
 fi
diff --git a/security/tor-devel/pkg-plist b/security/tor-devel/pkg-plist
index c3e22fbf8a72..3835e929d3d7 100644
--- a/security/tor-devel/pkg-plist
+++ b/security/tor-devel/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/tor
 bin/tor-resolve
 bin/torify