- Update tork to 0.27

- Add optional dependency on mixminion
- Fix some whitespaces in pkg-descr

PR:		121776
Submitted by:	Beat Gaetzi <beat@chruetertee.ch>
Approved by:	maintainer via irc

4 files changed, 15 insertions, 14 deletions

diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index 73925ccfbdb6..36f7699342bc 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tork
-PORTVERSION=	0.26
+PORTVERSION=	0.27
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	SF
 
@@ -44,7 +44,8 @@ OPTIONS=	TOR_DEVEL	"Depend on tor-devel"   On \
 		TOR	"Depend on tor"     Off
 .endif
 
-OPTIONS+=	PRIVOXY	"Install privoxy"	On
+OPTIONS+=	PRIVOXY	"Install privoxy"	On \
+		MIXMINION "Install mixminion"	Off
 
 .include <bsd.port.pre.mk>
 
@@ -61,4 +62,8 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor
 RUN_DEPENDS+=	${LOCALBASE}/sbin/privoxy:${PORTSDIR}/www/privoxy
 .endif
 
+.if defined(WITH_MIXMINION)
+RUN_DEPENDS+=	${LOCALBASE}/bin/mixminion:${PORTSDIR}/mail/mixminion
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/tork/distinfo b/net-mgmt/tork/distinfo
index dd970645369b..2605203c76ed 100644
--- a/net-mgmt/tork/distinfo
+++ b/net-mgmt/tork/distinfo
@@ -1,3 +1,3 @@
-MD5 (tork-0.26.tar.gz) = 534600d75ba02d8e45a179f6a9e3f426
-SHA256 (tork-0.26.tar.gz) = 984a734e3d06c30ce745d1f3d50e657de2e86dd94a491208d5a93dcfcff39c1c
-SIZE (tork-0.26.tar.gz) = 3192708
+MD5 (tork-0.27.tar.gz) = 491f1ce831e76ddebddaeb9e87fd892f
+SHA256 (tork-0.27.tar.gz) = 0f819824a6043ea8e3f66d646952337db258b0c3deaecbae4e103fab419307bc
+SIZE (tork-0.27.tar.gz) = 3158051
diff --git a/net-mgmt/tork/pkg-descr b/net-mgmt/tork/pkg-descr
index 5fe36c7d4d04..4a6a27f214c5 100644
--- a/net-mgmt/tork/pkg-descr
+++ b/net-mgmt/tork/pkg-descr
@@ -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
+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
+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/
diff --git a/net-mgmt/tork/pkg-plist b/net-mgmt/tork/pkg-plist
index c0480238222f..e615e90a1f34 100644
--- a/net-mgmt/tork/pkg-plist
+++ b/net-mgmt/tork/pkg-plist
@@ -35,7 +35,6 @@ share/apps/tork/icons/hicolor/22x22/actions/tokr_green.png
 share/apps/tork/icons/hicolor/22x22/actions/tork.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_green.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_green_exit.png
-share/apps/tork/icons/hicolor/22x22/actions/tork_greenserver.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_guard_detached.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_guard_down.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_guard_little.png
@@ -47,22 +46,19 @@ share/apps/tork/icons/hicolor/22x22/actions/tork_konqueror_https.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_konsole_https.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_little.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_little_exit.png
-share/apps/tork/icons/hicolor/22x22/actions/tork_littleserver.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_none.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_orange.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_orange_exit.png
-share/apps/tork/icons/hicolor/22x22/actions/tork_orangeserver.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_play.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_red.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_red_exit.png
-share/apps/tork/icons/hicolor/22x22/actions/tork_redserver.png
+share/apps/tork/icons/hicolor/22x22/actions/tork_server.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_stop.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_tor.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_torsmall.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_uncensor.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_yellow.png
 share/apps/tork/icons/hicolor/22x22/actions/tork_yellow_exit.png
-share/apps/tork/icons/hicolor/22x22/actions/tork_yellowserver.png
 share/apps/tork/icons/hicolor/22x22/apps/tork_19.png
 share/apps/tork/icons/hicolor/22x22/apps/tork_33.png
 share/apps/tork/icons/hicolor/22x22/apps/tork_FAILED.png
@@ -420,7 +416,6 @@ share/services/torioslave.protocol
 @dirrm share/locale/libkickermenu_tork-fr
 @dirrm share/locale/libkickermenu_tork-cs/LC_MESSAGES
 @dirrm share/locale/libkickermenu_tork-cs
-@dirrm share/config.kcfg
 @dirrm share/apps/tork/privoxy/templates
 @dirrm share/apps/tork/privoxy
 @dirrm share/apps/tork/icons/hicolor/48x48/apps
@@ -441,7 +436,6 @@ share/services/torioslave.protocol
 @dirrm lib/tork
 @dirrmtry share/services
 @dirrmtry share/menu
-@dirrmtry lib/kde3
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor/32x32/actions
@@ -454,6 +448,7 @@ share/services/torioslave.protocol
 @dirrmtry share/doc/HTML/en/tork
 @dirrmtry share/doc/HTML/en
 @dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
 @dirrmtry share/apps/kicker/menuext
 @dirrmtry share/apps/kicker
 @dirrmtry share/apps/konqueror/servicemenus
@@ -463,3 +458,4 @@ share/services/torioslave.protocol
 @dirrmtry share/apps
 @dirrmtry share/applications/kde
 @dirrmtry share/applications
+@dirrmtry lib/kde3