From 5531a1db2cc0259486dd60c30dd2fbc0fcf3374e Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sat, 18 Sep 2004 19:34:36 +0000
Subject: [PATCH] Clifford Wolf: 	Fixed bdb41 <-> bdb42 shared files
 conflict

[2004091320545615331] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4302 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/bdb/bdb.conf                 |  1 -
 package/base/bdb/noinst-major.patch_bdb42 | 67 +++++++++++++++++++----
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/package/base/bdb/bdb.conf b/package/base/bdb/bdb.conf
index 7a8ef9f8d..31a9f82fd 100644
--- a/package/base/bdb/bdb.conf
+++ b/package/base/bdb/bdb.conf
@@ -41,7 +41,6 @@ is_bdb_default() {
 if ! is_bdb_default; then
 	var_append confopt ' ' "--program-transform-name='s/db/${xpkg:1}/'"
 	var_append makeinstopt ' ' "transform='s/db/${xpkg:1}/'"
-	# var_append INSTALL_WRAPPER_FILTER "|" 'sed "s,bin/db,bin/${xpkg:1},"'
 fi
 
 # bdb doesn't like some of our make options
diff --git a/package/base/bdb/noinst-major.patch_bdb42 b/package/base/bdb/noinst-major.patch_bdb42
index c724fbe20..97167920a 100644
--- a/package/base/bdb/noinst-major.patch_bdb42
+++ b/package/base/bdb/noinst-major.patch_bdb42
@@ -1,35 +1,78 @@
---- ./dist/Makefile.in.orig	2004-06-25 00:15:26.156739872 +0200
-+++ ./dist/Makefile.in	2004-06-25 00:17:37.499772696 +0200
-@@ -590,27 +590,14 @@
- # List of files installed into the library directory.
+--- ./dist/Makefile.in.orig	2004-09-13 20:33:27.000000000 +0200
++++ ./dist/Makefile.in	2004-09-13 20:43:02.000000000 +0200
+@@ -61,12 +61,10 @@
+ LIBSO_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@
+ 
+ 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.
+@@ -115,8 +111,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@
+ 
+ ##################################################
+@@ -130,8 +124,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
+@@ -592,25 +584,17 @@
  LIB_INSTALL_FILE_LIST=\
--	$(libdb) \
--	$(libso) \
+ 	$(libdb) \
+ 	$(libso) \
 -	$(libso_default) \
 -	$(libso_major) \
  	$(libdb_version) \
  	$(libso_target) \
--	$(libcxx) \
--	$(libxso) \
+ 	$(libcxx) \
+ 	$(libxso) \
 -	$(libxso_default) \
 -	$(libxso_major) \
  	$(libcxx_version) \
  	$(libxso_target) \
--	$(libtso) \
+ 	$(libtso) \
 -	$(libtso_default) \
 -	$(libtso_major) \
  	$(libtso_static) \
  	$(libtso_target) \
--	$(libjso) \
+ 	$(libjso) \
 -	$(libjso_default) \
  	$(libjso_g) \
 -	$(libjso_major) \
-+	$(libjso_default) \
  	$(libjso_static) \
  	$(libjso_target) \
  	$(libj_exjarfile) \
-@@ -811,14 +798,6 @@
+@@ -811,14 +795,6 @@
  	@cd $(DESTDIR)$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
  	@$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
  	@(cd $(DESTDIR)$(libdir) && \