Merge branch 'master' of ssh://openadk.org/git/openadk

resolve conflicts

Conflicts:

	mk/pkg-bottom.mk
	package/ctorrent/Makefile
	package/gcc/Makefile
	package/gmp/Makefile
	package/id3lib/Makefile
	package/libelf/Makefile
	package/libnl/patches/patch-include_netlink-local_h
	package/mpd/Makefile
	package/nmap/Makefile
	package/rrs/Makefile
	package/weechat/Makefile
	scripts/rstrip.sh
	target/Config.in

4 files changed, 20 insertions, 11 deletions

diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 58f987b85..59c45ed5c 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -9,19 +9,35 @@ PKG_NAME:=		tntnet
 PKG_VERSION:=		1.6.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e2c3c5075a890711a7569730493c0996
-MASTER_SITES:=		http://www.tntnet.org/download/
+PKG_DESCR:=		small C++ application server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		cxxtools zlib libpthread libiconv
+PKG_URL:=		http://www.tntnet.org
+PKG_SITES:=		http://www.tntnet.org/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE}))
+ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
+PKG_DEPENDS+=		uclibc++
+else
+PKG_DEPENDS+=		libstdcxx
+endif
+
+ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y)
+PKG_DEPENDS+=		libopenssl
+endif
+
+ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y)
+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
-DEPENDS=		libgcc, uclibc++, cxxtools, zlib, libpthread, libiconv
 else
 TLDFLAGS+=		-liconv -lpthread -lcxxtools -lm -ldl
-DEPENDS=		libgcc, libstdcxx, cxxtools, zlib, libpthread, libiconv
 endif
 
 CONFIGURE_STYLE:=	gnu
@@ -31,10 +47,8 @@ CONFIGURE_ARGS+=	--without-epoll \
 			--without-sendfile
 ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--with-ssl=openssl
-SSL_DEPS=		", libopenssl"
 else ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y)
 CONFIGURE_ARGS+=	--with-ssl=gnutls
-SSL_DEPS=		", libgnutls"
 else
 CONFIGURE_ARGS+=	--without-ssl
 endif
@@ -62,6 +76,5 @@ post-install:
 	${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
-	echo Depends: ${DEPENDS}${SSL_DEPS} >>${IDIR_TNTNET}/CONTROL/control
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tntnet/ipkg/tntnet.conffiles b/package/tntnet/files/tntnet.conffiles
index def08bf81..def08bf81 100644
--- a/package/tntnet/ipkg/tntnet.conffiles
+++ b/package/tntnet/files/tntnet.conffiles
diff --git a/package/tntnet/ipkg/tntnet.postinst b/package/tntnet/files/tntnet.postinst
index 9d462f8d3..9d462f8d3 100644
--- a/package/tntnet/ipkg/tntnet.postinst
+++ b/package/tntnet/files/tntnet.postinst
diff --git a/package/tntnet/ipkg/tntnet.control b/package/tntnet/ipkg/tntnet.control
deleted file mode 100644
index 788b3b450..000000000
--- a/package/tntnet/ipkg/tntnet.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: tntnet
-Priority: optional
-Section: net
-Description: a modular, multithreaded webapplicationserver