Clifford Wolf:

misc/tools-source/descparser.c

@@ -89,7 +89,7 @@ int main()
 			}
 		} else
 			if ( !falselevel )
-				puts(line);
+				fputs(line, stdout);
 	}
 
 	return 0;

package/base/bdb/bdb.conf

@@ -0,0 +1,96 @@
+# --- 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/bdb.conf
+# ROCK Linux is Copyright (C) 1998 - 2004 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 ---
+
+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'
+configscript="../dist/configure"
+
+var_append confopt ' ' '--enable-compat185'
+var_append confopt ' ' '--enable-cxx'
+var_append confopt ' ' "--includedir=$root/$prefix/include/${xpkg:1}"
+
+# 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}/'"
+
+# bdb doesn't like some of our make options
+makeopt="docdir=$docdir all"
+makeinstopt="docdir=$docdir install"
+
+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
+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'
+
+# 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
+	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}"
+fi
+
+if [ $xpkg = bdb42 ]
+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"
+fi
+

package/base/bdb/bdb.desc

@@ -0,0 +1,72 @@
+
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/base/bdb/bdb.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+#if xpkg == bdb33
+[I] Sleepycat Berkley DB Version 3.3
+#endif
+
+#if xpkg == bdb40
+[I] Sleepycat Berkley DB Version 4.0
+#endif
+
+#if xpkg == bdb41
+[I] Sleepycat Berkley DB Version 4.1
+#endif
+
+#if xpkg == bdb42
+[I] Sleepycat Berkley DB Version 4.2
+#endif
+
+[T] Berkley DB is a set of DB libraries for many types of
+[T] standard DB table systems. It has a C and C++ interface.
+
+[U] http://www.sleepycat.com The BDB Homepage
+
+[A] Sleepycat
+[M] Clifford Wolf <clifford@clifford.at>
+
+[C] base/library
+
+[L] BSD
+[S] Stable
+[V] 0000
+[P] X -----5---9 104.700
+
+[CV-URL] http://www.sleepycat.com/download/patchlogs.shtml
+
+#if xpkg == bdb33
+[D] 3182502822 db-3.3.11.tar.gz http://www.sleepycat.com/update/snapshot/
+#endif
+
+#if xpkg == bdb40
+[D] 2029835613 db-4.0.14.tar.gz http://www.sleepycat.com/update/snapshot/
+#endif
+
+#if xpkg == bdb41
+[D] 2158693923 db-4.1.25.tar.gz http://www.sleepycat.com/update/snapshot/
+#endif
+
+#if xpkg == bdb42
+[D] 4159179082 db-4.2.52.tar.gz http://www.sleepycat.com/update/snapshot/
+#endif
+

package/base/bdb/config.in

@@ -0,0 +1,31 @@
+# --- 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/config.in
+# ROCK Linux is Copyright (C) 1998 - 2004 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
+	pkgfork bdb bdb33 version 3.3.11
+	pkgfork bdb bdb40 version 4.0.14
+	pkgfork bdb bdb41 version 4.1.25
+	pkgfork bdb bdb42 version 4.2.52
+	pkgremove bdb
+fi
+

package/base/bdb/db-3.3.11-2.patch_bdb33

