- Fix build with recently renamed qt4-linguist binaries

- Update pkg-message: Tor's control port can also be
  specified through Vidalia's configuration file.
- Clean up Tor detection (as seen in security/dns-proxy-tor)
- Bump PORTREVISION

Submitted by:	krisbot
                Fabian Keil (maintainer)

2 files changed, 22 insertions, 9 deletions

diff --git a/net-mgmt/vidalia/Makefile b/net-mgmt/vidalia/Makefile
index b4e8b65a2ad1..b94ac6bb292c 100644
--- a/net-mgmt/vidalia/Makefile
+++ b/net-mgmt/vidalia/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vidalia
 PORTVERSION=	0.0.11
+PORTREVISION=	1
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://vidalia-project.net:8001/\
 		http://tor.eff.org/dist/vidalia-bundles/
@@ -23,24 +24,29 @@ USE_GMAKE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui moc qmake rcc uic network xml linguist
 
-OPTIONS=	TOR_DEVEL	"Depend on tor-devel"	On	\
-		TOR		"Depend on tor"		Off
+HAVE_TOR!=	if pkg_info -I tor-\* >/dev/null 2>&1 ; then ${ECHO} YES; fi
 
+.if (${HAVE_TOR} == "YES")
 HAVE_TOR_DEVEL!=	if pkg_info -I tor-devel\* >/dev/null 2>&1 ; then ${ECHO} YES; fi
+
 .if (${HAVE_TOR_DEVEL} == "YES")
 OPTIONS=	TOR_DEVEL	"Depend on tor-devel (already installed)"	On
 .else
-HAVE_TOR_DEVEL!=	if pkg_info -I tor-\* >/dev/null 2>&1 ; then ${ECHO} YES; fi
-.endif
-.if (defined(HAVE_TOR) && ${HAVE_TOR} == "YES")
 OPTIONS=	TOR		"Depend on tor (already installed)"	On
 .endif
 
+.else
+
+OPTIONS=	TOR_DEVEL	"Depend on tor-devel"	On \
+		TOR		"Depend on tor"		Off
+
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_TOR_DEVEL)
 .if defined(WITH_TOR)
-IGNORE=	cannot depend on tor and tor-devel at the same time
+IGNORE=		cannot depend on tor and tor-devel at the same time
 .endif
 RUN_DEPENDS+=	${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor-devel
 .elif defined(WITH_TOR)
@@ -50,6 +56,9 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor
 pre-extract:
 	@${CAT} ${PKGMESSAGE}
 
+post-extract:
+	${REINPLACE_CMD} -e 's@/bin/lrelease@/bin/lrelease-qt4@' ${WRKSRC}/configure
+
 post-configure:
 .if defined(TOR_CONTROL_ADDR)
 	 ${REINPLACE_CMD} -e 's@127\.0\.0\.1@${TOR_CONTROL_ADDR}@' ${WRKSRC}/src/config/torsettings.cpp
diff --git a/net-mgmt/vidalia/pkg-message b/net-mgmt/vidalia/pkg-message
index 4af803f9597e..a3162c35685a 100644
--- a/net-mgmt/vidalia/pkg-message
+++ b/net-mgmt/vidalia/pkg-message
@@ -1,7 +1,11 @@
 If your Onion Router isn't listening on 127.0.0.1,
-you can build the Vidalia port with TOR_CONTROL_ADDR
-set to something else. You can't change this address
-through Vidalia's GUI.
+either build the Vidalia port with TOR_CONTROL_ADDR
+set to the Onion Router's IP address, or specify it
+with the ControlAddr variable in the "[Tor]" section
+of ~/.vidalia/vidalia.conf. Example:
+
+ [Tor]
+ ControlAddr=10.0.0.2
 
 Note that Vidalia requires systray support to do anything
 useful (you need the systray icon to open Vidalia's windows).