change SECTION and CATEGORY to put packages in the right place, change PKG_BUILDDEPs...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@4296 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index 8e9386a..da02db8 100644 (file)
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -19,7 +19,7 @@ PKG_MD5SUM:=cfb9e05c138dff4c430a35eee6229e8a
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILDDEP:=expat libdaemon libgdbm
+PKG_BUILDDEP:=libexpat libdaemon libgdbm
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -41,9 +41,9 @@ define Package/libavahi
 endef
 
 define Package/avahi-daemon
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libavahi
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libavahi
   TITLE:=An mDNS/DNS-SD implementation (daemon)
   DESCRIPTION:=An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon).\\\
     Avahi is a system which facilitates service discovery on a local network -- \\\
@@ -64,9 +64,9 @@ define Package/avahi-daemon/conffiles
 endef
 
 define Package/avahi-dnsconfd
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libavahi
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libavahi
   TITLE:=An Unicast DNS server from mDNS/DNS-SD configuration daemon
   DESCRIPTION:=An Unicast DNS server from mDNS/DNS-SD configuration daemon.\\\
     Avahi is a system which facilitates service discovery on a local network -- \\\

diff --git a/libs/axtls/Makefile b/libs/axtls/Makefile
index 8a56704..c740942 100644 (file)
--- a/libs/axtls/Makefile
+++ b/libs/axtls/Makefile
@@ -29,9 +29,9 @@ define Package/libaxtls
 endef
 
 define Package/awhttpd
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libaxtls
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libaxtls
   TITLE:=Anti-Web webserver
   DESCRIPTION:=Anti-Web webserver.
   URL:=http://www.axtls.co.nr/

diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index 37932d6..3510c98 100644 (file)
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -38,9 +38,9 @@ define Package/libcurl
 endef
 
 define Package/curl
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libcurl
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libcurl
   TITLE:=A client-side URL transfer library
   DESCRIPTION:=A client-side URL transfer library.
   URL:=http://curl.haxx.se/

diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile
index 5efcab8..fa1240d 100644 (file)
--- a/libs/cyrus-sasl/Makefile
+++ b/libs/cyrus-sasl/Makefile
@@ -19,7 +19,7 @@ PKG_MD5SUM:=268ead27f4ac39bcfe17d9e38e0f2977
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILDDEP:=openssl
+PKG_BUILDDEP:=libopenssl
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 9d952b3..bb0f960 100644 (file)
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -41,33 +41,33 @@ define Package/libgnutls
   URL:=http://www.gnu.org/software/gnutls/
 endef
 
-define Package/gnutls-utils
+define Package/libgnutls-openssl
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=libgnutls
-  TITLE:=GNU TLS utilitis
-  DESCRIPTION:=The GNU TLS utilities.\\\
+  TITLE:=GNU TLS OpenSSL compatibility layer library
+  DESCRIPTION:=The GNU TLS OpenSSL compatibility layer library.\\\
     GnuTLS is a project that aims to develop a library which provides a \\\
     secure layer, over a reliable transport layer. Currently the GnuTLS \\\
     library implements the proposed standards by the IETF's TLS working \\\
     group.\\\
     \\\
-    This packages contains some GnuTLS utilities.
+    This packages contains the GnuTLS OpenSSL compatibility layer shared library.
   URL:=http://www.gnu.org/software/gnutls/
 endef
 
-define Package/libgnutls-openssl
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libgnutls
-  TITLE:=GNU TLS OpenSSL compatibility layer library
-  DESCRIPTION:=The GNU TLS OpenSSL compatibility layer library.\\\
+define Package/gnutls-utils
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libgnutls
+  TITLE:=GNU TLS utilitis
+  DESCRIPTION:=The GNU TLS utilities.\\\
     GnuTLS is a project that aims to develop a library which provides a \\\
     secure layer, over a reliable transport layer. Currently the GnuTLS \\\
     library implements the proposed standards by the IETF's TLS working \\\
     group.\\\
     \\\
-    This packages contains the GnuTLS OpenSSL compatibility layer shared library.
+    This packages contains some GnuTLS utilities.
   URL:=http://www.gnu.org/software/gnutls/
 endef
 

diff --git a/libs/gsm/Makefile b/libs/gsm/Makefile
index 9cdc19a..e1c6225 100644 (file)
--- a/libs/gsm/Makefile
+++ b/libs/gsm/Makefile
@@ -35,9 +35,9 @@ define Package/libgsm
 endef
 
 define Package/gsm-utils
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libgsm
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libgsm
   TITLE:=GSM transcoding utilities
   DESCRIPTION:=A GSM 06.10 full-rate speech transcoding implementation (utilities).\\\
     An implementation of the European GSM 06.10 provisional standard \\\

diff --git a/libs/howl/Makefile b/libs/howl/Makefile
index 88f1dbd..2fea756 100644 (file)
--- a/libs/howl/Makefile
+++ b/libs/howl/Makefile
@@ -34,9 +34,9 @@ define Package/libhowl
 endef
 
 define Package/howl-utils
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libhowl
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libhowl
   TITLE:=A Zeroconf networking implementation (utilities)
   DESCRIPTION:=A Zeroconf networking implementation (utilities).\\\
     A cross-platform implementation of Zeroconf networking.\\\
@@ -46,9 +46,9 @@ define Package/howl-utils
 endef
 
 define Package/autoipd
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libhowl
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libhowl
   TITLE:=An IPv4 Link-Local address self-assigner daemon
   DESCRIPTION:=An IPv4 Link-Local address self-assigner daemon.\\\
     A cross-platform implementation of Zeroconf networking.\\\
