- Update to 3.1

PR:		ports/106548
Submitted by:	"ports@c0decafe.net" <ports@c0decafe.net>
Approved by:	maintainer

11 files changed, 69 insertions, 69 deletions

diff --git a/net/proxychains/Makefile b/net/proxychains/Makefile
index c5bf58f39a6b..c7f62d164184 100644
--- a/net/proxychains/Makefile
+++ b/net/proxychains/Makefile
@@ -4,30 +4,29 @@
 # $FreeBSD$
 
 PORTNAME=	proxychains
-PORTVERSION=	2.1
+PORTVERSION=	3.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	proxychains
 
 MAINTAINER=	mycroft@virgaria.org
-COMMENT=	Multi-proxifier
+COMMENT=	Redirect connection through proxy servers
 
-USE_AUTOTOOLS=	automake:14 autoconf:213
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 
-INSTALLS_SHLIB=	yes
+.include <bsd.port.pre.mk>
 
-post-extract:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/proxychains/Makefile.in
+.if ${OSVERSION} < 600000
+BROKEN=		Does not compile on 4.x and 5.x
+.endif
 
-pre-build:
-	${RM} ${WRKSRC}/config.h
+.if ${OSVERSION} < 700017
+EXTRA_PATCHES=	${PATCHDIR}/gethostbyaddr-proto-int
+.endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/proxychains/proxychains ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/proxychains/proxychains.conf \
-		${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/proxychains/.libs/libproxychains.so.2 \
-		${PREFIX}/lib
+post-configure:
+	@${ECHO_CMD} '#define PREFIX "${PREFIX}"' >> ${WRKSRC}/config.h
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/proxychains/distinfo b/net/proxychains/distinfo
index 4de7ba4fddb2..ddf4d302addd 100644
--- a/net/proxychains/distinfo
+++ b/net/proxychains/distinfo
@@ -1,3 +1,3 @@
-MD5 (proxychains-2.1.tar.gz) = 5f54d41265a20ae48c261a53ca603139
-SHA256 (proxychains-2.1.tar.gz) = ca7d6483a2ef8459e0b3c61cc1b0da176628518c16c4c9b9aea8c044554245db
-SIZE (proxychains-2.1.tar.gz) = 181095
+MD5 (proxychains-3.1.tar.gz) = 4629c156001ab70aa7e98960eb513148
+SHA256 (proxychains-3.1.tar.gz) = 9a27657fe9f6e17de9e402ba5c60f9954e7e79fb270c1ef242770f3c01d8515a
+SIZE (proxychains-3.1.tar.gz) = 327057
diff --git a/net/proxychains/files/gethostbyaddr-proto-int b/net/proxychains/files/gethostbyaddr-proto-int
new file mode 100644
index 000000000000..1acdd8b89737
--- /dev/null
+++ b/net/proxychains/files/gethostbyaddr-proto-int
@@ -0,0 +1,12 @@
+--- proxychains/libproxychains.c	Wed Mar 15 18:16:59 2006
++++ proxychains/libproxychains.c	Thu Dec  7 15:34:57 2006
+@@ -308,8 +308,7 @@
+ 	PDEBUG("getnameinfo: %s %s\n", host, serv);
+ 	return ret;
+ }
+-struct hostent *gethostbyaddr (const void *addr, socklen_t len,
+-		                                      int type)
++struct hostent *gethostbyaddr (const void *addr, int len, int type)
+ {
+ 	PDEBUG("TODO: gethostbyaddr hook\n"); 
+ 	if(!init_l)
diff --git a/net/proxychains/files/patch-::acconfig.h b/net/proxychains/files/patch-::acconfig.h
deleted file mode 100644
index e020c43e417b..000000000000
--- a/net/proxychains/files/patch-::acconfig.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- acconfig.h.orig	Thu Jun 24 12:07:12 2004
-+++ acconfig.h	Thu Jun 24 12:07:20 2004
-@@ -7,3 +7,5 @@
- 
- /* Define if you need the GNU extensions to compile */
- #undef _GNU_SOURCE
-+
-+#undef PREFIX_DIR
diff --git a/net/proxychains/files/patch-::configure.in b/net/proxychains/files/patch-::configure.in
deleted file mode 100644
index 62e9c081da97..000000000000
--- a/net/proxychains/files/patch-::configure.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.in.orig	Fri May  7 11:34:58 2004
-+++ configure.in	Thu Jun 24 14:56:30 2004
-@@ -12,11 +12,14 @@
- 
- AM_INIT_AUTOMAKE(proxychains,2.1)
- 
--AC_PREFIX_DEFAULT(/usr)
-+AC_PREFIX_DEFAULT(/usr/local)
- if test "x$prefix" = "xNONE"; then
-   prefix=$ac_default_prefix
-   ac_configure_args="$ac_configure_args --prefix $prefix"
-+else
-+  prefix=$prefix
- fi
-+AC_DEFINE_UNQUOTED(PREFIX_DIR, "${prefix}")
- 
- dnl without this order in this file, automake will be confused!
- dnl 
diff --git a/net/proxychains/files/patch-proxychains-Makefile.in b/net/proxychains/files/patch-proxychains-Makefile.in
new file mode 100644
index 000000000000..8e0977ff1059
--- /dev/null
+++ b/net/proxychains/files/patch-proxychains-Makefile.in
@@ -0,0 +1,11 @@
+--- proxychains/Makefile.in.old	Sat Dec  9 23:46:05 2006
++++ proxychains/Makefile.in	Sat Dec  9 23:48:44 2006
+@@ -105,7 +105,7 @@
+ #proxychains_LDFLAGS = $(all_libraries)
+ lib_LTLIBRARIES = libproxychains.la
+ libproxychains_la_LDFLAGS = -version-info 3:0:0 $(all_libraries)
+-libproxychains_la_LIBADD = -ldl
++libproxychains_la_LIBADD = 
+ noinst_HEADERS = core.h
+ libproxychains_la_SOURCES = libproxychains.c core.c
+ libproxychains_la_METASOURCES = USE_AUTOMOC
diff --git a/net/proxychains/files/patch-proxychains-libproxychains.c b/net/proxychains/files/patch-proxychains-libproxychains.c
new file mode 100644
index 000000000000..f2492bc1b3c5
--- /dev/null
+++ b/net/proxychains/files/patch-proxychains-libproxychains.c
@@ -0,0 +1,22 @@
+--- proxychains/libproxychains.c.orig	Wed Mar 15 18:16:59 2006
++++ proxychains/libproxychains.c	Sun Dec 10 01:16:37 2006
+@@ -160,7 +160,7 @@
+ 
+ 	if(!(file=fopen("./proxychains.conf","r")))
+ 	if(!(file=fopen(buff,"r")))
+-	if(!(file=fopen("/etc/proxychains.conf","r")))
++	if(!(file=fopen(PREFIX "/etc/proxychains.conf","r")))
+ 	{
+ 		perror("Can't locate proxychains.conf");
+ 		exit(1);
+@@ -290,8 +290,8 @@
+ 
+ int getnameinfo (const struct sockaddr * sa,
+ 			socklen_t salen, char * host,
+-			socklen_t hostlen, char * serv,
+-			socklen_t servlen, unsigned int flags)
++			size_t hostlen, char * serv,
++			size_t servlen, int flags)
+ {
+ 	int ret = 0;
+ 	if(!init_l)
diff --git a/net/proxychains/files/patch-proxychains::libproxychains.c b/net/proxychains/files/patch-proxychains::libproxychains.c
deleted file mode 100644
index f083d27ad508..000000000000
--- a/net/proxychains/files/patch-proxychains::libproxychains.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- proxychains/libproxychains.c.orig	Fri May  7 11:34:59 2004
-+++ proxychains/libproxychains.c	Thu Jun 24 10:54:27 2004
-@@ -73,7 +73,7 @@
- 
-    if(!(file=fopen("./proxychains.conf","r")))
-         if(!(file=fopen(buff,"r")))
--                if(!(file=fopen("/etc/proxychains.conf","r")))
-+                if(!(file=fopen(PREFIX_DIR "/etc/proxychains.conf","r")))
-                 {
-                         perror("Can't locate proxychains.conf");
-                         exit(1);
diff --git a/net/proxychains/files/patch-proxychains::main.c b/net/proxychains/files/patch-proxychains::main.c
deleted file mode 100644
index 74394c262773..000000000000
--- a/net/proxychains/files/patch-proxychains::main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- proxychains/main.c.orig	Thu Jun 24 13:13:46 2004
-+++ proxychains/main.c	Thu Jun 24 13:14:05 2004
-@@ -41,7 +41,7 @@
-                  "More help in README file\n");
-         return 0 ;
-   }
--  putenv("LD_PRELOAD=/usr/lib/libproxychains.so");
-+  putenv("LD_PRELOAD=" PREFIX_DIR "/lib/libproxychains.so.2");
-   execvp(argv[1],&argv[1]);
-   perror("proxychains can't load process....");
-   return EXIT_SUCCESS;
diff --git a/net/proxychains/pkg-descr b/net/proxychains/pkg-descr
index 42e2504413aa..43461a1ac4d4 100644
--- a/net/proxychains/pkg-descr
+++ b/net/proxychains/pkg-descr
@@ -4,4 +4,4 @@ This program forces any tcp connection made by any given tcp client
 to follow through proxy (or proxy chain). It is a kind of proxifier.
 It acts like sockscap / permeo / eborder driver (intercepts TCP calls).
 
-WWW: http://proxylabs.netwu.com/proxychains/index.html
+WWW:	http://proxychains.sourceforge.net/
diff --git a/net/proxychains/pkg-plist b/net/proxychains/pkg-plist
index 91233c282261..77b2504635a2 100644
--- a/net/proxychains/pkg-plist
+++ b/net/proxychains/pkg-plist
@@ -1,3 +1,7 @@
 bin/proxychains
+bin/proxyresolv
 etc/proxychains.conf
-lib/libproxychains.so.2
+lib/libproxychains.so.3
+lib/libproxychains.so
+lib/libproxychains.la
+lib/libproxychains.a