4 files changed, 31 insertions, 17 deletions

diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile
index aef3e4f5a779..1ca71508d340 100644
--- a/net/3proxy/Makefile
+++ b/net/3proxy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	3proxy
-PORTVERSION=	0.5.3k
+PORTVERSION=	0.6
 CATEGORIES=	net
 MASTER_SITES=	http://3proxy.ru/${PORTVERSION}/ \
 		http://security.nnov.ru/soft/3proxy/${PORTVERSION}/
@@ -15,13 +15,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)
 
-NO_WRKSUBDIR=	yes
 USE_RC_SUBR=	3proxy.sh
 MAKEFILE=	Makefile.unix
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 
-MAN3=	3proxy.conf.3
+MAN3=	3proxy.cfg.3
 MAN8=	3proxy.8 ftppr.8 pop3p.8 proxy.8 socks.8 tcppm.8 udppm.8
 
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
@@ -31,9 +30,14 @@ post-patch:
 		${WRKDIR}/Makefile.unix
 
 do-install:
-.for i in 3proxy dighosts ftppr mycrypt pop3p proxy socks tcppm udppm
+	${MKDIR} ${PREFIX}/lib/${PORTNAME}
+.for i in 3proxy countersutil dighosts ftppr icqpr msnpr \
+	mycrypt pop3p proxy smtpp socks tcppm udppm
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${PREFIX}/bin/
 .endfor
+.for p in PCREPlugin.so StringsPlugin.so TrafficPlugin.so
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${p} ${PREFIX}/lib/${PORTNAME}
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/cfg/3proxy.cfg.sample ${PREFIX}/etc
 	${INSTALL_MAN} ${WRKSRC}/man/${MAN3} ${PREFIX}/man/man3
 .for i in ${MAN8}
@@ -43,9 +47,7 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in License Readme Release.notes
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/Readme ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/3proxy/distinfo b/net/3proxy/distinfo
index 046ee5587a4e..561b4ceb455e 100644
--- a/net/3proxy/distinfo
+++ b/net/3proxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (3proxy-0.5.3k.tgz) = 4749c88201ba540707bcfc65fa34f316
-SHA256 (3proxy-0.5.3k.tgz) = 7bbe159a0157480c653ef3976495a9b1993435a44ea0e7c03784320e3ac28ea3
-SIZE (3proxy-0.5.3k.tgz) = 190797
+MD5 (3proxy-0.6.tgz) = 2ebd9c06939021f6c2aca31d67782f71
+SHA256 (3proxy-0.6.tgz) = fbeec42136598afb7eab212c925501b27855b07281142b2f1bbc97c14c204fde
+SIZE (3proxy-0.6.tgz) = 478906
diff --git a/net/3proxy/files/patch-Makefile.unix b/net/3proxy/files/patch-Makefile.unix
index c5ff5f9c2b96..70d9c7f2c8e4 100644
--- a/net/3proxy/files/patch-Makefile.unix
+++ b/net/3proxy/files/patch-Makefile.unix
@@ -1,9 +1,9 @@
---- Makefile.unix.orig	Mon May 30 11:14:05 2005
-+++ Makefile.unix	Mon May 30 11:15:25 2005
-@@ -6,13 +6,13 @@
- # libraries
- 
+--- Makefile.unix.orig	2007-04-10 20:29:25.000000000 +0400
++++ Makefile.unix	2009-03-23 13:53:24.000000000 +0300
+@@ -9,18 +9,18 @@
+ # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
  
+ BUILDDIR =
 -CC = gcc
 +CC ?= gcc
  
@@ -16,5 +16,11 @@
 +LN ?= ${CC}
 +LDFLAGS = -Wall ${PTHREAD_LIBS}
  # -lpthreads may be reuqired on some platforms instead of -pthreads
+ # -ldl or -lld may be required for some platforms
+ DCFLAGS = -fpic
+ DLFLAGS = -shared
+-DLSUFFICS = .ld.so
++DLSUFFICS = .so
  LIBS =
  LNOUT = -o 
+ EXESUFFICS =
diff --git a/net/3proxy/pkg-plist b/net/3proxy/pkg-plist
index 4557e3f903ae..2bf760d29f98 100644
--- a/net/3proxy/pkg-plist
+++ b/net/3proxy/pkg-plist
@@ -1,14 +1,20 @@
 bin/3proxy
+bin/countersutil
 bin/dighosts
 bin/ftppr
+bin/icqpr
+bin/msnpr
 bin/mycrypt
 bin/pop3p
 bin/proxy
+bin/smtpp
 bin/socks
 bin/tcppm
 bin/udppm
 etc/3proxy.cfg.sample
-%%PORTDOCS%%%%DOCSDIR%%/License
+lib/3proxy/PCREPlugin.so
+lib/3proxy/StringsPlugin.so
+lib/3proxy/TrafficPlugin.so
 %%PORTDOCS%%%%DOCSDIR%%/Readme
-%%PORTDOCS%%%%DOCSDIR%%/Release.notes
+@dirrm lib/3proxy
 %%PORTDOCS%%@dirrm %%DOCSDIR%%