Only in .: CVS
Only in /Users/peterlin/berkeleydb/: cxx
diff -u ./db-3.2.9.patch /Users/peterlin/berkeleydb/db-3.2.9.patch
--- ./db-3.2.9.patch	Thu Feb 28 21:02:35 2002
+++ /Users/peterlin/berkeleydb/db-3.2.9.patch	Thu Feb 28 20:59:35 2002
@@ -1,6 +1,6 @@
-diff -u -r /Users/peterlin/db-3.2.9/cxx/cxx_app.cpp build/unxmacxp.pro/db-3.2.9/cxx/cxx_app.cpp
+diff -r -u /Users/peterlin/db-3.2.9/cxx/cxx_app.cpp build/unxmacxp.pro/db-3.2.9/cxx/cxx_app.cpp
 --- /Users/peterlin/db-3.2.9/cxx/cxx_app.cpp	Thu Jan 11 10:28:22 2001
-+++ build/unxmacxp.pro/db-3.2.9/cxx/cxx_app.cpp	Sat Dec  1 11:35:16 2001
++++ build/unxmacxp.pro/db-3.2.9/cxx/cxx_app.cpp	Thu Feb 28 20:57:52 2002
 @@ -7,6 +7,8 @@
  
  #include "db_config.h"
@@ -11,9 +11,9 @@
  static const char revid[] = "$Id: cxx_app.cpp,v 11.38 2000/12/21 20:30:18 dda Exp $";
  #endif /* not lint */
 Only in build/unxmacxp.pro/db-3.2.9/cxx: cxx_app.cpp~
-diff -u -r /Users/peterlin/db-3.2.9/cxx/cxx_table.cpp build/unxmacxp.pro/db-3.2.9/cxx/cxx_table.cpp
+diff -r -u /Users/peterlin/db-3.2.9/cxx/cxx_table.cpp build/unxmacxp.pro/db-3.2.9/cxx/cxx_table.cpp
 --- /Users/peterlin/db-3.2.9/cxx/cxx_table.cpp	Thu Jan 11 10:28:22 2001
-+++ build/unxmacxp.pro/db-3.2.9/cxx/cxx_table.cpp	Sat Dec  1 11:35:16 2001
++++ build/unxmacxp.pro/db-3.2.9/cxx/cxx_table.cpp	Thu Feb 28 20:57:52 2002
 @@ -7,6 +7,8 @@
  
  #include "db_config.h"
@@ -24,10 +24,9 @@
  static const char revid[] = "$Id: cxx_table.cpp,v 11.35 2001/01/11 18:19:49 bostic Exp $";
  #endif /* not lint */
 Only in build/unxmacxp.pro/db-3.2.9/cxx: cxx_table.cpp~
-Only in build/unxmacxp.pro/db-3.2.9/dist: Makefile
-diff -u -r /Users/peterlin/db-3.2.9/dist/Makefile.in build/unxmacxp.pro/db-3.2.9/dist/Makefile.in
+diff -r -u /Users/peterlin/db-3.2.9/dist/Makefile.in build/unxmacxp.pro/db-3.2.9/dist/Makefile.in
 --- /Users/peterlin/db-3.2.9/dist/Makefile.in	Thu Nov 30 15:07:33 2000
-+++ build/unxmacxp.pro/db-3.2.9/dist/Makefile.in	Sat Dec  1 11:35:16 2001
++++ build/unxmacxp.pro/db-3.2.9/dist/Makefile.in	Thu Feb 28 20:57:52 2002
 @@ -8,7 +8,7 @@
  ##################################################
  CPPFLAGS=	-I$(builddir) -I$(srcdir)/include @CPPFLAGS@
@@ -38,56 +37,60 @@
  CC=		@MAKEFILE_CC@
  CCLINK=		@MAKEFILE_CCLINK@
 Only in build/unxmacxp.pro/db-3.2.9/dist: Makefile.in~
-Only in build/unxmacxp.pro/db-3.2.9/dist: config.cache
-Only in build/unxmacxp.pro/db-3.2.9/dist: config.log
-Only in build/unxmacxp.pro/db-3.2.9/dist: config.status
-diff -u -r /Users/peterlin/db-3.2.9/dist/configure build/unxmacxp.pro/db-3.2.9/dist/configure
+diff -r -u /Users/peterlin/db-3.2.9/dist/configure build/unxmacxp.pro/db-3.2.9/dist/configure
 --- /Users/peterlin/db-3.2.9/dist/configure	Wed Jan 24 07:16:18 2001
-+++ build/unxmacxp.pro/db-3.2.9/dist/configure	Sun Dec 23 21:31:39 2001
-@@ -1781,17 +1781,31 @@
++++ build/unxmacxp.pro/db-3.2.9/dist/configure	Thu Feb 28 20:54:54 2002
+@@ -1781,17 +1781,36 @@
  		echo "$ac_t""$JAVACABS" 1>&6
  	done
  	JTOPDIR=`echo "$JAVACABS" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
 -	if test -f "$JTOPDIR/include/jni.h"; then
 -		CPPFLAGS="$CPPFLAGSS -I$JTOPDIR/include"
-+
-+# [ed] 12/23/01 On OS X/darwin the java include directory is named the traditional Headers
-+# name and not include
-+	
-+	if test "$host_os" = "darwin5.2"; then
-+		JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'`
-+		echo "$JFRAMEDIR"
-+		if test -f "$JFRAMEDIR/Headers/jni.h"; then
-+			CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers"
-+		else
-+			{ echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Headers/jni.h)" 1>&2; exit 1; }
-+		fi
- 	else
+-	else
 -		JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'`
