Juergen Sawinski:

package/base/bdb/bdb.conf

@@ -20,16 +20,6 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-case "$xpkg" in
-    bdb33) ver=3.3.11 ;;
-    bdb40) ver=4.0.14 ;;
-    bdb41) ver=4.1.25 ;;
-    bdb42) ver=4.2.52 ;;
-    *)
-	echo_error "Not supported bdb package name: $xpkg"
-	exit 1
-esac
-
 echo_status "Set package version number based on name: $ver"
 
 hook_add preconf 2 'cd build_unix'
@@ -39,9 +29,13 @@ var_append confopt ' ' '--enable-compat185'
 var_append confopt ' ' '--enable-cxx'
 var_append confopt ' ' "--includedir=$root/$prefix/include/${xpkg:1}"
 
+is_bdb_default() {
+	[ "$xpkg" = "$ROCKCFG_PKG_BDB_DEFAULT" ]
+}
+
 # we need the install-sh here, since our gnu-install does not
 # handle the transform-name ...
-var_append confopt ' ' "--program-transform-name='s/db/${xpkg:1}/'"
+is_bdb_default || var_append confopt ' ' "--program-transform-name='s/db/${xpkg:1}/'"
 
 # bdb doesn't like some of our make options
 makeopt="docdir=$docdir all"
