Tue Feb 19 13:45:18 2008 UTC ()
Pass --with-libevent-dir unconditionally,  since BUILDLINK_PREFIX.libevent is
unusable here yet.


(obache)
diff -r1.51 -r1.52 pkgsrc/net/tor/Makefile
cvs diff -r1.51 -r1.52 pkgsrc/net/tor/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tor/Makefile 2008/01/20 20:11:09 1.51
+++ pkgsrc/net/tor/Makefile 2008/02/19 13:45:18 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.51 2008/01/20 20:11:09 jschauma Exp $ 1# $NetBSD: Makefile,v 1.52 2008/02/19 13:45:18 obache Exp $
2# 2#
3 3
4DISTNAME= tor-0.1.2.19 4DISTNAME= tor-0.1.2.19
5CATEGORIES= net security 5CATEGORIES= net security
6MASTER_SITES= http://www.torproject.org/dist/ 6MASTER_SITES= http://www.torproject.org/dist/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.torproject.org/ 9HOMEPAGE= http://www.torproject.org/
10COMMENT= Anonymizing overlay network for TCP 10COMMENT= Anonymizing overlay network for TCP
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14USE_LANGUAGES+= c99 14USE_LANGUAGES+= c99
@@ -30,29 +30,27 @@ PKG_GROUPS_VARS+= TOR_GROUP @@ -30,29 +30,27 @@ PKG_GROUPS_VARS+= TOR_GROUP
30PKG_USERS_VARS+= TOR_USER 30PKG_USERS_VARS+= TOR_USER
31 31
32RCD_SCRIPTS= tor 32RCD_SCRIPTS= tor
33RCD_SCRIPT_SRC.tor= ${FILESDIR}/tor.in 33RCD_SCRIPT_SRC.tor= ${FILESDIR}/tor.in
34PKG_GROUPS= ${TOR_GROUP} 34PKG_GROUPS= ${TOR_GROUP}
35PKG_USERS= ${TOR_USER}:${TOR_GROUP} 35PKG_USERS= ${TOR_USER}:${TOR_GROUP}
36PKG_GECOS.${TOR_USER}= Torifier 36PKG_GECOS.${TOR_USER}= Torifier
37PKG_HOME.${TOR_USER}= ${PKG_HOME} 37PKG_HOME.${TOR_USER}= ${PKG_HOME}
38USER_GROUP= ${TOR_USER} ${TOR_GROUP} 38USER_GROUP= ${TOR_USER} ${TOR_GROUP}
39 39
40OWN_DIRS_PERMS+= ${PKG_HOME} ${USER_GROUP} 0700 40OWN_DIRS_PERMS+= ${PKG_HOME} ${USER_GROUP} 0700
41 41
42CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 42CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
43.if !empty(BUILDLINK_PREFIX.libevent) 
44CONFIGURE_ARGS+= --with-libevent-dir=${BUILDLINK_PREFIX.libevent:Q} 43CONFIGURE_ARGS+= --with-libevent-dir=${BUILDLINK_PREFIX.libevent:Q}
45.endif 
46 44
47CONF_FILES+= ${PREFIX}/share/examples/tor/tor-tsocks.conf \ 45CONF_FILES+= ${PREFIX}/share/examples/tor/tor-tsocks.conf \
48 ${PKG_SYSCONFDIR}/tor-tsocks.conf 46 ${PKG_SYSCONFDIR}/tor-tsocks.conf
49CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \ 47CONF_FILES+= ${PREFIX}/share/examples/tor/torrc.sample \
50 ${PKG_SYSCONFDIR}/torrc 48 ${PKG_SYSCONFDIR}/torrc
51 49
52FILES_SUBST+= PKG_HOME=${PKG_HOME:Q} 50FILES_SUBST+= PKG_HOME=${PKG_HOME:Q}
53FILES_SUBST+= TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q} 51FILES_SUBST+= TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q}
54 52
55CHECK_PORTABILITY_SKIP+=contrib/* 53CHECK_PORTABILITY_SKIP+=contrib/*
56 54
57post-install: 55post-install:
58 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tor 56 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tor