Upgrade to 4.7.25.0

PR:		ports/124224
Submitted by:	gslin (maintainer)

3 files changed, 60 insertions, 70 deletions

diff --git a/databases/db47/Makefile b/databases/db47/Makefile
index 80ad012f05d6..13e339678503 100644
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:	db46
-# Date created:		2007-07-26
+# New ports collection makefile for:	db47
+# Date created:		2008-06-23
 # Whom:			Gea-Suan Lin <gslin@gslin.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	db46
-PORTVERSION=	4.6.21.1
+PORTNAME=	db47
+PORTVERSION=	4.7.25.0
 CATEGORIES=	databases
 MASTER_SITES=	http://download-west.oracle.com/berkeley-db/ \
 		http://download-east.oracle.com/berkeley-db/ \
@@ -15,18 +15,11 @@ PKGNAMEPREFIX?=
 DISTNAME=	db-${PORTVERSION:R}
 DIST_SUBDIR=	bdb
 
-PATCH_SITES=	http://www.oracle.com/technology/products/berkeley-db/db/update/${PORTVERSION:R}/
-PATCHFILES=	patch.4.6.21.1
-PATCH_DIST_STRIP=	-d ..
-# * patch.4.6.21.1: -----------------------------------------------------------
-# Fixes a race condition between checkpoint and DB->close which can result in
-# the checkpoint thread self-deadlocking. [#15692]
-
 # I allow matthias.andree@gmx.de and all freebsd committer to do changes
 # to this package.
 
 MAINTAINER=	gslin@gslin.org
-COMMENT=	The Berkeley DB package, revision 4.6
+COMMENT=	The Berkeley DB package, revision 4.7
 
 BDBVER=		${PORTVERSION:R:R}
 CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx \
diff --git a/databases/db47/distinfo b/databases/db47/distinfo
index ffac2921cd74..b85332845c1e 100644
--- a/databases/db47/distinfo
+++ b/databases/db47/distinfo
@@ -1,6 +1,3 @@
-MD5 (bdb/db-4.6.21.tar.gz) = 718082e7e35fc48478a2334b0bc4cd11
-SHA256 (bdb/db-4.6.21.tar.gz) = 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21
-SIZE (bdb/db-4.6.21.tar.gz) = 11881885
-MD5 (bdb/patch.4.6.21.1) = 4878872edfc53c6ecb871b1062a4bdaf
-SHA256 (bdb/patch.4.6.21.1) = d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53
-SIZE (bdb/patch.4.6.21.1) = 2475
+MD5 (bdb/db-4.7.25.tar.gz) = ec2b87e833779681a0c3a814aa71359e
+SHA256 (bdb/db-4.7.25.tar.gz) = f14fd96dd38915a1d63dcb94a63fbb8092334ceba6b5060760427096f631263e
+SIZE (bdb/db-4.7.25.tar.gz) = 13124129
diff --git a/databases/db47/pkg-plist b/databases/db47/pkg-plist
index e4a0343e6f56..c41337908485 100644
--- a/databases/db47/pkg-plist
+++ b/databases/db47/pkg-plist
@@ -1,53 +1,53 @@
 @comment $FreeBSD$
-bin/berkeley_db_svc-4.6
-bin/db46/berkeley_db_svc
-bin/db46/db_archive
-bin/db46/db_checkpoint
-bin/db46/db_codegen
-bin/db46/db_deadlock
-bin/db46/db_dump
-bin/db46/db_dump185
-bin/db46/db_hotbackup
-bin/db46/db_load
-bin/db46/db_printlog
-bin/db46/db_recover
-bin/db46/db_stat
-bin/db46/db_upgrade
-bin/db46/db_verify
-bin/db_archive-4.6
-bin/db_checkpoint-4.6
-bin/db_codegen-4.6
-bin/db_deadlock-4.6
-bin/db_dump-4.6
-bin/db_dump185-4.6
-bin/db_hotbackup-4.6
-bin/db_load-4.6
-bin/db_printlog-4.6
-bin/db_recover-4.6
-bin/db_stat-4.6
-bin/db_upgrade-4.6
-bin/db_verify-4.6
-include/db46/db.h
-include/db46/db_185.h
-include/db46/db_cxx.h
-lib/db46/libdb-4.6.a
-lib/db46/libdb-4.6.la
-lib/db46/libdb-4.6.so
-lib/db46/libdb-4.6.so.0
-lib/db46/libdb-4.so
-lib/db46/libdb.a
-lib/db46/libdb.so
-lib/db46/libdb_cxx-4.6.a
-lib/db46/libdb_cxx-4.6.la
-lib/db46/libdb_cxx-4.6.so
-lib/db46/libdb_cxx-4.6.so.0
-lib/db46/libdb_cxx-4.so
-lib/db46/libdb_cxx.a
-lib/db46/libdb_cxx.so
-lib/libdb-4.6.so
-lib/libdb-4.6.so.0
-lib/libdb_cxx-4.6.so
-lib/libdb_cxx-4.6.so.0
-@dirrmtry lib/db46
-@dirrmtry include/db46
-@dirrmtry bin/db46
+bin/berkeley_db_svc-4.7
+bin/db47/berkeley_db_svc
+bin/db47/db_archive
+bin/db47/db_checkpoint
+bin/db47/db_codegen
+bin/db47/db_deadlock
+bin/db47/db_dump
+bin/db47/db_dump185
+bin/db47/db_hotbackup
+bin/db47/db_load
+bin/db47/db_printlog
+bin/db47/db_recover
+bin/db47/db_stat
+bin/db47/db_upgrade
+bin/db47/db_verify
+bin/db_archive-4.7
+bin/db_checkpoint-4.7
+bin/db_codegen-4.7
+bin/db_deadlock-4.7
+bin/db_dump-4.7
+bin/db_dump185-4.7
+bin/db_hotbackup-4.7
+bin/db_load-4.7
+bin/db_printlog-4.7
+bin/db_recover-4.7
+bin/db_stat-4.7
+bin/db_upgrade-4.7
+bin/db_verify-4.7
+include/db47/db.h
+include/db47/db_185.h
+include/db47/db_cxx.h
+lib/db47/libdb-4.7.a
+lib/db47/libdb-4.7.la
+lib/db47/libdb-4.7.so
+lib/db47/libdb-4.7.so.0
+lib/db47/libdb-4.so
+lib/db47/libdb.a
+lib/db47/libdb.so
+lib/db47/libdb_cxx-4.7.a
+lib/db47/libdb_cxx-4.7.la
+lib/db47/libdb_cxx-4.7.so
+lib/db47/libdb_cxx-4.7.so.0
+lib/db47/libdb_cxx-4.so
+lib/db47/libdb_cxx.a
+lib/db47/libdb_cxx.so
+lib/libdb-4.7.so
+lib/libdb-4.7.so.0
+lib/libdb_cxx-4.7.so
+lib/libdb_cxx-4.7.so.0
+@dirrmtry lib/db47
+@dirrmtry include/db47
+@dirrmtry bin/db47