@@ -0,0 +1,138 @@
+# --- 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/bdb33/db-3.3.11-2.patch
+# 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 ---
+
+Official patches (1 & 2) from
+http://www.sleepycat.com/update/3.3.11/patch.3.3.11.html
+
+*** ./db185/db185.c	2001/04/10 20:43:53	11.18
+--- ./db185/db185.c	2001/07/30 14:12:47
+***************
+*** 40,47 ****
+--- ./40,52 ----
+  
+  /*
+   * EXTERN: #define dbopen __db185_open
++  * EXTERN: #ifdef _DB185_INT_H_
+   * EXTERN: DB185 *__db185_open
+   * EXTERN:     __P((const char *, int, int, DBTYPE, const void *));
++  * EXTERN: #else
++  * EXTERN: DB *__db185_open
++  * EXTERN:     __P((const char *, int, int, DBTYPE, const void *));
++  * EXTERN: #endif
+   */
+  DB185 *
+  __db185_open(file, oflags, mode, type, openinfo)
+*** ./db185/db185_int.in	2001/04/10 20:43:54	11.9
+--- ./db185/db185_int.in	2001/07/30 14:12:47
+***************
+*** 39,46 ****
+   * $Id: db-3.3.11-2.patch,v 1.2 2003/04/28 13:50:08 clifford Exp $
+   */
+  
+! #ifndef _DB_185_H_
+! #define	_DB_185_H_
+  
+  /* Routine flags. */
+  #define	R_CURSOR	1		/* del, put, seq */
+--- ./39,46 ----
+   * $Id: db-3.3.11-2.patch,v 1.2 2003/04/28 13:50:08 clifford Exp $
+   */
+  
+! #ifndef _DB185_INT_H_
+! #define	_DB185_INT_H_
+  
+  /* Routine flags. */
+  #define	R_CURSOR	1		/* del, put, seq */
+*** ./include_auto/db185_ext.in	2001/04/10 20:44:20	1.1
+--- ./include_auto/db185_ext.in	2001/07/30 14:12:48
+***************
+*** 3,11 ****
+  extern "C" {
+  #endif
+  #define dbopen __db185_open
+  DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
+  #if defined(__cplusplus)
+  }
+  #endif
+  
+! #endif /* !_DB_185_H_ */
+--- ./3,15 ----
+  extern "C" {
+  #endif
+  #define dbopen __db185_open
++ #ifdef _DB185_INT_H_
+  DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
++ #else
++ DB *__db185_open __P((const char *, int, int, DBTYPE, const void *));
++ #endif
+  #if defined(__cplusplus)
+  }
+  #endif
+  
+! #endif /* _DB_185_H_ or _DB185_INT_H_ */
+*** ./include_auto/db185_uext.in	2001/04/10 20:44:20	1.1
+--- ./include_auto/db185_uext.in	2001/07/30 14:12:48
+***************
+*** 3,12 ****
+  extern "C" {
+  #endif
+  #define dbopen __db185_open@DB_VERSION_UNIQUE_NAME@
+  #define	__db185_open __db185_open@DB_VERSION_UNIQUE_NAME@
+  DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
+  #if defined(__cplusplus)
+  }
+  #endif
+  
+! #endif /* !_DB_185_H_ */
+--- ./3,17 ----
+  extern "C" {
+  #endif
+  #define dbopen __db185_open@DB_VERSION_UNIQUE_NAME@
++ #ifdef _DB185_INT_H_
+  #define	__db185_open __db185_open@DB_VERSION_UNIQUE_NAME@
+  DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
++ #else
++ #define	__db185_open __db185_open@DB_VERSION_UNIQUE_NAME@
++ DB *__db185_open __P((const char *, int, int, DBTYPE, const void *));
++ #endif
+  #if defined(__cplusplus)
+  }
+  #endif
+  
+! #endif /* _DB_185_H_ or _DB185_INT_H_ */
+
+*** ./build_vxworks/db.h.orig	Mon Jul 30 09:49:54 2001
+--- ./build_vxworks/db.h	Wed Dec 31 19:00:00 1969
+***************
+*** 32,37 ****
+--- 32,41 ----
+  extern "C" {
+  #endif
+  
++ #ifndef	HAVE_VXWORKS
++ #define	HAVE_VXWORKS	1
++ #endif
++ 
+  /*
+   * XXX
+   * Handle function prototypes and the keyword "const".  This steps on name
+

package/base/bdb/db-4.1.25-1.patch_bdb41

@@ -0,0 +1,36 @@
+# --- 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/bdb41/db-4.1.25-1.patch
+# 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 ---
+
+Official patch (1) from
+http://www.sleepycat.com/update/4.1.25/patch.4.1.25.html
+
+--- db-4.1.25.orig/fileops/fop_util.c	Fri Apr 18 18:05:26 2003
++++ db-4.1.25/fileops/fop_util.c	Fri Apr 18 18:04:27 2003
+@@ -40,7 +40,7 @@
+ 	u_int32_t __lockval;						\
+ 									\
+ 	if (LOCKING_ON((ENV))) {					\
+-		__lockval = 0;						\
++		__lockval = 1;						\
+ 		__dbt.data = &__lockval;				\
+ 		__dbt.size = sizeof(__lockval);				\
+ 		if ((ret = (ENV)->lock_get((ENV), (ID),			\

package/base/bdb/noinst-default.patch_bdb33

@@ -0,0 +1,40 @@
+# --- 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/bdb33/noinst-default.patch
+# 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 ---
+
+--- db-3.3.11/dist/Makefile.in.orig	2003-04-25 20:52:21.000000000 +0200
++++ db-3.3.11/dist/Makefile.in	2003-04-25 20:53:06.000000000 +0200
+@@ -401,7 +401,6 @@
+ 	@cd $(libdir) && $(rm) -f \
+ 	    $(libso) $(libso_target) $(libso_default) $(libso_major)
+ 	@$(INSTALLER) $(libso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libso) $(libso_default)
+ 	@cd $(libdir) && $(ln) -s $(libso) $(libso_major)
+ 	@$(LIBTOOL) --mode=finish $(libdir)
+ 	@cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target)
+@@ -421,7 +420,6 @@
+ 	@cd $(libdir) && $(rm) -f \
+ 	    $(libxso) $(libxso_target) $(libxso_default) $(libxso_major)
+ 	@$(INSTALLER) $(libxso_target) $(libdir)
+-	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
+ 	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
+ 	@cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target)
+ 

package/base/bdb/noinst-major.patch_bdb40

@@ -0,0 +1,115 @@
+# --- 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/bdb40/noinst-mayor.patch
+# 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 ---
+
+--- ./dist/Makefile.in.orig	Sat Apr 19 07:52:16 2003
++++ ./dist/Makefile.in	Sat Apr 19 08:03:22 2003
+@@ -60,13 +60,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.
+@@ -79,13 +77,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.
+@@ -111,8 +107,6 @@
+ libjso=		$(libjso_base)-$(SOVERSION).@SOSUFFIX@
+ libjso_static=	$(libjso_base)-$(SOVERSION).a
+ libjso_target=	$(libjso_base)-$(SOVERSION).la
+-libjso_default=	$(libjso_base).@SOSUFFIX@
+-libjso_major=	$(libjso_base)-$(SOMAJOR).@SOSUFFIX@
+ libjso_g=	$(libjso_base)-$(SOVERSION)_g.@SOSUFFIX@
+ 
+ ##################################################
+@@ -126,8 +120,6 @@
+ libtso=		$(libtso_base)-$(SOVERSION).@SOSUFFIX@
+ libtso_static=	$(libtso_base)-$(SOVERSION).a
+ libtso_target=	$(libtso_base)-$(SOVERSION).la
+-libtso_default=	$(libtso_base).@SOSUFFIX@
+-libtso_major=	$(libtso_base)-$(SOMAJOR).@SOSUFFIX@
+ 
+ ##################################################
+ # db_dump185 UTILITY
+@@ -244,25 +236,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) \
+@@ -414,16 +398,8 @@
+ 	@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)) || true

package/base/bdb/noinst-major.patch_bdb42

@@ -0,0 +1,46 @@
+--- ./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.
+ ##################################################
+ 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_default) \
+ 	$(libjso_static) \
+ 	$(libjso_target) \
+ 	$(libj_exjarfile) \
+@@ -811,14 +798,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) && \

package/base/bdb/transform-name.patch_bdb33

@@ -0,0 +1,37 @@
+# --- 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/bdb33/transform-name.patch
+# 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 ---
+
+--- db-3.3.11/dist/Makefile.in.orig	2001-07-06 22:53:16.000000000 +0200
++++ db-3.3.11/dist/Makefile.in	2003-02-06 10:28:11.000000000 +0100
+@@ -454,9 +454,9 @@
+ 	@test -d $(bindir) || \
+ 	    ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir))
+ 	@cd $(bindir) && $(rm) -f $(UTIL_PROGS)
+-	@$(INSTALLER) -fp $(UTIL_PROGS) $(bindir)
+-	@cd $(bindir) && (test ! -f $(strip) || $(strip) $(UTIL_PROGS))
+-	@cd $(bindir) && $(chmod) $(emode) $(UTIL_PROGS)
++	@for i in $(UTIL_PROGS); do \
++		cp .libs/$$i $(bindir)/`basename $$i | sed $(transform)`; \
++	done
+ 
+ uninstall_utilities:
+ 	-cd $(bindir) && $(rm) -f $(UTIL_PROGS)

package/base/bdb/transform-name.patch_bdb40

@@ -0,0 +1,39 @@
+# --- 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/bdb40/transform-name.patch
+# 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 ---
+
+--- ./dist/Makefile.in.orig	Sat Apr 19 08:07:27 2003
++++ ./dist/Makefile.in	Sat Apr 19 08:07:44 2003
+@@ -419,13 +419,8 @@
+ 	done)
+ 	@for i in $(UTIL_PROGS); do \
+ 		test -f $$i.exe && i=$$i.exe; \
+-		$(INSTALLER) -fp $$i $(bindir); \
++		cp .libs/$$i $(bindir)/`basename $$i | sed $(transform)`; \
+ 	done
+-	@(cd $(bindir); for i in $(UTIL_PROGS); do \
+-		test -f $$i.exe && i=$$i.exe; \
+-		test -f $(strip) && $(strip) $$i || true; \
+-		$(chmod) $(emode) $$i; \
+-	done)
+ 
+ uninstall_utilities:
+ 	@(cd $(bindir); for i in $(UTIL_PROGS); do \

package/base/bdb/transform-name.patch_bdb41

@@ -0,0 +1,37 @@
+# --- 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/bdb41/transform-name.patch
+# 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 ---
+
+--- ./dist/Makefile.in.orig	Fri Apr 18 18:14:56 2003
++++ ./dist/Makefile.in	Fri Apr 18 18:21:47 2003
+@@ -588,11 +588,7 @@
+ 	@test -d $(bindir) || \
+ 	    ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir))
+ 	@for i in $(UTIL_PROGS); do \
+-		$(rm) -f $(bindir)/$$i $(bindir)/$$i.exe; \
+-		test -f $$i.exe && i=$$i.exe || true; \
+-		$(INSTALLER) $$i $(bindir)/$$i; \
+-		test -f $(strip) && $(strip) $(bindir)/$$i || true; \
+-		$(chmod) $(emode) $(bindir)/$$i; \
++		cp .libs/$$i $(bindir)/`basename $$i | sed $(transform)`; \
+ 	done
+ 
+ uninstall_utilities:

scripts/Build-Pkg

@@ -446,7 +446,9 @@ fi
 
 targetdir="$base/target/$target"
 patchfiles="`ls $confdir/*.patch $confdir/*.patch.$arch \
+             $confdir/*.patch_$xpkg $confdir/*.patch_$xpkg.$arch \
              $targetdir/pkg_$pkg.patch $targetdir/pkg_$pkg.patch.$arch \
+             $targetdir/xpkg_$xpkg.patch $targetdir/xpkg_$xpkg.patch.$arch \
              2>/dev/null | tr '\n' ' '`"
 
 if [ $stagelevel -le 1 ]; then

scripts/functions

@@ -163,14 +163,14 @@ set_confopt() {
 		datadir="$root/usr/share"
 		includedir="$root/usr/include"
 
-		docdir="$root/usr/doc/$pkg"
+		docdir="$root/usr/doc/$xpkg"
 		infodir="$root/usr/info"
 		mandir="$root/usr/man"
 	else
 		datadir="$root/$prefix/share"
 		includedir="$root/$prefix/include"
 
-		docdir="$root/$prefix/doc/$pkg"
+		docdir="$root/$prefix/doc/$xpkg"
 		infodir="$root/$prefix/info"
 		mandir="$root/$prefix/man"
 	fi
@@ -376,9 +376,9 @@ create_config_cache() {
 #
 abort() {
 	echo -e "The package build aborted with the following config" \
-	     "error:\n$*" > $root/var/adm/logs/$stagelevel-$pkg.err
-	echo_errorquote "`cat $root/var/adm/logs/$stagelevel-$pkg.err`"
-	echo_pkg_abort $stagelevel $repository $pkg
+	     "error:\n$*" > $root/var/adm/logs/$stagelevel-$xpkg.err
+	echo_errorquote "`cat $root/var/adm/logs/$stagelevel-$xpkg.err`"
+	echo_pkg_abort $stagelevel $repository $xpkg
 	exit 1
 }
 
@@ -539,7 +539,7 @@ build_this_package() {
 			xsourceballs=$( echo "$desc_D" | head -n 1 | tr ' ' '\t' | tr -s '\t' | \
 				cut -f2 | sed 's,.\(t\?\)\(gz\|Z\)$,.\1bz2,' )
 			if [ -z "$xsourceballs" ] ; then
-				echo "Can't auto-detect srctar for package '$pkg'!"
+				echo "Can't auto-detect srctar for package '$xpkg'!"
 				false
 			fi
 		else
@@ -565,8 +565,10 @@ build_this_package() {
 				xsrcdir=${xsrctar%.tar.bz2}
 				xsrcdir=${xsrcdir%.tbz2}
 				if [ ! -d $xsrcdir ] ; then
-					for x in $pkg-$ver $pkg_$ver $pkg \
-							   "`cat xsrcdir.txt`" ; do
+					for x in $pkg-$ver ${pkg}_$ver $pkg \
+					         $xpkg-$ver ${xpkg}_$ver $xpkg \
+					         "$( cat xsrcdir.txt )"
+					do
 						[ -d "$x" ] && xsrcdir="$x"
 					done
 				fi