2 files changed, 22 insertions, 61 deletions
diff --git a/package/tntnet/Config.in b/package/tntnet/Config.in
deleted file mode 100644
index 0d4391674..000000000
--- a/package/tntnet/Config.in
+++ /dev/null
@@ -1,37 +0,0 @@
-config ADK_PACKAGE_TNTNET
-	prompt "tntnet............................ a modular, multithreaded webapplicationserver"
-	tristate
-	default n
-	depends on ADK_CXX
-	select ADK_PACKAGE_CXXTOOLS
-	select ADK_PACKAGE_LIBICONV
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_ZLIB
-	help
-	  Tntnet is a modular, multithreaded webapplicationserver
-	  written from scratch for C++.
-	  
-	  http://www.tntnet.org
-
-choice
-prompt "SSL/TLS Configuration"
-depends on ADK_PACKAGE_TNTNET
-default ADK_COMPILE_TNTNET_WITH_OPENSSL
-
-config ADK_COMPILE_TNTNET_WITHOUT_OPENSSL
-	bool "no ssl encryption support"
-	help
-
-config ADK_COMPILE_TNTNET_WITH_OPENSSL
-	bool "enable openssl encryption support"
-	depends on ADK_PACKAGE_TNTNET
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-
-config ADK_COMPILE_TNTNET_WITH_GNUTLS
-	bool "enable gnutls encryption support"
-	depends on ADK_PACKAGE_TNTNET
-	select ADK_PACKAGE_LIBGNUTLS
-	help
-
-endchoice
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 1358e58e6..183f4da2b 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -9,36 +9,34 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		e2c3c5075a890711a7569730493c0996
 PKG_DESCR:=		small C++ application server
 PKG_SECTION:=		net
-PKG_DEPENDS:=		cxxtools zlib libpthread libiconv
+PKG_DEPENDS:=		cxxtools zlib libiconv libpthread
+PKG_BUILDDEP+=		cxxtools zlib libiconv
+ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
+PKG_BUILDDEP+=		openssl
+else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},)
+PKG_BUILDDEP+=		gnutls
+endif
 PKG_URL:=		http://www.tntnet.org
 PKG_SITES:=		http://www.tntnet.org/download/
+#PKG_CXX:=		TNTNET
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
-ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y)
+ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
 PKG_DEPENDS+=		libopenssl
-endif
-
-ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y)
+else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},)
 PKG_DEPENDS+=		libgnutls
 endif
 
 $(eval $(call PKG_template,TNTNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
-TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
-TLDFLAGS+=		-nodefaultlibs -luClibc++ -liconv -lpthread -lcxxtools -lm
+ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y)
+TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E
+TLDFLAGS+=		-nodefaultlibs -luClibc++ -liconv -lpthread -lcxxtools -lm -ldl
 else
 TLDFLAGS+=		-liconv -lpthread -lcxxtools -lm -ldl
 endif
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-epoll \
 			--without-sdk \
 			--without-cgi \
@@ -52,15 +50,13 @@ CONFIGURE_ARGS+=	--without-ssl
 endif
 CONFIGURE_ENV+= 	CXXFLAGS='${TCXXFLAGS}' \
 			ac_cv_path_cxxtools_config=${STAGING_DIR}/usr/bin
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
-ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
+#ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y)
 # add workaround because libtool tries to link libstdc++
-post-configure:
-	${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
-	    ${WRKBUILD}/libtool
-endif
+#post-configure:
+#	${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
+#	    ${WRKBUILD}/libtool
+#endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_TNTNET}/www
@@ -72,7 +68,9 @@ post-install:
 	${INSTALL_DATA} ./files/mime.conf \
 		${IDIR_TNTNET}/etc/tntnet
 	${CP} ${WRKINST}/usr/bin/tntnet ${IDIR_TNTNET}/usr/bin
-	${CP} ${WRKINST}/usr/lib/tntnet/tntnet.so* ${IDIR_TNTNET}/usr/lib/tntnet
-	${CP} ${WRKINST}/usr/lib/libtntnet.so.* ${IDIR_TNTNET}/usr/lib
+	${CP} ${WRKINST}/usr/lib/tntnet/tntnet.so* \
+		${IDIR_TNTNET}/usr/lib/tntnet
+	${CP} ${WRKINST}/usr/lib/libtntnet.so.* \
+		${IDIR_TNTNET}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk