diff options
| author | bf <bf@FreeBSD.org> | 2010-08-30 22:47:40 +0800 |
|---|---|---|
| committer | bf <bf@FreeBSD.org> | 2010-08-30 22:47:40 +0800 |
| commit | 58cdd1e35b645a7af045095b9f5eaea1b89200a4 (patch) | |
| tree | 1703cf17203a894b8e1739afca208ccc24326984 /security | |
| parent | 6c6157ffa2d9a861bb9b2bf40c25ed32f16d219d (diff) | |
| download | freebsd-ports-gnome-58cdd1e35b645a7af045095b9f5eaea1b89200a4.tar.gz freebsd-ports-gnome-58cdd1e35b645a7af045095b9f5eaea1b89200a4.tar.zst freebsd-ports-gnome-58cdd1e35b645a7af045095b9f5eaea1b89200a4.zip | |
--Add LICENSE information
--Add a reference to net/torsocks in the pkg-message, but remove the dependency
on that port [1]
--Remove the VIDALIA option, which led to (false) circular
dependencies when enabled [2]
--Re-enable the regression-test target
PR: 150078 [2]
Requested by: Fabian Keil [1]
Approved by: miwi (co-mentor)
Diffstat (limited to 'security')
| -rw-r--r-- | security/tor-devel/Makefile | 14 | ||||
| -rw-r--r-- | security/tor-devel/files/pkg-message.in | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index 060e0ead714e..c404490f934f 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= tor DISTVERSION= 0.2.2.15-alpha +PORTREVISION= 1 CATEGORIES= security net ipv6 MASTER_SITES= http://www.torproject.org/dist/ \ http://tor.cypherpunks.at/dist/ \ @@ -18,7 +19,6 @@ PKGNAMESUFFIX= -devel MAINTAINER= bf@FreeBSD.org COMMENT= An anonymizing overlay network for TCP -RUN_DEPENDS= torsocks:${PORTSDIR}/net/torsocks LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent GNU_CONFIGURE= yes @@ -32,14 +32,16 @@ OPTIONS= BUFFREELISTS "freelists for buffer RAM" on \ INSTR_DOWNLOADS "instrument downloads for analysis" off \ TCMALLOC "use the tcmalloc memory allocation library" off \ THREADS "multi-threading support" on \ - TRANSPARENT "transparent proxy support" on \ - VIDALIA "Vidalia graphical Tor controller" off + TRANSPARENT "transparent proxy support" on USE_RC_SUBR= tor SUB_FILES= pkg-message CONFLICTS= tor-[0-9]* +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/LICENSE + .include <bsd.port.pre.mk> .if ( ${OSVERSION} < 801000 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900011) ) @@ -76,10 +78,6 @@ CONFIGURE_ARGS+= --enable-transparent CONFIGURE_ARGS+= --disable-transparent .endif -.ifdef(WITH_VIDALIA) -RUN_DEPENDS+= vidalia:${PORTSDIR}/net-mgmt/vidalia -.endif - post-patch: @${MV} ${WRKSRC}/contrib/tor-tsocks.conf \ ${WRKSRC}/contrib/tor-tsocks.conf.sample @@ -105,7 +103,7 @@ post-install: ${CHOWN} _tor:_tor /var/db/tor ${CAT} ${PKGMESSAGE} -test: build +check regression-test test: build @( cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check ) diff --git a/security/tor-devel/files/pkg-message.in b/security/tor-devel/files/pkg-message.in index aa536343704e..721e75304a5f 100644 --- a/security/tor-devel/files/pkg-message.in +++ b/security/tor-devel/files/pkg-message.in @@ -2,4 +2,5 @@ To enable the tor server, set tor_enable="YES" in your /etc/rc.conf and edit %%PREFIX%%/etc/tor/torrc. Also note that the rc.subr script overrides many torrc options and is tunable. See %%PREFIX%%/etc/rc.d/tor for details. +To use the torify script, install the net/torsocks port. ================================================================================ |