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

6 files changed, 13 insertions, 33 deletions

diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 059f13c67..1f14ebf2d 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -9,24 +9,29 @@ PKG_NAME:=		gnutls
 PKG_VERSION:=		2.6.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ca2489e29f9dc313a79b9747bb1090e5
+PKG_DESCR:=		GNU TLS library
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libgcrypt libtasn1 zlib
+PKG_URL:=		http://www.gnu.org/software/gnutls
+PKG_SITES:=		${MASTER_SITE_GNU:=gnutls/}
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
-MASTER_SITES:=		${MASTER_SITE_GNU:=gnutls/}
 
 include ${TOPDIR}/mk/package.mk
 
 ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y)
 TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
 TLDFLAGS+=		-nodefaultlibs -luClibc++
-PKG_DEPENDS:=		uclibc++
+PKG_DEPENDS_1:=		${PKG_DEPENDS} uclibc++
 else
-PKG_DEPENDS:=		libstdcxx
+PKG_DEPENDS_1:=		${PKG_DEPENDS} libstdcxx
 endif
 
-$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
-$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
-$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
-$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
-$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}))
+$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--without-libopencdk-prefix \
diff --git a/package/gnutls/ipkg/gnutls-utils.control b/package/gnutls/ipkg/gnutls-utils.control
deleted file mode 100644
index 856d704a8..000000000
--- a/package/gnutls/ipkg/gnutls-utils.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: gnutls-utils
-Priority: optional
-Section: admin
-Description: GNU TLS utilities
-Depends: libgnutls, libgnutls-extra
diff --git a/package/gnutls/ipkg/libgnutls-extra.control b/package/gnutls/ipkg/libgnutls-extra.control
deleted file mode 100644
index 332384a1b..000000000
--- a/package/gnutls/ipkg/libgnutls-extra.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: libgnutls-extra
-Priority: optional
-Section: libs
-Description: GNU TLS extra library
-Depends: libgnutls, opencdk, liblzo
diff --git a/package/gnutls/ipkg/libgnutls-openssl.control b/package/gnutls/ipkg/libgnutls-openssl.control
deleted file mode 100644
index ea06e1522..000000000
--- a/package/gnutls/ipkg/libgnutls-openssl.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: libgnutls-openssl
-Priority: optional
-Section: libs
-Description: GNU TLS OpenSSL compatibility layer library
-Depends: libgnutls
diff --git a/package/gnutls/ipkg/libgnutls.control b/package/gnutls/ipkg/libgnutls.control
deleted file mode 100644
index 6c2faffee..000000000
--- a/package/gnutls/ipkg/libgnutls.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: libgnutls
-Priority: optional
-Section: libs
-Description: GNU TLS library
-Depends: libgcrypt, libtasn1, zlib
diff --git a/package/gnutls/ipkg/libgnutlsxx.control b/package/gnutls/ipkg/libgnutlsxx.control
deleted file mode 100644
index 7034a5f33..000000000
--- a/package/gnutls/ipkg/libgnutlsxx.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: libgnutlsxx
-Priority: optional
-Section: libs
-Description: GNU TLS C++ library
-Depends: libgnutls