@@ -58,9 +58,9 @@ define Package/autoipd
 endef
 
 define Package/mdnsresponder
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libhowl
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libhowl
   TITLE:=An mDNS (Multicast DNS) service responder daemon
   DESCRIPTION:=An mDNS (Multicast DNS) service responder daemon.\\\
     A cross-platform implementation of Zeroconf networking.\\\
@@ -74,9 +74,9 @@ define Package/mdnsresponder/conffiles
 endef
 
 define Package/nifd
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libhowl
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libhowl
   TITLE:=A network interface monitor daemon
   DESCRIPTION:=A network interface monitor daemon.\\\
     A cross-platform implementation of Zeroconf networking.\\\

diff --git a/libs/id3lib/Makefile b/libs/id3lib/Makefile
index feada69..8faa62e 100644 (file)
--- a/libs/id3lib/Makefile
+++ b/libs/id3lib/Makefile
@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/id3lib
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+zlib +uclibc++
+  DEPENDS:=+zlib +uclibcxx
   TITLE:=An ID3v1/ID3v2 tag manipulation library
   DESCRIPTION:=An ID3v1/ID3v2 tag manipulation library.\\\
   URL:=http://www.id3lib.org/

diff --git a/libs/libelf/Makefile b/libs/libelf/Makefile
index ac481b7..ba16def 100644 (file)
--- a/libs/libelf/Makefile
+++ b/libs/libelf/Makefile
@@ -31,7 +31,7 @@ define Package/libelf
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \

diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index fa9a277..4c7ddec 100644 (file)
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -23,7 +23,7 @@ PKG_MD5SUM:=f18153b0239aaa03fc5a751f2d82cb71
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILDDEP:=ncurses readline
+PKG_BUILDDEP:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile
index 6a956c7..4d5a1ba 100644 (file)
--- a/libs/openldap/Makefile
+++ b/libs/openldap/Makefile
@@ -59,9 +59,9 @@ define Package/libopenldap/conffiles
 endef
 
 define Package/openldap-utils
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libopenldap
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libopenldap
   TITLE:=LDAP client utilities
   DESCRIPTION:=LDAP (Lightweight Directory Access Protocol) client utilities.\\\
     OpenLDAP Software is an open source implementation of the \\\

diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index 78cc542..9ee1d52 100644 (file)
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -36,9 +36,9 @@ define Package/libpq
 endef
 
 define Package/pgsql-cli
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libpq
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libpq
   TITLE:=Command Line Interface (CLI) to PostgreSQL databases
   DESCRIPTION:=Command Line Interface (CLI) to PostgreSQL databases.
   URL:=http://www.postgresql.org/

diff --git a/libs/radiusclient-ng/Makefile b/libs/radiusclient-ng/Makefile
index 4afdd3f..57d4b8b 100644 (file)
--- a/libs/radiusclient-ng/Makefile
+++ b/libs/radiusclient-ng/Makefile
@@ -42,11 +42,10 @@ define Package/libradiusclient-ng/conffiles
 /etc/radiusclient-ng/servers
 endef
 
-
 define Package/radiusclient-ng
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libradiusclient-ng
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libradiusclient-ng
   TITLE:=A RADIUS client
   DESCRIPTION:=A RADIUS client.\\\
     Purpose of this project is to build a portable, easy-to-use and standard \\\

diff --git a/libs/sqlite2/Makefile b/libs/sqlite2/Makefile
index a8d8fce..1e5179f 100644 (file)
--- a/libs/sqlite2/Makefile
+++ b/libs/sqlite2/Makefile
@@ -19,7 +19,7 @@ PKG_MD5SUM:=838dbac20b56d2c4292e98848505a05b
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILDDEP:=ncurses readline
+PKG_BUILDDEP:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -36,9 +36,9 @@ define Package/libsqlite2
 endef
 
 define Package/sqlite2-cli
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libsqlite2 +libncurses +libreadline
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libsqlite2 +libncurses +libreadline
   TITLE:=Command line interface for SQLite
   DESCRIPTION:=Command line interface for SQLite.\\\
     SQLite is a small C library that implements a self-contained, embeddable, \\\

diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile
index a60b35e..61df399 100644 (file)
--- a/libs/sqlite3/Makefile
+++ b/libs/sqlite3/Makefile
@@ -19,7 +19,7 @@ PKG_MD5SUM:=eb5d9d7e7853b3af78e767d709b7fced
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILDDEP:=ncurses readline
+PKG_BUILDDEP:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -36,9 +36,9 @@ define Package/libsqlite3
 endef
 
 define Package/sqlite3-cli
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libsqlite3 +libncurses +libreadline
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libsqlite3 +libncurses +libreadline
   TITLE:=Command line interface for SQLite
   DESCRIPTION:=Command line interface for SQLite.\\\
     SQLite is a small C library that implements a self-contained, embeddable, \\\

diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index 72bc499..2484850 100644 (file)
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://www.kismetwireless.net/code
 PKG_MD5SUM:=8ec2de513f2911df1b7edfcba5ad1c26
 PKG_CAT:=zcat
 
-PKG_BUILDDEP:=libpcap ncurses uclibc++
+PKG_BUILDDEP:=libpcap libncurses uclibcxx
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 4e19334..3d1539c 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -22,7 +22,7 @@ PKG_MD5SUM:=df899194a340c933944b193477c628fa
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILDDEP:=openssl
+PKG_BUILDDEP:=libopenssl
 
 include $(INCLUDE_DIR)/package.mk