From 429205ff6e17a340a85c420d73aa5678ede426d6 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Wed, 26 Jul 2006 01:26:21 +0000 Subject: [PATCH] change SECTION and CATEGORY to put packages in the right place, change PKG_BUILDDEPs to use package-name instead of source-name (seems to work best with WR sdk). SVN-Revision: 4296 --- libs/avahi/Makefile | 14 +++++++------- libs/axtls/Makefile | 6 +++--- libs/curl/Makefile | 6 +++--- libs/cyrus-sasl/Makefile | 2 +- libs/gnutls/Makefile | 22 +++++++++++----------- libs/gsm/Makefile | 6 +++--- libs/howl/Makefile | 24 ++++++++++++------------ libs/id3lib/Makefile | 2 +- libs/libelf/Makefile | 2 +- libs/mysql/Makefile | 2 +- libs/openldap/Makefile | 6 +++--- libs/postgresql/Makefile | 6 +++--- libs/radiusclient-ng/Makefile | 7 +++---- libs/sqlite2/Makefile | 8 ++++---- libs/sqlite3/Makefile | 8 ++++---- net/kismet/Makefile | 2 +- net/openssh/Makefile | 2 +- 17 files changed, 62 insertions(+), 63 deletions(-) diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index 8e9386a85a..da02db83f8 100644 --- 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 8a567047c5..c74094281c 100644 --- 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 37932d658d..3510c98b92 100644 --- 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 5efcab8b30..fa1240d770 100644 --- 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 9d952b3edd..bb0f960e96 100644 --- 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 9cdc19aa79..e1c6225f79 100644 --- 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 88f1dbde49..2fea756bcf 100644 --- 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 feada69bdc..8faa62e0a7 100644 --- 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 ac481b7d32..ba16def6a5 100644 --- 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 fa9a27786a..4c7ddec195 100644 --- 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 6a956c7c7d..4d5a1bacfb 100644 --- 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 78cc542569..9ee1d5253d 100644 --- 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 4afdd3f9bc..57d4b8becf 100644 --- 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 a8d8fce3e0..1e5179f608 100644 --- 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 a60b35e381..61df399015 100644 --- 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 72bc49917a..2484850cca 100644 --- 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 4e19334256..3d1539c566 100644 --- 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 -- 2.30.2