Make renaming complete for db package.

diff --git a/pkgs/core/bind/bind.nm b/pkgs/core/bind/bind.nm
index b5ca8f3a56d8981648cf83003665ef7f7d665b47..9041e9e9e2865c6ef97944c0e00d9261100bc317 100644 (file)
--- a/pkgs/core/bind/bind.nm
+++ b/pkgs/core/bind/bind.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.isc.org/products/BIND/
 PKG_LICENSE    = Proprietary
 PKG_SUMMARY    = BIND provides tools for the DNS.
 
-PKG_BUILD_DEPS+= db-devel openssl-devel
+PKG_BUILD_DEPS+= db4-devel openssl-devel
 
 define PKG_DESCRIPTION
        BIND (Berkeley Internet Name Domain or named) is the most commonly used \

diff --git a/pkgs/core/cyrus-sasl/cyrus-sasl.nm b/pkgs/core/cyrus-sasl/cyrus-sasl.nm
index 1bdc1fab8d432c2a82a025391247fbf5f36411e0..7d8af2c1f9f0322027b3acbd481924257024aa59 100644 (file)
--- a/pkgs/core/cyrus-sasl/cyrus-sasl.nm
+++ b/pkgs/core/cyrus-sasl/cyrus-sasl.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://asg.web.cmu.edu/sasl/sasl-library.html
 PKG_LICENSE    = BSD
 PKG_SUMMARY    = The Cyrus SASL library.
 
-PKG_BUILD_DEPS+= db-devel openssl-devel pam-devel
+PKG_BUILD_DEPS+= db4-devel openssl-devel pam-devel
 
 define PKG_DESCRIPTION
        The cyrus-sasl package contains the Cyrus implementation of SASL. \

diff --git a/pkgs/core/db4/db4.nm b/pkgs/core/db4/db4.nm
index 195229c9efe4f9f2cccdb1d7855fff3d814e8922..87a6c117b2ad8ce46e07486624d57267b97f52d8 100644 (file)
--- a/pkgs/core/db4/db4.nm
+++ b/pkgs/core/db4/db4.nm
@@ -51,10 +51,6 @@ PKG_TARBALL    = $(THISAPP).tar.gz
 PKG_PACKAGES   = $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-utils \
        $(PKG_NAME_REAL) $(PKG_NAME_REAL)-cxx
 
-# Add a shortcut to be compatible to older versions of this package.
-# At some time this will only be called db4-devel.
-PKG_PROVIDES-$(PKG_NAME_REAL)-devel += db-devel
-
 PKG_FILES                        = /usr/lib/libdb-$(PKG_VER_MAJ).so
 PKG_FILES-$(PKG_NAME_REAL)-cxx   = /usr/lib/libdb_cxx-$(PKG_VER_MAJ).so
 PKG_FILES-$(PKG_NAME_REAL)-devel = /usr/include /usr/lib

diff --git a/pkgs/core/iproute2/iproute2.nm b/pkgs/core/iproute2/iproute2.nm
index 1d5ef6c6f2e2e17bbe9bdd05097acf65dc474ea8..9419ba529709a3f9d678799dc4cfe7595445a149 100644 (file)
--- a/pkgs/core/iproute2/iproute2.nm
+++ b/pkgs/core/iproute2/iproute2.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.linuxfoundation.org/en/Net:Iproute2
 PKG_LICENSE    = GPLv2+
 PKG_SUMMARY    = Advanced IP routing and network device configuration tools.
 
-PKG_BUILD_DEPS+= bison db-devel flex
+PKG_BUILD_DEPS+= bison db4-devel flex
 
 define PKG_DESCRIPTION
        The iproute package contains networking utilities (ip and rtmon, for \

diff --git a/pkgs/core/man-db/man-db.nm b/pkgs/core/man-db/man-db.nm
index c092f450df91ebb745f1c5e134a2731eba878455..59a2459cb050c241256f9051382ab550fe990beb 100644 (file)
--- a/pkgs/core/man-db/man-db.nm
+++ b/pkgs/core/man-db/man-db.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://bzr.savannah.gnu.org/r/man-db/
 PKG_LICENSE    = GPL
 PKG_SUMMARY    = man-db is an on-line manual database.
 
-PKG_BUILD_DEPS+= db-devel groff
+PKG_BUILD_DEPS+= db4-devel groff
 PKG_DEPS      += groff less
 
 define PKG_DESCRIPTION

diff --git a/pkgs/core/openldap/openldap.nm b/pkgs/core/openldap/openldap.nm
index b6408f0e2c8c13724b13ec1039361092c70ede46..ce03d8f70deb48c1416ba51f91b8d434fc6476fe 100644 (file)
--- a/pkgs/core/openldap/openldap.nm
+++ b/pkgs/core/openldap/openldap.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.openldap.org/
 PKG_LICENSE    = OpenLDAP
 PKG_SUMMARY    = LDAP support libraries.
 
-PKG_BUILD_DEPS+= db-devel cyrus-sasl-devel groff libtool libtool-devel \
+PKG_BUILD_DEPS+= db4-devel cyrus-sasl-devel groff libtool libtool-devel \
        openssl-devel pth-devel
 
 define PKG_DESCRIPTION

diff --git a/pkgs/core/perl/perl.nm b/pkgs/core/perl/perl.nm
index c1325847b5fe5adab37bfe57614fb7ada26a7b73..c64b8264ff25c6ee8cbd3dcdff268023851c62ce 100644 (file)
--- a/pkgs/core/perl/perl.nm
+++ b/pkgs/core/perl/perl.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.perl.org/
 PKG_LICENSE    = GPL+ or Artistic and GPLv2+ or Artistic
 PKG_SUMMARY    = Practical Extraction and Report Language.
 
-PKG_BUILD_DEPS+= db-devel gcc-c++ gdbm-devel iana-etc perl procps zlib-devel
+PKG_BUILD_DEPS+= db4-devel gcc-c++ gdbm-devel iana-etc perl procps zlib-devel
 
 define PKG_DESCRIPTION
        Perl is a high-level programming language with roots in C, sed, awk \

diff --git a/pkgs/core/python/python.nm b/pkgs/core/python/python.nm
index c8374e5dd1253fa75aa7e7ae56907e09f10101ef..77028b73be06bb2eec4ff3caa6834ce714077bbf 100644 (file)
--- a/pkgs/core/python/python.nm
+++ b/pkgs/core/python/python.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.python.org
 PKG_LICENSE    = Python
 PKG_SUMMARY    = An interpreted, interactive, object-oriented programming language.
 
-PKG_BUILD_DEPS+= autoconf automake bzip2-devel db-devel expat-devel gdbm-devel \
+PKG_BUILD_DEPS+= autoconf automake bzip2-devel db4-devel expat-devel gdbm-devel \
        libffi-devel libselinux-devel ncurses-devel openssl-devel pkg-config \
        readline-devel sqlite-devel tar zlib-devel