ports/177113: [MAINTAINER] update net/torsocks to version 1.2_1

[Andrei Lavreniyuk]

>Number:         177113
>Category:       ports
>Synopsis:       [MAINTAINER] update net/torsocks to version 1.2_1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 19 15:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Andrei Lavreniyuk
>Release:        FreeBSD 10.0-CURRENT
>Organization:
Technica-03, Inc.
>Environment:
FreeBSD 59.informalians.local 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r248491M(clang-r170710): Tue Mar 19 10:27:21 EET 2013     root at 59.informalians.local:/usr/obj/usr/src/sys/Kernel  amd64
>Description:

1. Fix port OPTIONS

2. Fix pkg-plist
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN torsocks.bak/Makefile torsocks/Makefile
--- torsocks.bak/Makefile	2013-03-19 17:07:00.000000000 +0200
+++ torsocks/Makefile	2013-03-19 17:04:33.000000000 +0200
@@ -1,20 +1,17 @@
-# New ports collection makefile for:	torsocks
-# Date created:				13 February 2009
-# Whom:					Andrei Lavreniyuk <andy.lavr at gmail.com>
-#
-# $FreeBSD: head/net/torsocks/Makefile 300897 2012-07-14 14:29:18Z beat $
+# Created by: Andrei Lavreniyuk <andy.lavr at gmail.com>
+# $FreeBSD: ports/net/torsocks/Makefile,v 1.11 2012/01/27 17:36:58 miwi Exp $
 
 PORTNAME=	torsocks
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net security
 MASTER_SITES=	GOOGLE_CODE \
 		http://tor.reactor-xg.kiev.ua/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	andy.lavr at gmail.com
 COMMENT=	Most SOCKS-friendly applications way with Tor
 
-USE_AUTOTOOLS=	libtool aclocal autoconf
+USE_AUTOTOOLS=	libtool aclocal autoconf libtoolize
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 
 USE_GMAKE=	yes
@@ -26,35 +23,26 @@
 
 SUB_FILES=	pkg-message
 
-OPTIONS=	SOCKSDNS "Use socks server for DNS lookups" off \
-		OLDMETHOD "Do not use RTLD_NEXT parameter to dlsym" off \
-		NODEBUG "Disable output of error messages" off \
-		HOSTNAMES "Enable DNS lookups of socks server" off
+OPTIONS_DEFINE=	OLDMETHOD NODEBUG DOCS
 
-.include <bsd.port.pre.mk>
+OPTIONS_SINGLE=		DNS
+OPTIONS_SINGLE_DNS=	DEFAULT SOCKSDNS HOSTNAMES
 
-.if defined(WITH_SOCKSDNS)
-CONFIGURE_ARGS+=	--enable-socksdns
-.endif
+SOCKSDNS_DESC=	Use socks server for DNS lookups
+OLDMETHOD_DESC=	Do not use RTLD_NEXT parameter to dlsym
+NODEBUG_DESC=	Disable output of error messages
+HOSTNAMES_DESC=	Enable DNS lookups of socks server
+DOCS_DESC=	Install examples and docs
+DEFAULT_DESC=	DNS lookups default
 
-.if defined(WITH_OLDMETHOD)
-CONFIGURE_ARGS+=	--enable-oldmethod
-.endif
+OPTIONS_DEFAULT=	DOCS DEFAULT
 
-.if defined(WITH_NODEBUG)
-CONFIGURE_ARGS+=	--disable-debug
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_HOSTNAMES)
-CONFIGURE_ARGS+=	--enable-hostnames
-.endif
-
-.if defined(WITH_SOCKSDNS) && defined(WITH_HOSTNAMES)
-BROKEN=		HOSTNAMES option is not allowed when SOCKSDNS option is enabled
-.endif
+.if ${PORT_OPTIONS:MSOCKSDNS}
+CONFIGURE_ARGS+=	--enable-socksdns
 
 pre-everything::
-.if !defined(WITH_SOCKSDNS)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can use the SOCKSDNS option."
 	@${ECHO_MSG} "This option causes torsocks to intercept"
@@ -64,7 +52,10 @@
 	@${ECHO_MSG}
 .endif
 
-.if !defined(WITH_OLDMETHOD)
+.if ${PORT_OPTIONS:MOLDMETHOD}
+CONFIGURE_ARGS+=	--enable-oldmethod
+
+pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can use the OLDMETHOD option."
 	@${ECHO_MSG} "This forces torsocks not to use the"