@@ -58,39 +52,34 @@ hook_add postinstall 9 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.a  $libdir/libdb${
 # bdb does copy the docs itself ...
 createdocs=0
 
-if [ $xpkg = bdb33 ]
-then
-	pkg_bdb33_pm() {
-		# this job should be done by Makefile :(
-		ln -svf libdb-3.3.a $libdir/libdb-3.a
-		ln -svf libdb_cxx-3.3.a $libdir/libdb_cxx-3.a
-	}
-
-	hook_add postmake 3 'pkg_bdb33_pm'
-
-	# default for it's mayor version
-	hook_add postmake 4 '[ -e $includedir/${xpkg:1:3} ] || \
-			     ln -svf ${xpkg:1} $includedir/${xpkg:1:3}'
-fi
-
-if [ $xpkg = bdb41 ]
-then
-	# default symlinks db.h db_185.h db/ for headers
+if is_bdb_default; then
+	# default headers
 	hook_add postmake 3 "ln -sfv ${xpkg:1}/db.h $root/$prefix/include/db.h"
 	hook_add postmake 3 "ln -sfv ${xpkg:1}/db_185.h $root/$prefix/include/db_185.h"
 	hook_add postmake 3 "[ -e $includedir/db ] || \
 		ln -sfv ${xpkg:1} $includedir/db"
-
-	# and default for it's mayor version
-	hook_add postmake 3 "[ -e $includedir/${xpkg:1:3} ] || \
-		ln -sfv ${xpkg:1} $includedir/${xpkg:1:3}"
+	
+	# default libs
+	hook_add postmake 5 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.so $libdir/libdb.so'
+	hook_add postmake 5 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.a  $libdir/libdb.a'
 fi
 
-if [ $xpkg = bdb42 ]
+if [ $xpkg = bdb33 ]
 then
-	: not yet the default
-	## default symlinks db.h db_185.h db/ for headers
-	#hook_add postmake 3 "ln -sfv ${xpkg:1}/db.h $root/$prefix/include/db.h"
-	#hook_add postmake 3 "ln -sfv ${xpkg:1}/db_185.h $root/$prefix/include/db_185.h"
+	# should actually done by make
+	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
+	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
+		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'
+		hook_add postmake 5 'ln -sfv libdb-${xpkg:3:1}.${xpkg:4:1}.a  $libdir/libdb${xpkg:3:1}.a'
+	fi
 fi
 

package/base/bdb/bdb.desc

@@ -55,18 +55,22 @@
 [CV-URL] http://www.sleepycat.com/download/patchlogs.shtml
 
 #if xpkg == bdb33
+[V] 3.3.11
 [D] 3182502822 db-3.3.11.tar.gz http://www.sleepycat.com/update/snapshot/
 #endif
 
 #if xpkg == bdb40
+[V] 4.0.14
 [D] 2029835613 db-4.0.14.tar.gz http://www.sleepycat.com/update/snapshot/
 #endif
 
 #if xpkg == bdb41
+[V] 4.1.25
 [D] 2158693923 db-4.1.25.tar.gz http://www.sleepycat.com/update/snapshot/
 #endif
 
 #if xpkg == bdb42
+[V] 4.2.52
 [D] 4159179082 db-4.2.52.tar.gz http://www.sleepycat.com/update/snapshot/
 #endif
 

package/base/bdb/noinst-major.patch_bdb41

@@ -0,0 +1,93 @@
+--- db-4.1.25/dist/Makefile.in~	2002-08-30 20:11:56.000000000 +0200
++++ db-4.1.25/dist/Makefile.in	2004-07-13 20:40:26.969525088 +0200
+@@ -59,13 +59,11 @@
+ LIBS=		@LIBS@
+ LIBSO_LIBS=	@LIBSO_LIBS@
+ 
+-libdb=		libdb.a
++libdb=		libdb-$(SOVERSION).a
+ libso_base=	libdb
+ libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
+ libso_static=	$(libso_base)-$(SOVERSION).a
+ libso_target=	$(libso_base)-$(SOVERSION).la
+-libso_default=	$(libso_base).@SOSUFFIX@
+-libso_major=	$(libso_base)-$(SOMAJOR).@SOSUFFIX@
+ 
+ ##################################################
+ # C++ API.
+@@ -78,13 +76,11 @@
+ XSOLINK=	@MAKEFILE_XSOLINK@
+ LIBXSO_LIBS=	@LIBXSO_LIBS@
+ 
+-libcxx=		libdb_cxx.a
++libcxx=		libdb_cxx-$(SOVERSION).a
+ libxso_base=	libdb_cxx
+ libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
+ libxso_static=	$(libxso_base)-$(SOVERSION).a
+ libxso_target=	$(libxso_base)-$(SOVERSION).la
+-libxso_default=	$(libxso_base).@SOSUFFIX@
+-libxso_major=	$(libxso_base)-$(SOMAJOR).@SOSUFFIX@
+ 
+ ##################################################
+ # Java API.
+@@ -114,8 +110,6 @@
+ libjso=		$(libjso_base)-$(SOVERSION).@JMODSUFFIX@
+ libjso_static=	$(libjso_base)-$(SOVERSION).a
+ libjso_target=	$(libjso_base)-$(SOVERSION).la
+-libjso_default=	$(libjso_base).@JMODSUFFIX@
+-libjso_major=	$(libjso_base)-$(SOMAJOR).@JMODSUFFIX@
+ libjso_g=	$(libjso_base)-$(SOVERSION)_g.@JMODSUFFIX@
+ 
+ ##################################################
+@@ -129,8 +123,6 @@
+ libtso=		$(libtso_base)-$(SOVERSION).@MODSUFFIX@
+ libtso_static=	$(libtso_base)-$(SOVERSION).a
+ libtso_target=	$(libtso_base)-$(SOVERSION).la
+-libtso_default=	$(libtso_base).@MODSUFFIX@
+-libtso_major=	$(libtso_base)-$(SOMAJOR).@MODSUFFIX@
+ 
+ ##################################################
+ # db_dump185 UTILITY
+@@ -373,25 +365,17 @@
+ LIB_INSTALL_FILE_LIST=\
+ 	$(libdb) \
+ 	$(libso) \
+-	$(libso_default) \
+-	$(libso_major) \
+ 	$(libso_static) \
+ 	$(libso_target) \
+ 	$(libcxx) \
+ 	$(libxso) \
+-	$(libxso_default) \
+-	$(libxso_major) \
+ 	$(libxso_static) \
+ 	$(libxso_target) \
+ 	$(libtso) \
+-	$(libtso_default) \
+-	$(libtso_major) \
+ 	$(libtso_static) \
+ 	$(libtso_target) \
+ 	$(libjso) \
+-	$(libjso_default) \
+ 	$(libjso_g) \
+-	$(libjso_major) \
+ 	$(libjso_static) \
+ 	$(libjso_target) \
+ 	$(libj_exjarfile) \
+@@ -565,16 +549,6 @@
+ 	@cd $(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
+ 	@$(INSTALLER) @INSTALL_LIBS@ $(libdir)
+ 	@(cd $(libdir) && \
+-	    test -f $(libso) && $(ln) -s $(libso) $(libso_default); \
+-	    test -f $(libso) && $(ln) -s $(libso) $(libso_major); \
+-	    test -f $(libso_static) && $(ln) -s $(libso_static) $(libdb); \
+-	    test -f $(libxso) && $(ln) -s $(libxso) $(libxso_default); \
+-	    test -f $(libxso) && $(ln) -s $(libxso) $(libxso_major); \
+-	    test -f $(libxso_static) && $(ln) -s $(libxso_static) $(libcxx); \
+-	    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) $(libdir) && \

package/base/bdb/subconfig-libs.hlp

@@ -0,0 +1,19 @@
+MENU_PKG_BDB
+  Berkley DB Options/Defaults.
+
+ROCKCFG_PKG_BDB33
+  Build BerkleyDB v3.3
+
+ROCKCFG_PKG_BDB40
+  Build BerkleyDB v4.0
+
+ROCKCFG_PKG_BDB41
+  Build BerkleyDB v4.1
+
+ROCKCFG_PKG_BDB42
+  Build BerkleyDB v4.2
+
+ROCKCFG_PKG_BDB_DEFAULT
+  Set the BerkleyDB default version. Currently the only tested
+  one is v4.1, so don't be suprised if chosing a different one
+  results in strange side effects...

package/base/bdb/subconfig-libs.in

@@ -0,0 +1,48 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/bdb/subconfig-libs.in
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+if pkgcheck bdb X
+then
+	menu_begin MENU_PKG_BDB 'BerkleyDB Options'
+	block_begin 4
+		bool 'Build v3.3' ROCKCFG_PKG_BDB33 1
+		[ "$ROCKCFG_PKG_BDB33" = 1 ] && pkgfork bdb bdb33
+		[ "$ROCKCFG_PKG_BDB33" = 1 ] && bdbdefselect="$bdbdefselect bdb33 'Using v3.3 as default'"
+
+		bool 'Build v4.0' ROCKCFG_PKG_BDB40 1
+		[ "$ROCKCFG_PKG_BDB40" = 1 ] && pkgfork bdb bdb40
+		[ "$ROCKCFG_PKG_BDB40" = 1 ] && bdbdefselect="$bdbdefselect bdb40 'Using v4.0 as default'"
+
+		bool 'Build v4.1' ROCKCFG_PKG_BDB41 1
+		[ "$ROCKCFG_PKG_BDB41" = 1 ] && pkgfork bdb bdb41
+		[ "$ROCKCFG_PKG_BDB41" = 1 ] && bdbdefselect="$bdbdefselect bdb41 'Using v4.1 as default'"
+
+		bool 'Build v4.2' ROCKCFG_PKG_BDB42 1
+		[ "$ROCKCFG_PKG_BDB42" = 1 ] && pkgfork bdb bdb42
+		[ "$ROCKCFG_PKG_BDB42" = 1 ] && bdbdefselect="$bdbdefselect bdb42 'Using v4.2 as default'"
+
+		eval "choice ROCKCFG_PKG_BDB_DEFAULT bdb41 $bdbdefselect"
+	
+      		block_end
+	menu_end
+	pkgremove bdb
+fi