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

7 files changed, 22 insertions, 22 deletions

diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 391dde5a2..32c2c755a 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -9,7 +9,25 @@ PKG_NAME:=		net-snmp
 PKG_VERSION:=		5.4.2.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		984932520143f0c8bf7b7ce1fc9e1da1
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=net-snmp/}
+PKG_DESCR:=		SNMP Agent
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libnetsnmp libelf
+PKG_URL:=		http://www.net-snmp.org
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=net-snmp/}
+
+PKG_DESCR_1:=		SNMP utilities
+PKG_DEPENDS_1:=		libnetsnmp libelf
+
+PKG_DESCR_2:=		SNMP library
+PKG_DEPENDS_2:=		libelf
+PKG_SECTION_2:=		libs
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_2},${PKG_DESCR_2},${PKG_SECTION_2}))
+
 
 SNMP_MIB_MODULES_INCLUDED =	\
 	host/hr_device \
@@ -66,12 +84,6 @@ SNMP_TRANSPORTS_INCLUDED=	Callback UDP
 
 SNMP_TRANSPORTS_EXCLUDED=	TCP TCPv6 UDPv6 Unix
 
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE}))
-
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_header_pcap_h=no
 CONFIGURE_ARGS+=	--with-endianness=little \
diff --git a/package/net-snmp/ipkg/snmpd.conffiles b/package/net-snmp/files/snmpd.conffiles
index 121a94479..121a94479 100644
--- a/package/net-snmp/ipkg/snmpd.conffiles
+++ b/package/net-snmp/files/snmpd.conffiles
diff --git a/package/net-snmp/files/snmpd.init b/package/net-snmp/files/snmpd.init
index 71cf6c597..4a3d2671f 100644
--- a/package/net-snmp/files/snmpd.init
+++ b/package/net-snmp/files/snmpd.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG snmpd
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/net-snmp/ipkg/snmpd.postinst b/package/net-snmp/files/snmpd.postinst
index 3f053bd5d..3f053bd5d 100644
--- a/package/net-snmp/ipkg/snmpd.postinst
+++ b/package/net-snmp/files/snmpd.postinst
diff --git a/package/net-snmp/ipkg/libnetsnmp.control b/package/net-snmp/ipkg/libnetsnmp.control
deleted file mode 100644
index 7a28ef887..000000000
--- a/package/net-snmp/ipkg/libnetsnmp.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libnetsnmp
-Priority: optional
-Section: libs
-Description: SNMP shared libraries
diff --git a/package/net-snmp/ipkg/snmp-utils.control b/package/net-snmp/ipkg/snmp-utils.control
deleted file mode 100644
index 42d9251c8..000000000
--- a/package/net-snmp/ipkg/snmp-utils.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: snmp-utils
-Priority: optional
-Section: admin
-Description: SNMP client utilities
-Depends: libnetsnmp, libelf
diff --git a/package/net-snmp/ipkg/snmpd.control b/package/net-snmp/ipkg/snmpd.control
deleted file mode 100644
index 986b19631..000000000
--- a/package/net-snmp/ipkg/snmpd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: snmpd
-Priority: optional
-Section: admin
-Description: SNMP agent
-Depends: libnetsnmp, libelf