diff --git a/package/base/bdb/bdb.conf b/package/base/bdb/bdb.conf index 38edac843..d179f312f 100644 --- a/package/base/bdb/bdb.conf +++ b/package/base/bdb/bdb.conf @@ -51,7 +51,7 @@ hook_add postinstall 8 'chmod 755 $libdir/libdb-${xpkg:3:1}.${xpkg:4:1}.so \ $libdir/libdb_cxx-${xpkg:3:1}.${xpkg:4:1}.so' # create yet another alternative library name some programs use -# this will crate a symlinks in the form libdb-4.1.so -> libdb41.so +# this will create symlinks in the form libdb-4.1.so -> libdb41.so hook_add postinstall 9 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.so $libdir/libdb${xpkg:3}.so' hook_add postinstall 9 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.a $libdir/libdb${xpkg:3}.a' @@ -76,12 +76,12 @@ then hook_add postmake 3 'ln -svf libdb-3.3.a $libdir/libdb-3.a' hook_add postmake 3 'ln -svf libdb_cxx-3.3.a $libdir/libdb_cxx-3.a' - # default for it's mayor version + # default for it's major version hook_add postmake 4 '[ -e $includedir/${xpkg:1:3} ] || \ ln -svf ${xpkg:1} $includedir/${xpkg:1:3}' else if is_bdb_default; then - # default for it's mayor version + # default for it's major version hook_add postmake 4 '[ -e $includedir/${xpkg:1:3} ] || \ ln -svf ${xpkg:1} $includedir/${xpkg:1:3}' hook_add postmake 5 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.so $libdir/libdb${xpkg:3:1}.so' diff --git a/package/base/bdb/bdb.desc b/package/base/bdb/bdb.desc index 9f1bc61a5..a7c5b30a4 100644 --- a/package/base/bdb/bdb.desc +++ b/package/base/bdb/bdb.desc @@ -75,5 +75,10 @@ [D] 4159179082 db-4.2.52.tar.gz http://www.sleepycat.com/update/snapshot/ #endif +#if xpkg == bdb44 +[V] 4.4.20 +[D] 2730568920 db-4.4.20.tar.gz ftp://ftp.sleepycat.com/releases/ +#endif + [CD] for x in $cachedir/*.cache; do cp $x $confdir/$pkg.cache; done diff --git a/package/base/bdb/noinst-major.patch_bdb44 b/package/base/bdb/noinst-major.patch_bdb44 new file mode 100644 index 000000000..edd8ee15f --- /dev/null +++ b/package/base/bdb/noinst-major.patch_bdb44 @@ -0,0 +1,91 @@ +diff -dur db-4.4.20-orig/dist/Makefile.in db-4.4.20/dist/Makefile.in +--- db-4.4.20-orig/dist/Makefile.in 2005-11-08 13:47:22.000000000 +0100 ++++ db-4.4.20/dist/Makefile.in 2006-07-27 21:18:02.000000000 +0200 +@@ -61,12 +61,10 @@ + LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@ + + libdb_base= libdb +-libdb= $(libdb_base).a ++libdb= $(libdb_base)-$(LIBVERSION).a + libdb_version= $(libdb_base)-$(LIBVERSION).a + libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@ + libso_target= $(libdb_base)-$(LIBVERSION).la +-libso_default= $(libdb_base)@SOSUFFIX@ +-libso_major= $(libdb_base)-$(LIBMAJOR)@SOSUFFIX@ + + ################################################## + # C++ API. +@@ -80,12 +78,10 @@ + LIBXSO_LIBS= @LIBXSO_LIBS@ @LIBSO_LIBS@ + + libcxx_base= libdb_cxx +-libcxx= $(libcxx_base).a ++libcxx= $(libcxx_base)-$(LIBVERSION).a + libcxx_version= $(libcxx_base)-$(LIBVERSION).a + libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@ + libxso_target= $(libcxx_base)-$(LIBVERSION).la +-libxso_default= $(libcxx_base)@SOSUFFIX@ +-libxso_major= $(libcxx_base)-$(LIBMAJOR)@SOSUFFIX@ + + ################################################## + # Java API. +@@ -114,8 +110,6 @@ + libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@ + libjso_static= $(libjso_base)-$(LIBVERSION).a + libjso_target= $(libjso_base)-$(LIBVERSION).la +-libjso_default= $(libjso_base)@JMODSUFFIX@ +-libjso_major= $(libjso_base)-$(LIBMAJOR)@JMODSUFFIX@ + libjso_g= $(libjso_base)-$(LIBVERSION)_g@JMODSUFFIX@ + + ################################################## +@@ -129,8 +123,6 @@ + libtso= $(libtso_base)-$(LIBVERSION)@MODSUFFIX@ + libtso_static= $(libtso_base)-$(LIBVERSION).a + libtso_target= $(libtso_base)-$(LIBVERSION).la +-libtso_default= $(libtso_base)@MODSUFFIX@ +-libtso_major= $(libtso_base)-$(LIBMAJOR)@MODSUFFIX@ + + ################################################## + # db_dump185 UTILITY +@@ -660,25 +652,17 @@ + LIB_INSTALL_FILE_LIST=\ + $(libdb) \ + $(libso) \ +- $(libso_default) \ +- $(libso_major) \ + $(libdb_version) \ + $(libso_target) \ + $(libcxx) \ + $(libxso) \ +- $(libxso_default) \ +- $(libxso_major) \ + $(libcxx_version) \ + $(libxso_target) \ + $(libtso) \ +- $(libtso_default) \ +- $(libtso_major) \ + $(libtso_static) \ + $(libtso_target) \ + $(libjso) \ +- $(libjso_default) \ + $(libjso_g) \ +- $(libjso_major) \ + $(libjso_static) \ + $(libjso_target) \ + $(libj_exjarfile) \ +@@ -881,14 +865,6 @@ + @cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST) + @$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir) + @(cd $(DESTDIR)$(libdir) && \ +- test -f $(libso) && $(ln) -s $(libso) $(libso_default); \ +- test -f $(libso) && $(ln) -s $(libso) $(libso_major); \ +- test -f $(libxso) && $(ln) -s $(libxso) $(libxso_default); \ +- test -f $(libxso) && $(ln) -s $(libxso) $(libxso_major); \ +- test -f $(libtso) && $(ln) -s $(libtso) $(libtso_default); \ +- test -f $(libtso) && $(ln) -s $(libtso) $(libtso_major); \ +- test -f $(libjso) && $(ln) -s $(libjso) $(libjso_default); \ +- test -f $(libjso) && $(ln) -s $(libjso) $(libjso_major); \ + test -f $(libjso) && $(ln) -s $(libjso) $(libjso_g)) || true + @(test -f $(libj_jarfile) && \ + $(cp) $(libj_jarfile) $(DESTDIR)$(libdir) && \ +Nur in db-4.4.20/dist: Makefile.in~. diff --git a/package/base/bdb/pkgmapper.in b/package/base/bdb/pkgmapper.in index 717dbd793..36affce60 100644 --- a/package/base/bdb/pkgmapper.in +++ b/package/base/bdb/pkgmapper.in @@ -1,6 +1,6 @@ case "$pkg" in - bdb33|bdb4[012]) + bdb33|bdb4[0124]) pkg=bdb ;; esac diff --git a/package/base/bdb/preconfig.in b/package/base/bdb/preconfig.in index 7958393f4..210fa07d8 100644 --- a/package/base/bdb/preconfig.in +++ b/package/base/bdb/preconfig.in @@ -25,7 +25,7 @@ then pkgfork bdb bdb33 unflag CORE pkgfork bdb bdb40 unflag CORE pkgfork bdb bdb41 unflag CORE - pkgfork bdb bdb42 + pkgfork bdb bdb42 unflag CORE + pkgfork bdb bdb44 pkgremove bdb fi - diff --git a/package/base/bdb/subconfig-libs.in b/package/base/bdb/subconfig-libs.in index 16ec553e5..0c819e44c 100644 --- a/package/base/bdb/subconfig-libs.in +++ b/package/base/bdb/subconfig-libs.in @@ -20,7 +20,8 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -if pkgcheck bdb=bdb33 X || pkgcheck bdb=bdb40 X || pkgcheck bdb=bdb41 X || pkgcheck bdb=bdb42 X +if pkgcheck bdb=bdb33 X || pkgcheck bdb=bdb40 X || pkgcheck bdb=bdb41 X \ + || pkgcheck bdb=bdb42 X || pkgcheck bdb=bdb44 X then menu_begin MENU_PKG_BDB 'BerkleyDB Options' block_begin 4 @@ -42,6 +43,10 @@ then bdbdefselect="$bdbdefselect bdb42 'Using v4.2 as default'" bdbdefault="bdb42"; fi + if pkgcheck bdb=bdb44 X ; then + bdbdefselect="$bdbdefselect bdb44 'Using v4.4 as default'" + bdbdefault="bdb44"; + fi eval "choice ROCKCFG_PKG_BDB_DEFAULT $bdbdefault $bdbdefselect" diff --git a/package/base/bdb/transform-name.patch_bdb44 b/package/base/bdb/transform-name.patch_bdb44 new file mode 100644 index 000000000..e07dbcc23 --- /dev/null +++ b/package/base/bdb/transform-name.patch_bdb44 @@ -0,0 +1,15 @@ +--- db-4.4.20-orig/dist/Makefile.in 2006-07-27 21:19:38.000000000 +0200 ++++ db-4.4.20/dist/Makefile.in 2006-07-27 21:19:20.000000000 +0200 +@@ -879,11 +879,7 @@ + ($(mkdir) -p $(DESTDIR)$(bindir) && \ + $(chmod) $(dmode) $(DESTDIR)$(bindir)) + @for i in $(UTIL_PROGS); do \ +- $(rm) -f $(DESTDIR)$(bindir)/$$i $(DESTDIR)$(bindir)/$$i.exe; \ +- test -f $$i.exe && i=$$i.exe || true; \ +- $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$i; \ +- test -f $(strip) && $(strip) $(DESTDIR)$(bindir)/$$i || true; \ +- $(chmod) $(emode) $(DESTDIR)$(bindir)/$$i; \ ++ cp $$i $(DESTDIR)$(bindir)/`basename $$i | sed $(transform)`; \ + done + + uninstall_utilities: