Date: Fri, 3 May 2013 01:15:55 +0200 (CEST) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/178303: [patch] rewrite net-mgmt/tork to use new options framework and comply with bmake Message-ID: <201305022315.r42NFtnj032294@freefall.freebsd.org> Resent-Message-ID: <201305022320.r42NK0r4032476@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 178303
>Category: ports
>Synopsis: [patch] rewrite net-mgmt/tork to use new options framework and comply with bmake
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu May 02 23:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Emanuel Haupt
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r249172: Sat Apr 6 00:40:01 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
- Rewrite net-mgmt/tork to use new options framework
- Fix build with devel/bmake
- WWW disappeared, use freecode page as an alternative
>How-To-Repeat:
>Fix:
--- tork.patch begins here ---
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
--- tork.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305022315.r42NFtnj032294>