Index: head/net/3proxy/Makefile
===================================================================
--- head/net/3proxy/Makefile	(revision 367151)
+++ head/net/3proxy/Makefile	(revision 367152)
@@ -1,50 +1,41 @@
 # Created by: tim@relay.nnn.tstu.ru
 # $FreeBSD$
 
 PORTNAME=	3proxy
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://3proxy.ru/${PORTVERSION}/ \
 		http://security.nnov.ru/soft/3proxy/${PORTVERSION}/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)
 
-CONFLICTS=	libproxy-[0-9]*
+LICENSE=	APACHE20 BSD2CLAUSE GPLv2 GPLv3 LGPL21 LGPL3
+LICENSE_COMB=	dual
 
-USE_RC_SUBR=	3proxy
+CONFLICTS_INSTALL=	libproxy-[0-9]*
+
+OPTIONS_DEFINE=	DOCS
+
+MAKE_ENV=	PTHREAD_LIBS=-pthread
 MAKEFILE=	Makefile.unix
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
+USE_RC_SUBR=	3proxy
+USES=		tar:tgz
 
-MAN3=	3proxy.cfg.3
-MAN8=	3proxy.8 ftppr.8 pop3p.8 proxy.8 socks.8 tcppm.8 udppm.8
+PORTDOCS=	Readme
 
-NO_STAGE=	yes
 post-patch:
-	${REINPLACE_CMD} -e "s|%%CFLAGS%%|${CFLAGS}|" \
-		${WRKSRC}/Makefile.unix
+	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${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}
-	${INSTALL_MAN} ${WRKSRC}/man/${i} ${PREFIX}/man/man8
-.endfor
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Readme ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts ftppr icqpr msnpr mycrypt pop3p proxy smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/
+	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/
+	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
+	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/
+	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 proxy.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/net/3proxy/pkg-plist
===================================================================
--- head/net/3proxy/pkg-plist	(revision 367151)
+++ head/net/3proxy/pkg-plist	(revision 367152)
@@ -1,20 +1,26 @@
 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
+@sample etc/3proxy.cfg.sample
 lib/3proxy/PCREPlugin.so
 lib/3proxy/StringsPlugin.so
 lib/3proxy/TrafficPlugin.so
-%%PORTDOCS%%%%DOCSDIR%%/Readme
+man/man3/3proxy.cfg.3.gz
+man/man8/3proxy.8.gz
+man/man8/ftppr.8.gz
+man/man8/pop3p.8.gz
+man/man8/proxy.8.gz
+man/man8/socks.8.gz
+man/man8/tcppm.8.gz
+man/man8/udppm.8.gz
 @dirrm lib/3proxy
-%%PORTDOCS%%@dirrm %%DOCSDIR%%