Update tor to 0.2.1.19.

Based on maintainer update request via PR 41828.
(remove patch-a{a,b} and make to simplify by me).

Tor 0.2.1.18 lays the foundations for performance improvements, adds
status events to help users diagnose bootstrap problems, adds optional
authentication/authorization for hidden services, fixes a variety of
potential anonymity problems, and includes a huge pile of other features
and bug fixes.

Tor 0.2.1.19 fixes a major bug with accessing and providing hidden
services.

6 files changed, 10 insertions, 45 deletions

diff --git a/net/tor/Makefile b/net/tor/Makefile
index 2ff91809b95..0c7705e6ec8 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2009/08/16 15:35:43 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2009/08/18 05:48:08 obache Exp $
 #
 
-DISTNAME=		tor-0.2.0.35
-PKGREVISION=		1
+DISTNAME=		tor-0.2.1.19
 CATEGORIES=		net security
 MASTER_SITES=		http://www.torproject.org/dist/
 
@@ -41,8 +40,6 @@ USER_GROUP=		${TOR_USER} ${TOR_GROUP}
 
 OWN_DIRS_PERMS+=	${PKG_HOME} ${USER_GROUP} 0700
 
-AUTO_MKDIRS=		yes
-
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 
 CONF_FILES+=		${PREFIX}/share/examples/tor/tor-tsocks.conf 	\
@@ -53,18 +50,14 @@ CONF_FILES+=		${PREFIX}/share/examples/tor/torrc.sample 	\
 FILES_SUBST+=		PKG_HOME=${PKG_HOME:Q}
 FILES_SUBST+=		TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q}
 
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples
+
 CHECK_PORTABILITY_SKIP+=contrib/*
 
 .if !empty(PKGSRC_COMPILER:Mmipspro)
 CFLAGS+=		-c99
 .endif
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/src/config/torrc.sample		\
-		${DESTDIR}${PREFIX}/share/examples/tor/torrc.sample
-	${INSTALL_DATA} ${WRKSRC}/contrib/tor-tsocks.conf		\
-		${DESTDIR}${PREFIX}/share/examples/tor/tor-tsocks.conf
-
 BUILDLINK_API_DEPENDS.libevent+= libevent>=1.2
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/net/tor/PLIST b/net/tor/PLIST
index 335a601d920..3a5d8454274 100644
--- a/net/tor/PLIST
+++ b/net/tor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:09:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/08/18 05:48:08 obache Exp $
 bin/tor
 bin/tor-gencert
 bin/tor-resolve
diff --git a/net/tor/distinfo b/net/tor/distinfo
index ecedc46520c..50f27dbb5da 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.35 2009/07/09 11:52:31 obache Exp $
+$NetBSD: distinfo,v 1.36 2009/08/18 05:48:08 obache Exp $
 
-SHA1 (tor-0.2.0.35.tar.gz) = 6216887e0575c4a18f46e53faea1ebdb04bf7905
-RMD160 (tor-0.2.0.35.tar.gz) = ecc98c602b5c153a8aa8f6e651166705bc05c972
-Size (tor-0.2.0.35.tar.gz) = 2221852 bytes
-SHA1 (patch-aa) = 630e1e0a9591c136987b504e73c64ff9f53b54e9
-SHA1 (patch-ab) = 3363efdcf8b9918c1249add1046077f2323a11ff
+SHA1 (tor-0.2.1.19.tar.gz) = 8a8af1354ab5b3fea58e2bbffeddc05e3dfedb17
+RMD160 (tor-0.2.1.19.tar.gz) = 3606cc574ade12adfa8f3c7a180958865be077e8
+Size (tor-0.2.1.19.tar.gz) = 2409484 bytes
diff --git a/net/tor/options.mk b/net/tor/options.mk
index 93622746e4e..ff4fdfb6b89 100644
--- a/net/tor/options.mk
+++ b/net/tor/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/08/01 17:23:21 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2009/08/18 05:48:08 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tor
 PKG_SUPPORTED_OPTIONS=	threads
diff --git a/net/tor/patches/patch-aa b/net/tor/patches/patch-aa
deleted file mode 100644
index 88a45a1e4fa..00000000000
--- a/net/tor/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/08/01 17:23:21 wiz Exp $
-
---- contrib/Makefile.in.orig	2008-06-03 21:41:27.000000000 +0200
-+++ contrib/Makefile.in
-@@ -185,7 +185,7 @@ SUBDIRS = osx suse
- DIST_SUBDIRS = osx suse
- confdir = $(sysconfdir)/tor
- EXTRA_DIST = exitlist tor-tsocks.conf torify.1 tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html
--conf_DATA = tor-tsocks.conf
-+#conf_DATA = tor-tsocks.conf
- bin_SCRIPTS = torify
- man_MANS = torify.1
- all: all-recursive
diff --git a/net/tor/patches/patch-ab b/net/tor/patches/patch-ab
deleted file mode 100644
index df3312b9043..00000000000
--- a/net/tor/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/08/01 17:23:21 wiz Exp $
-
---- src/config/Makefile.in.orig	2008-06-03 21:41:28.000000000 +0200
-+++ src/config/Makefile.in
-@@ -166,7 +166,7 @@ top_srcdir = @top_srcdir@
- confdir = $(sysconfdir)/tor
- tordatadir = $(datadir)/tor
- EXTRA_DIST = geoip
--conf_DATA = torrc.sample
-+#conf_DATA = torrc.sample
- tordata_DATA = geoip
- all: all-am
-