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, 7 insertions, 47 deletions

diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index 7fbf1d2b1..6903ef045 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -9,13 +9,16 @@ PKG_NAME:=		rrdtool
 PKG_VERSION:=		1.2.30
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		19b24f7184a8dbf7b48c1bbb565ad9fb
-MASTER_SITES:=		http://oss.oetiker.ch/rrdtool/pub/
+PKG_DESCR:=		Round Robin Database (RRD) management library and tools
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libart libfreetype libpng zlib
+PKG_SITES:=		http://oss.oetiker.ch/rrdtool/pub/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		rd_cv_ieee_works=yes
diff --git a/package/rrdtool/ipkg/librrd.control b/package/rrdtool/ipkg/librrd.control
deleted file mode 100644
index fe34716ba..000000000
--- a/package/rrdtool/ipkg/librrd.control
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: librrd
-Priority: optional
-Section: libs
-Depends: libart, libfreetype, libpng, zlib
-Description: Round Robin Database (RRD) management library. 
- RRD is the Acronym for Round Robin Database. RRD is a system to store and
- display time-series data (i.e. network bandwidth, machine-room temperature,
- server load average). It stores the data in a very compact way that will
- not expand over time, and it presents useful graphs by processing the data
- to enforce a certain data density. It can be used either via simple wrapper
- scripts (from shell or Perl) or via frontends that poll network devices and
- put friendly user interface on it.
- .
- This package contains the shared library used to manage RRDs.
diff --git a/package/rrdtool/ipkg/rrdcgi.control b/package/rrdtool/ipkg/rrdcgi.control
deleted file mode 100644
index ca0f7cacd..000000000
--- a/package/rrdtool/ipkg/rrdcgi.control
+++ /dev/null
@@ -1,15 +0,0 @@
-Package: rrdcgi
-Priority: optional
-Section: web
-Depends: cgilib, librrd
-Description: Round Robin Database (RRD) CGI graphing tool. 
- RRD is the Acronym for Round Robin Database. RRD is a system to store and
- display time-series data (i.e. network bandwidth, machine-room temperature,
- server load average). It stores the data in a very compact way that will
- not expand over time, and it presents useful graphs by processing the data
- to enforce a certain data density. It can be used either via simple wrapper
- scripts (from shell or Perl) or via frontends that poll network devices and
- put friendly user interface on it.
- .
- This package contains the rrdcgi tool used to create web pages containing 
- RRD graphs based on templates.
diff --git a/package/rrdtool/ipkg/rrdtool.control b/package/rrdtool/ipkg/rrdtool.control
deleted file mode 100644
index 6e273331b..000000000
--- a/package/rrdtool/ipkg/rrdtool.control
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: rrdtool
-Priority: optional
-Section: admin
-Depends: librrd
-Description: Round Robin Database (RRD) management tools. 
- RRD is the Acronym for Round Robin Database. RRD is a system to store and
- display time-series data (i.e. network bandwidth, machine-room temperature,
- server load average). It stores the data in a very compact way that will
- not expand over time, and it presents useful graphs by processing the data
- to enforce a certain data density. It can be used either via simple wrapper
- scripts (from shell or Perl) or via frontends that poll network devices and
- put friendly user interface on it.
- .
- This package contains command line tools used to manage RRDs.