3 files changed, 30 insertions, 31 deletions

diff --git a/databases/db42/Makefile b/databases/db42/Makefile
index 68489f6b63ee..0068eed77016 100644
--- a/databases/db42/Makefile
+++ b/databases/db42/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	db4
-PORTVERSION=	4.0.14
-PORTREVISION=	1
+PORTVERSION=	4.1.25
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
 DISTNAME=	db-${PORTVERSION}
@@ -25,7 +24,7 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-compat185 --enable-dump285 \
+CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 \
 		--enable-cxx --enable-dynamic \
 		--includedir=${PREFIX}/include/db4
 INSTALLS_SHLIB=	yes
diff --git a/databases/db42/distinfo b/databases/db42/distinfo
index 09f3d6b59aec..2dc57c5d26c6 100644
--- a/databases/db42/distinfo
+++ b/databases/db42/distinfo
@@ -1 +1 @@
-MD5 (bdb/db-4.0.14.tar.gz) = 12262c64fcd64b772e7cffad8e4d0ebc
+MD5 (bdb/db-4.1.25.tar.gz) = df71961002b552c0e72c6e4e358f27e1
diff --git a/databases/db42/files/patch-dist::Makefile.in b/databases/db42/files/patch-dist::Makefile.in
index cf1f67e21a73..68d6e51ba52b 100644
--- a/databases/db42/files/patch-dist::Makefile.in
+++ b/databases/db42/files/patch-dist::Makefile.in
@@ -1,5 +1,5 @@
---- ../dist/Makefile.in.orig	Sat Nov 10 07:48:45 2001
-+++ ../dist/Makefile.in	Sat Nov  9 17:36:00 2002
+--- ../dist/Makefile.in.orig	Sat Aug 31 03:11:56 2002
++++ ../dist/Makefile.in	Sat Dec 28 01:15:46 2002
 @@ -11,7 +11,7 @@
  bindir=	@bindir@
  includedir=@includedir@
@@ -17,7 +17,7 @@
  SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
  
  ##################################################
-@@ -60,13 +61,13 @@
+@@ -59,13 +60,13 @@
  LIBS=		@LIBS@
  LIBSO_LIBS=	@LIBSO_LIBS@
  
@@ -37,7 +37,7 @@
  
  ##################################################
  # C++ API.
-@@ -79,13 +80,13 @@
+@@ -78,13 +79,13 @@
  XSOLINK=	@MAKEFILE_XSOLINK@
  LIBXSO_LIBS=	@LIBXSO_LIBS@
  
@@ -57,20 +57,20 @@
  
  ##################################################
  # Java API.
-@@ -235,8 +236,8 @@
- 	db_server_proc@o@ db_server_svc@o@ db_server_util@o@ gen_db_server@o@
+@@ -364,8 +365,8 @@
  
  UTIL_PROGS=\
--	@ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
+ 	@ADDITIONAL_PROGS@ \
+-	db_archive db_checkpoint db_deadlock \
 -	db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
-+	@ADDITIONAL_PROGS@ db4_archive db4_checkpoint db4_deadlock \
++	db4_archive db4_checkpoint db4_deadlock \
 +	db4_dump db4_load db4_printlog db4_recover db4_stat db4_upgrade db4_verify
  
  ##################################################
  # List of files installed into the library directory.
-@@ -330,53 +331,53 @@
- 	    $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS)
- 	$(POSTLINK) $@
+@@ -481,53 +482,53 @@
+ 	echo >> $@ exec java com.sleepycat.db.rpcserver.DbServer \$$@
+ 	chmod +x $@
  
 -db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
 +db4_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
@@ -90,19 +90,19 @@
  	    db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
-+db4_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
- 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
+-db_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
++db4_dump: db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_dump185: db_dump185@o@ @LIBOBJS@
-+db4_dump185: db_dump185@o@ @LIBOBJS@
- 	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB)
+-db_dump185: db_dump185@o@ @LTLIBOBJS@
++db4_dump185: db_dump185@o@ @LTLIBOBJS@
+ 	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LTLIBOBJS@ $(DB185LIB)
  	$(POSTLINK) $@
  
--db_load: db_load@o@ util_sig@o@ $(DEF_LIB)
-+db4_load: db_load@o@ util_sig@o@ $(DEF_LIB)
- 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
+-db_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
++db4_load: db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
 -db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
@@ -117,9 +117,9 @@
  	    db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
-+db4_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
- 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
+-db_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
++db4_stat: db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
 -db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
@@ -128,12 +128,12 @@
  	    db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
-+db4_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
+-db_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
++db4_verify: db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB)
  	$(CCLINK) -o $@ $(LDFLAGS) \
- 	    db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
+ 	    db_verify@o@ util_cache@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
-@@ -385,7 +386,7 @@
+@@ -536,7 +537,7 @@
  # Library and standard utilities install.
  ##################################################
  library_install: install_setup