3 files changed, 37 insertions, 16 deletions
diff --git a/net/tor/patches/patch-ac b/net/tor/patches/patch-ac
index ee9dcf8e936..b7ba79768c1 100644
--- a/net/tor/patches/patch-ac
+++ b/net/tor/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2006/05/26 02:21:42 jschauma Exp $
+$NetBSD: patch-ac,v 1.4 2007/08/09 19:33:58 drochner Exp $
 
---- contrib/Makefile.in.orig	2006-05-23 13:08:04.000000000 -0400
+--- contrib/Makefile.in.orig	2007-05-25 02:52:01.000000000 +0200
 +++ contrib/Makefile.in
-@@ -81,7 +81,7 @@ confdir = $(sysconfdir)/tor
- 
- EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py
- 
+@@ -176,7 +176,7 @@ SUBDIRS = osx suse
+ DIST_SUBDIRS = osx suse
+ confdir = $(sysconfdir)/tor
+ EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico
 -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-ad b/net/tor/patches/patch-ad
index c3422a69390..c5a7939fa40 100644
--- a/net/tor/patches/patch-ad
+++ b/net/tor/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2006/05/26 02:21:42 jschauma Exp $
+$NetBSD: patch-ad,v 1.3 2007/08/09 19:33:58 drochner Exp $
 
---- src/config/Makefile.in.orig	2006-03-18 23:02:54.000000000 -0500
+--- src/config/Makefile.in.orig	2007-05-25 02:52:01.000000000 +0200
 +++ src/config/Makefile.in
-@@ -78,7 +78,7 @@ confdir = $(sysconfdir)/tor
- 
+@@ -155,7 +155,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ confdir = $(sysconfdir)/tor
  EXTRA_DIST = 
- 
 -conf_DATA = torrc.sample
 +#conf_DATA = torrc.sample
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../orconfig.h
- CONFIG_CLEAN_FILES =  torrc.sample
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/net/tor/patches/patch-ae b/net/tor/patches/patch-ae
new file mode 100644
index 00000000000..058dc41313d
--- /dev/null
+++ b/net/tor/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.3 2007/08/09 19:33:58 drochner Exp $
+
+--- configure.orig	2007-07-12 13:12:23.000000000 +0200
++++ configure
+@@ -5345,6 +5345,8 @@ done
+ 
+ fi
+ 
++# these checks don't work, assume types are present
++if false; then
+ 
+ { echo "$as_me:$LINENO: checking for u_int64_t" >&5
+ echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6; }
+@@ -5598,6 +5600,7 @@ _ACEOF
+ 
+ fi
+ 
++fi
+ 
+ { echo "$as_me:$LINENO: checking for libevent directory" >&5
+ echo $ECHO_N "checking for libevent directory... $ECHO_C" >&6; }