2 files changed, 29 insertions, 31 deletions

diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile
index 54f31d9214e9..f85eacf6c227 100644
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tntnet
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	www devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
@@ -10,20 +11,19 @@ MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Webapplicationserver for C++
 
 LIB_DEPENDS=	libcxxtools.so:${PORTSDIR}/devel/cxxtools
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
-USES=		iconv pkgconfig pathfix
+USES=		iconv libtool pathfix pkgconfig
 USE_CSTD=	gnu89
 PATCH_STRIP=	-p1
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -pthread
-CONFIGURE_ARGS+=	--localstatedir=/var
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--localstatedir=/var
 
 .if defined(WITH_GNUTLS)
-LDFLAGS+=	-lgnutls
 CONFIGURE_ARGS+=	--with-ssl=gnutls
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--with-ssl=openssl
 .endif
diff --git a/www/tntnet/pkg-plist b/www/tntnet/pkg-plist
index d9c569d65bd9..7a515a105099 100644
--- a/www/tntnet/pkg-plist
+++ b/www/tntnet/pkg-plist
@@ -4,9 +4,7 @@ bin/ecppll
 bin/tntnet
 bin/tntnet-config
 %%ETCDIR%%/tntnet
-@unexec if cmp -s %D/%%ETCDIR%%/tntnet.xml.sample %D/%%ETCDIR%%/tntnet.xml; then rm -f %D/%%ETCDIR%%/tntnet.xml; fi
-%%ETCDIR%%/tntnet.xml.sample
-@exec if [ ! -f %D/%%ETCDIR%%/tntnet.xml ] ; then cp -p %D/%F %B/tntnet.xml; fi
+@sample %%ETCDIR%%/tntnet.xml.sample
 include/tnt/applicationunlocker.h
 include/tnt/backgroundworker.h
 include/tnt/cmd.h
@@ -61,73 +59,73 @@ include/tnt/urlescostream.h
 include/tnt/urlmapper.h
 include/tnt/worker.h
 include/tnt/zdata.h
-lib/libtntnet.la
 lib/libtntnet.so
 lib/libtntnet.so.12
-lib/libtntnet_sdk.la
+lib/libtntnet.so.12.0.0
 lib/libtntnet_sdk.so
 lib/libtntnet_sdk.so.12
-lib/tntnet/alldemos.la
+lib/libtntnet_sdk.so.12.0.0
 lib/tntnet/alldemos.so
 lib/tntnet/alldemos.so.0
-lib/tntnet/backgroundjob.la
+lib/tntnet/alldemos.so.0.0.0
 lib/tntnet/backgroundjob.so
 lib/tntnet/backgroundjob.so.0
-lib/tntnet/calc.la
+lib/tntnet/backgroundjob.so.0.0.0
 lib/tntnet/calc.so
 lib/tntnet/calc.so.0
-lib/tntnet/calcajax.la
+lib/tntnet/calc.so.0.0.0
 lib/tntnet/calcajax.so
 lib/tntnet/calcajax.so.0
-lib/tntnet/calci18n.la
+lib/tntnet/calcajax.so.0.0.0
 lib/tntnet/calci18n.so
 lib/tntnet/calci18n.so.0
-lib/tntnet/calcmvc.la
+lib/tntnet/calci18n.so.0.0.0
 lib/tntnet/calcmvc.so
 lib/tntnet/calcmvc.so.0
-lib/tntnet/chat.la
+lib/tntnet/calcmvc.so.0.0.0
 lib/tntnet/chat.so
 lib/tntnet/chat.so.0
-lib/tntnet/comp.la
+lib/tntnet/chat.so.0.0.0
 lib/tntnet/comp.so
 lib/tntnet/comp.so.0
-lib/tntnet/config.la
+lib/tntnet/comp.so.0.0.0
 lib/tntnet/config.so
 lib/tntnet/config.so.0
-lib/tntnet/controls.la
+lib/tntnet/config.so.0.0.0
 lib/tntnet/controls.so
 lib/tntnet/controls.so.0
-lib/tntnet/cookie.la
+lib/tntnet/controls.so.0.0.0
 lib/tntnet/cookie.so
 lib/tntnet/cookie.so.0
+lib/tntnet/cookie.so.0.0.0
 lib/tntnet/extlib.a
-lib/tntnet/extlib.la
 lib/tntnet/extlib.so
 lib/tntnet/extlib.so.0
-lib/tntnet/hello.la
+lib/tntnet/extlib.so.0.0.0
 lib/tntnet/hello.so
 lib/tntnet/hello.so.0
-lib/tntnet/message.la
+lib/tntnet/hello.so.0.0.0
 lib/tntnet/message.so
 lib/tntnet/message.so.0
-lib/tntnet/savepoint.la
+lib/tntnet/message.so.0.0.0
 lib/tntnet/savepoint.so
 lib/tntnet/savepoint.so.0
-lib/tntnet/session.la
+lib/tntnet/savepoint.so.0.0.0
 lib/tntnet/session.so
 lib/tntnet/session.so.0
-lib/tntnet/sprintf.la
+lib/tntnet/session.so.0.0.0
 lib/tntnet/sprintf.so
 lib/tntnet/sprintf.so.0
-lib/tntnet/strings.la
+lib/tntnet/sprintf.so.0.0.0
 lib/tntnet/strings.so
 lib/tntnet/strings.so.0
-lib/tntnet/tntnet.la
+lib/tntnet/strings.so.0.0.0
 lib/tntnet/tntnet.so
 lib/tntnet/tntnet.so.12
-lib/tntnet/upload.la
+lib/tntnet/tntnet.so.12.0.0
 lib/tntnet/upload.so
 lib/tntnet/upload.so.0
+lib/tntnet/upload.so.0.0.0
 man/man1/ecppc.1.gz
 man/man1/ecppl.1.gz
 man/man1/ecppll.1.gz