Attachment 133773 Details for Bug 178303 – tork.patch

[patch] tork.patch

tork.patch (text/plain), 2.70 KB, created by Emanuel Haupt on 2013-05-03 00:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emanuel Haupt

Created: 2013-05-03 00:20:00 UTC

Size: 2.70 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 317168)
>+++ Makefile	(working copy)
>@@ -26,42 +26,33 @@
> MAN5=		torksocks.conf.5
> MAN8=		torksocks.8
> 
>-HAVE_TOR!=	if pkg_info -I tor-\* >/dev/null 2>&1 ; then ${ECHO} YES; fi
>+OPTIONS_DEFINE=		PRIVOXY MIXMINION
> 
>-.if (${HAVE_TOR} == "YES")
>-HAVE_TOR_DEVEL!=	if pkg_info -I tor-devel\* >/dev/null 2>&1 ; then ${ECHO} YES; fi
>+PRIVOXY_DESC=		Install privoxy
>+MIXMINION_DESC=		Install mixminion
> 
>-.if (${HAVE_TOR_DEVEL} == "YES")
>-OPTIONS=	TOR_DEVEL	"Depend on tor-devel (already installed)"   On
>-.else
>-OPTIONS=	TOR	"Depend on tor (already installed)" On
>-.endif
>+OPTIONS_SINGLE=		TOR
>+OPTIONS_SINGLE_TOR=	TOR_STD TOR_DEVEL
> 
>-.else
>-OPTIONS=	TOR_DEVEL	"Depend on tor-devel"   On \
>-		TOR	"Depend on tor"     Off
>-.endif
>+TOR_STD_DESC=		Use stable security/tor port
>+TOR_DEVEL_DESC=		Use development security/tor-devel port
> 
>-OPTIONS+=	PRIVOXY	"Install privoxy"	On \
>-		MIXMINION "Install mixminion"	Off
>+OPTIONS_DEFAULT=	TOR_STD PRIVOXY
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
>-.if defined(WITH_TOR_DEVEL)
>-.if defined(WITH_TOR)
>-IGNORE=			cannot depend on tor and tor-devel at the same time
>-.endif
>+.if ${PORT_OPTIONS:MTOR_STD}
>+RUN_DEPENDS+=	${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor
>+.else
> RUN_DEPENDS+=	${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor-devel
>-.elif defined(WITH_TOR)
>-RUN_DEPENDS+=	${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor
> .endif
> 
>-.if defined(WITH_PRIVOXY)
>+.if ${PORT_OPTIONS:MPRIVOXY}
> RUN_DEPENDS+=	${LOCALBASE}/sbin/privoxy:${PORTSDIR}/www/privoxy
> .endif
> 
>-.if defined(WITH_MIXMINION)
>+.if ${PORT_OPTIONS:MMIXMINION}
> RUN_DEPENDS+=	${LOCALBASE}/bin/mixminion:${PORTSDIR}/mail/mixminion
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 317168)
>+++ pkg-descr	(working copy)
>@@ -1,7 +1,7 @@
> TorK is a powerful anonymity manager for the KDE Desktop on Linux and Unix
>-systems. It first helps you to install, configure and use Tor. It then
>-reduces the task of anonymizing most applications to a single-click, including
>-Firefox, Opera, Konqueror, Pidgin, Kopete, SSH, and IRC. For advanced users
>-TorK provides detailed network information, and more, in an accessible manner.
>+systems. It first helps you to install, configure and use Tor. It then reduces
>+the task of anonymizing most applications to a single-click, including Firefox,
>+Opera, Konqueror, Pidgin, Kopete, SSH, and IRC. For advanced users TorK provides
>+detailed network information, and more, in an accessible manner.
> 
>-WWW: http://www.anonymityanywhere.com/tork/
>+WWW: http://freecode.com/projects/tork

Actions: View | Diff

Attachments on bug 178303: 133773