@@ -75,7 +66,10 @@
 	@${ECHO_MSG}
 .endif
 
-.if !defined(WITH_NODEBUG)
+.if ${PORT_OPTIONS:MNODEBUG}
+CONFIGURE_ARGS+=	--disable-debug
+
+pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can use the NODEBUG option."
 	@${ECHO_MSG} "This configuration option tells torsocks"
@@ -83,7 +77,10 @@
 	@${ECHO_MSG}
 .endif
 
-.if !defined(WITH_HOSTNAMES)
+.if ${PORT_OPTIONS:MHOSTNAMES}
+CONFIGURE_ARGS+=	--enable-hostnames
+
+pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can use the HOSTNAMES option."
 	@${ECHO_MSG} "This enables DNS lookups on names"
@@ -99,17 +96,16 @@
 	@${REINPLACE_CMD} -e 's|@prefix@|${PREFIX}|' ${WRKSRC}/src/torsocks.in
 	@${REINPLACE_CMD} -e 's|MAP_ANONYMOUS|MAP_ANON|' ${WRKSRC}/src/dead_pool.c
 	@${MV} ${WRKSRC}/doc/torsocks.conf ${WRKSRC}/doc/torsocks.conf.sample
+	@${MV} ${WRKSRC}/configure.in ${WRKSRC}/configure.ac
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.sample ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.sample ${PREFIX}/etc
-.endif
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN torsocks.bak/files/patch-configure.in torsocks/files/patch-configure.in
--- torsocks.bak/files/patch-configure.in	1970-01-01 03:00:00.000000000 +0300
+++ torsocks/files/patch-configure.in	2013-03-19 16:21:08.000000000 +0200
@@ -0,0 +1,19 @@
+--- configure.in.orig	2011-10-24 22:30:58.000000000 +0300
++++ configure.in	2013-03-19 16:17:59.000000000 +0200
+@@ -3,13 +3,13 @@
+ ##############################################################################
+ 
+ # Process this file with autoconf to produce a configure script.
+-AC_INIT()
++AC_INIT([torsocks], [1.2])
+ 
+ # Create a config.g file to store defines generated by configure
+-AC_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER([config.h])
+ 
+ # Automake initialization
+-AM_INIT_AUTOMAKE(torsocks, 1.2)
++AM_INIT_AUTOMAKE()
+ 
+ # Get hostname and other information.
+ AC_CANONICAL_HOST
diff -ruN torsocks.bak/pkg-plist torsocks/pkg-plist
--- torsocks.bak/pkg-plist	2013-03-19 17:07:00.000000000 +0200
+++ torsocks/pkg-plist	2013-03-19 16:26:58.000000000 +0200
@@ -5,23 +5,23 @@
 lib/libtorsocks.la
 lib/libtorsocks.so
 lib/libtorsocks.so.1
-share/torsocks/DEBUG
-share/torsocks/README
-share/torsocks/README.TORDNS
-share/torsocks/SOCKS4.protocol
-share/torsocks/SOCKS5
-share/torsocks/compilewarnings.patch
-share/torsocks/conffile.patch
-share/torsocks/getaddrbyhost.patch
-share/torsocks/getpeername.patch
-share/torsocks/infiniteloop.patch
-share/torsocks/localaddresses.patch
-share/torsocks/socks-extensions.txt
-share/torsocks/tordns.patch
-share/torsocks/test/expectedresults.txt
-share/torsocks/test/run_tests.sh
- at dirrm share/torsocks/test
- at dirrm share/torsocks
+%%DATADIR%%/DEBUG
+%%DATADIR%%/README
+%%DATADIR%%/README.TORDNS
+%%DATADIR%%/SOCKS4.protocol
+%%DATADIR%%/SOCKS5
+%%DATADIR%%/compilewarnings.patch
+%%DATADIR%%/conffile.patch
+%%DATADIR%%/getaddrbyhost.patch
+%%DATADIR%%/getpeername.patch
+%%DATADIR%%/infiniteloop.patch
+%%DATADIR%%/localaddresses.patch
+%%DATADIR%%/socks-extensions.txt
+%%DATADIR%%/tordns.patch
+%%DATADIR%%/test/expectedresults.txt
+%%DATADIR%%/test/run_tests.sh
+ at dirrm %%DATADIR%%/test
+ at dirrm %%DATADIR%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/torsocks.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%


>Release-Note:
>Audit-Trail:
>Unformatted: