summaryrefslogtreecommitdiff
path: root/package/apr-util
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-30 22:59:29 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-30 22:59:29 +0200
commitfb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch)
tree379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/apr-util
parent5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff)
parentba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff)
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
Diffstat (limited to 'package/apr-util')
-rw-r--r--package/apr-util/Makefile8
-rw-r--r--package/apr-util/ipkg/apr-util.control5
2 files changed, 6 insertions, 7 deletions
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 8a3de3b82..2404632e8 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -9,11 +9,15 @@ PKG_NAME:= apr-util
PKG_VERSION:= 0.9.15
PKG_RELEASE:= 1
PKG_MD5SUM:= dc772ae295f49ddb8ee8e69a9716c53b
-MASTER_SITES:= http://apache.mirror.clusters.cc/apr/
+PKG_DESCR:= Apache Portable Runtime utility library
+PKG_SECTION:= libs
+PKG_DEPENDS:= libexpat apr
+PKG_URL:= http://apr.apache.org
+PKG_SITES:= http://apache.mirror.clusters.cc/apr/
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,APR_UTIL,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --without-berkeley-db
diff --git a/package/apr-util/ipkg/apr-util.control b/package/apr-util/ipkg/apr-util.control
deleted file mode 100644
index 45af346d3..000000000
--- a/package/apr-util/ipkg/apr-util.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: apr-util
-Priority: optional
-Section: lib
-Description: Apache Portable Runtime
-Depends: libexpat, apr