summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/tor/Makefile16
-rw-r--r--net/tor/distinfo10
-rw-r--r--net/tor/patches/patch-ae8
3 files changed, 17 insertions, 17 deletions
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 9755b1ddb0a..f8f4f62b7fe 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2007/09/11 15:26:14 obache Exp $
+# $NetBSD: Makefile,v 1.46 2007/09/11 15:53:57 obache Exp $
#
-DISTNAME= tor-0.1.2.16
-PKGREVISION= 1
+DISTNAME= tor-0.1.2.17
CATEGORIES= net security
MASTER_SITES= http://tor.eff.org/dist/
@@ -16,9 +15,14 @@ USE_LANGUAGES+= c99
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
+CONFIGURE_ENV+= CPP=${CPP:Q}
+
+TEST_TARGET= check
+
TOR_USER?= tor
TOR_GROUP?= tor
-PKG_HOME?= /var/chroot/tor
+PKG_HOME?= ${VARBASE}/chroot/tor
+BUILD_DEFS+= VARBASE
PKG_GROUPS_VARS+= TOR_GROUP
PKG_USERS_VARS+= TOR_USER
@@ -51,12 +55,8 @@ post-install:
${PREFIX}/share/examples/tor/torrc.sample
${INSTALL_DATA} ${WRKSRC}/contrib/tor-tsocks.conf \
${PREFIX}/share/examples/tor/tor-tsocks.conf
- ${INSTALL_DATA_DIR} ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1a
-# XXX the pkgsrc libevent builtin.mk does not detect the version of a builtin
-# libevent, so we need to force use of the pkgsrc one
-USE_BUILTIN.libevent= no
.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/net/tor/distinfo b/net/tor/distinfo
index 355ede1f5ca..37879622878 100644
--- a/net/tor/distinfo
+++ b/net/tor/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2007/08/09 19:33:58 drochner Exp $
+$NetBSD: distinfo,v 1.25 2007/09/11 15:53:57 obache Exp $
-SHA1 (tor-0.1.2.16.tar.gz) = f8eb950612db49b2f7176c068ca69e0091950bdb
-RMD160 (tor-0.1.2.16.tar.gz) = 813a8726470361ee6629e71a10be67be9cfdd325
-Size (tor-0.1.2.16.tar.gz) = 1254796 bytes
+SHA1 (tor-0.1.2.17.tar.gz) = 01092fb75c407b5c1d7f33db069cf7641973d94d
+RMD160 (tor-0.1.2.17.tar.gz) = 7ec316cdcc57ab5e817af1dcda913438b332f7e3
+Size (tor-0.1.2.17.tar.gz) = 1251636 bytes
SHA1 (patch-ac) = adcc070e4d522143c4d882bd13436cd2b71f289b
SHA1 (patch-ad) = 72a68cbd00a5febdff82ba9268bdad2b47ea8159
-SHA1 (patch-ae) = 6697fd7fdf5ecf5a1ae40db2d40dee1a169c324a
+SHA1 (patch-ae) = 82977c38f18942de883a17d285ad9addd95e02f7
diff --git a/net/tor/patches/patch-ae b/net/tor/patches/patch-ae
index 058dc41313d..5f08603149b 100644
--- a/net/tor/patches/patch-ae
+++ b/net/tor/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2007/08/09 19:33:58 drochner Exp $
+$NetBSD: patch-ae,v 1.4 2007/09/11 15:53:58 obache Exp $
---- configure.orig 2007-07-12 13:12:23.000000000 +0200
+--- configure.orig 2007-08-30 21:01:38.000000000 +0000
+++ configure
-@@ -5345,6 +5345,8 @@ done
+@@ -5356,6 +5356,8 @@ done
fi
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.3 2007/08/09 19:33:58 drochner Exp $
{ 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
+@@ -5609,6 +5611,7 @@ _ACEOF
fi