- 		if test -f "$JTOPDIR/include/jni.h"; then
- 			CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include"
- 		else
+-		if test -f "$JTOPDIR/include/jni.h"; then
+-			CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include"
+-		else
 -			{ echo "configure: error: cannot find java include files" 1>&2; exit 1; }
-+			JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'`
+-		fi
+-	fi
+ 
++# [ed] 12/23/01 On OS X/darwin the java include directory is named the traditional Headers
++# name and not include
++
++# [ed] 2/28/02 Make this generic for darwin
++
++	case "$host_os" in
++		darwin*)
++			JFRAMEDIR=`echo "$JTOPDIR" | sed -e 's:JavaVM.framework.*$:JavaVM.framework:'`
++			echo "$JFRAMEDIR"
++			if test -f "$JFRAMEDIR/Headers/jni.h"; then
++				CPPFLAGS="$CPPFLAGS -I$JFRAMEDIR/Headers"
++			else
++				{ echo "configure: error: cannot find java include files (Darwin: $JFRAMEDIR/Headers/jni.h)" 1>&2; exit 1; }
++			fi
++			;;
++		*)
 +			if test -f "$JTOPDIR/include/jni.h"; then
 +				CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include"
 +			else
-+				{ echo "configure: error: cannot find java include files" 1>&2; exit 1; }
++				JTOPDIR=`echo "$JTOPDIR" | sed -e 's:/[^/]*$::'`
++				if test -f "$JTOPDIR/include/jni.h"; then
++					CPPFLAGS="$CPPFLAGS -I$JTOPDIR/include"
++				else
++					{ echo "configure: error: cannot find java include files" 1>&2; exit 1; }
++				fi
 +			fi
- 		fi
- 	fi
--
++			;;
++	esac
 +	
  	case "$host_os" in
  	solaris*)	JINCSUBDIRS="solaris";;
  	linux*)		JINCSUBDIRS="linux genunix";;
-Only in build/unxmacxp.pro/db-3.2.9/dist: db.h
-Only in build/unxmacxp.pro/db-3.2.9/dist: db_config.h
-Only in build/unxmacxp.pro/db-3.2.9/dist: db_int.h
-Only in build/unxmacxp.pro/db-3.2.9/dist: include.tcl
-diff -u -r /Users/peterlin/db-3.2.9/dist/ltconfig build/unxmacxp.pro/db-3.2.9/dist/ltconfig
+Only in build/unxmacxp.pro/db-3.2.9/dist: configure~
+diff -r -u /Users/peterlin/db-3.2.9/dist/ltconfig build/unxmacxp.pro/db-3.2.9/dist/ltconfig
 --- /Users/peterlin/db-3.2.9/dist/ltconfig	Fri Oct 13 13:23:00 2000
-+++ build/unxmacxp.pro/db-3.2.9/dist/ltconfig	Sat Jan  5 17:44:55 2002
++++ build/unxmacxp.pro/db-3.2.9/dist/ltconfig	Thu Feb 28 20:57:53 2002
 @@ -678,6 +678,11 @@
    cygwin* | mingw* | os2*)
      # We can build DLLs from non-PIC.
@@ -556,9 +559,9 @@
  # End:
 -#! /bin/bash
 Only in build/unxmacxp.pro/db-3.2.9/dist: ltconfig~
-diff -u -r /Users/peterlin/db-3.2.9/dist/ltmain.sh build/unxmacxp.pro/db-3.2.9/dist/ltmain.sh
+diff -r -u /Users/peterlin/db-3.2.9/dist/ltmain.sh build/unxmacxp.pro/db-3.2.9/dist/ltmain.sh
 --- /Users/peterlin/db-3.2.9/dist/ltmain.sh	Sun Aug  6 11:32:00 2000
-+++ build/unxmacxp.pro/db-3.2.9/dist/ltmain.sh	Sat Jan  5 17:44:58 2002
++++ build/unxmacxp.pro/db-3.2.9/dist/ltmain.sh	Thu Feb 28 20:57:53 2002
 @@ -1079,6 +1079,11 @@
  	    # These systems don't actually have c library (as such)
  	    continue
@@ -642,5 +645,4 @@
  # End:
 -#! /bin/bash
 Only in build/unxmacxp.pro/db-3.2.9/dist: ltmain.sh~
-Only in build/unxmacxp.pro/db-3.2.9/java: classes
 Only in build/unxmacxp.pro/db-3.2.9: out
Only in /Users/peterlin/berkeleydb/: db-3.2.9.patch.rej
Only in /Users/peterlin/berkeleydb/: db-3.2.9.patch~
Only in /Users/peterlin/berkeleydb/: dist
Only in .: download
Only in .: makefile.mk
Only in .: prj