8 files changed, 3 insertions, 220 deletions

diff --git a/MOVED b/MOVED
index f9801383a455..36ee177a6166 100644
--- a/MOVED
+++ b/MOVED
@@ -1585,3 +1585,4 @@ lang/gnat-gcc44||2011-03-17|Removed unmaintained and obsolete
 games/wormux-devel||2011-03-17|Project was renamed
 games/etuxracer|games/etracer|2011-03-18|Removed it is a duplicate of games/etracer
 net/p5-Net-IP-Anonymous|net/p5-IP-Anonymous|2011-03-19|Move to a correct directory
+databases/db50||2011-03-21|Removed, use databases/db51 instead
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 1dff0c4c53d8..bb4647fcab78 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -234,7 +234,7 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 .if defined(USE_BDB)
 
-_DB_PORTS=	2 3 40 41 42 43 44 45 46 47 48 50 51 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+ 50+ 51+
+_DB_PORTS=	2 3 40 41 42 43 44 45 46 47 48 51 3+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ 48+ 51+
 # Dependence lines for different db versions
 db2_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
 db3_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
@@ -247,7 +247,6 @@ db45_DEPENDS=	db-4.5.0:${PORTSDIR}/databases/db45
 db46_DEPENDS=	db-4.6.0:${PORTSDIR}/databases/db46
 db47_DEPENDS=	db-4.7.0:${PORTSDIR}/databases/db47
 db48_DEPENDS=	db-4.8.0:${PORTSDIR}/databases/db48
-db50_DEPENDS=	db-5.0.0:${PORTSDIR}/databases/db50
 db51_DEPENDS=	db-5.1.0:${PORTSDIR}/databases/db51
 # Detect db versions by finding some files
 db3_FIND=	${LOCALBASE}/include/db3/db.h
@@ -260,7 +259,6 @@ db45_FIND=	${LOCALBASE}/include/db45/db.h
 db46_FIND=	${LOCALBASE}/include/db46/db.h
 db47_FIND=	${LOCALBASE}/include/db47/db.h
 db48_FIND=	${LOCALBASE}/include/db48/db.h
-db50_FIND=	${LOCALBASE}/include/db50/db.h
 db51_FIND=	${LOCALBASE}/include/db51/db.h
 
 # For specifying [3, 40, 41, ..]+
@@ -273,8 +271,7 @@ _DB_44P=	44 ${_DB_45P}
 _DB_45P=	45 ${_DB_46P}
 _DB_46P=	46 ${_DB_47P}
 _DB_47P=	47 ${_DB_48P}
-_DB_48P=	48 ${_DB_50P}
-_DB_50P=	50 ${_DB_51P}
+_DB_48P=	48 ${_DB_51P}
 _DB_51P=	51
 
 # Override the global WITH_BDB_VER with the
@@ -415,10 +412,6 @@ BDB_LIB_DIR=		${LOCALBASE}/lib/db47
 BDB_LIB_NAME=		db-4.8
 BDB_LIB_CXX_NAME=	db_cxx-4.8
 BDB_LIB_DIR=		${LOCALBASE}/lib/db48
-.  elif ${_BDB_VER} == 50
-BDB_LIB_NAME=		db-5.0
-BDB_LIB_CXX_NAME=	db_cxx-5.0
-BDB_LIB_DIR=		${LOCALBASE}/lib/db50
 .  elif ${_BDB_VER} == 51
 BDB_LIB_NAME=		db-5.1
 BDB_LIB_CXX_NAME=	db_cxx-5.1
diff --git a/databases/Makefile b/databases/Makefile
index 3d9c831599fa..bd87819ffa98 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -46,7 +46,6 @@
     SUBDIR += db47
     SUBDIR += db48
     SUBDIR += db4o-mono
-    SUBDIR += db50
     SUBDIR += db51
     SUBDIR += dbXML
     SUBDIR += dbconnect
diff --git a/databases/db50/Makefile b/databases/db50/Makefile
deleted file mode 100644
index 9f870e5c1929..000000000000
--- a/databases/db50/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# New ports collection makefile for:	db50
-# Date created:		2010-04-06
-# Whom:			Matthias Andree <mandree@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	db50
-PORTVERSION=	5.0.32.0
-PORTREVISION=	1
-CATEGORIES=	databases java
-MASTER_SITES=	http://download.oracle.com/berkeley-db/
-PKGNAMEPREFIX?=
-DISTNAME=	db-${PORTVERSION:R}
-DIST_SUBDIR=	bdb
-
-MAINTAINER=	mandree@FreeBSD.org
-COMMENT=	The Oracle Berkeley DB, revision 5.0
-
-BDBVER=		${PORTVERSION:R:R}
-CONFIGURE_ARGS=	--enable-cxx --enable-stl \
-		--includedir=${PREFIX}/include/${PORTNAME} \
-		--libdir=${PREFIX}/lib/${PORTNAME} \
-		--bindir=${PREFIX}/bin/${PORTNAME}
-CONFIGURE_SCRIPT=	../dist/configure
-GNU_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	yes
-USE_GMAKE=	yes
-INSTALL_TARGET=	install_include install_lib install_utilities
-LIBTOOLFILES=	${CONFIGURE_SCRIPT}
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
-USE_LDCONFIG=	yes
-
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET+=	install_docs docdir=${DOCSDIR}
-PORTDOCS=		*
-.endif
-
-OPTIONS=	SQL "SQL API (EXPERIMENTAL)" OFF \
-		JAVA "JAVA API (EXPERIMENTAL)" OFF
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SQL)
-CONFIGURE_ARGS+=	--enable-sql_codegen --enable-sql
-PLIST_SUB+=	SQL=""
-libdb_sql=	libdb_sql
-.else
-PLIST_SUB+=	SQL="@comment "
-libdb_sql=
-.endif
-
-.if defined(WITH_JAVA)
-USE_JAVA=	yes
-JAVA_VERSION=	1.5+
-CONFIGURE_ARGS+=	--enable-java
-CPPFLAGS+=	"-I{JAVA_HOME}/include"
-CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
-PLIST_SUB+=	JAVA=""
-libdb_java=	libdb_java
-.else
-PLIST_SUB+=	JAVA="@comment "
-libdb_java=
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
-
-post-install:
-.for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java}
-	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${PREFIX}/lib
-	${LN} -s -f ${i}-${BDBVER}.so.0 ${PREFIX}/lib/${i}-${BDBVER}.so
-	${LN} -s -f ${i}-${BDBVER}.a ${PREFIX}/lib/${PORTNAME}/${i}.a
-	${CHMOD} a-w ${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0 \
-		${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.a \
-		${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.la
-.endfor
-	cd ${PREFIX}/bin/${PORTNAME}; \
-	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER}; done
-.if !defined(NOPORTDOCS)
-.for i in api_reference/TCL
-	${RM} -r -f ${DOCSDIR}/${i}
-.endfor
-.if !defined(WITH_JAVA)
-	${RM} -r -f ${DOCSDIR}/java
-.for i in gsg gsg_db_rep gsg_txn
-	${RM} -r -f ${DOCSDIR}/${i}/JAVA
-.endfor
-.endif
-.if !defined(WITH_SQL)
-	${RM} -r -f ${DOCSDIR}/bdb-sql
-.endif
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/db50/distinfo b/databases/db50/distinfo
deleted file mode 100644
index 775527e014fa..000000000000
--- a/databases/db50/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (bdb/db-5.0.32.tar.gz) = 6d7bc4a927fbb40750f4e047252b3861d640fa74778b3bf1841c2913f053648e
-SIZE (bdb/db-5.0.32.tar.gz) = 29325258
diff --git a/databases/db50/files/patch-dist_configure b/databases/db50/files/patch-dist_configure
deleted file mode 100644
index 2dac99fc909d..000000000000
--- a/databases/db50/files/patch-dist_configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../dist/configure.orig	Wed Dec  5 13:14:02 2001
-+++ ../dist/configure	Wed Dec  5 13:24:01 2001
-@@ -20867,8 +20867,8 @@
- 
- MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
--MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
-+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -version-info 0:0:0"
- MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
- MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
--MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0"
- MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
- 
diff --git a/databases/db50/pkg-descr b/databases/db50/pkg-descr
deleted file mode 100644
index 171a54c0e062..000000000000
--- a/databases/db50/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Oracle Berkeley DB is a family of open source embeddable databases
-that allows developers to incorporate within their applications a
-fast, scalable, transactional database engine with industrial grade
-reliability and availability. As a result, customers and end-users
-will experience an application that simply works, reliably manages
-data, can scale under extreme load, but requires no ongoing database
-administration. As a developer, you can focus on your application and
-be confident that Oracle Berkeley DB will manage your persistence
-needs.
-
-WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
diff --git a/databases/db50/pkg-plist b/databases/db50/pkg-plist
deleted file mode 100644
index a0bddebb302d..000000000000
--- a/databases/db50/pkg-plist
+++ /dev/null
@@ -1,89 +0,0 @@
-@comment $FreeBSD$
-bin/db50/db_archive
-bin/db50/db_checkpoint
-bin/db50/db_deadlock
-bin/db50/db_dump
-bin/db50/db_hotbackup
-bin/db50/db_load
-bin/db50/db_log_verify
-bin/db50/db_printlog
-bin/db50/db_recover
-%%SQL%%bin/db50/dbsql
-%%SQL%%bin/db50/db_sql_codegen
-bin/db50/db_stat
-bin/db50/db_upgrade
-bin/db50/db_verify
-bin/db_archive-5.0
-bin/db_checkpoint-5.0
-bin/db_deadlock-5.0
-bin/db_dump-5.0
-bin/db_hotbackup-5.0
-bin/db_load-5.0
-bin/db_log_verify-5.0
-bin/db_printlog-5.0
-bin/db_recover-5.0
-%%SQL%%bin/db_sql_codegen-5.0
-bin/db_stat-5.0
-bin/db_upgrade-5.0
-bin/db_verify-5.0
-include/db50/db.h
-include/db50/db_cxx.h
-%%SQL%%include/db50/dbsql.h
-include/db50/dbstl_common.h
-include/db50/dbstl_set.h
-include/db50/dbstl_vector.h
-include/db50/dbstl_exception.h
-include/db50/dbstl_map.h
-include/db50/dbstl_utility.h
-include/db50/dbstl_dbc.h
-include/db50/dbstl_dbt.h
-include/db50/dbstl_base_iterator.h
-include/db50/dbstl_container.h
-include/db50/dbstl_element_ref.h
-include/db50/dbstl_inner_utility.h
-include/db50/dbstl_resource_manager.h
-lib/db50/libdb-5.0.a
-lib/db50/libdb-5.0.la
-lib/db50/libdb-5.0.so
-lib/db50/libdb-5.0.so.0
-lib/db50/libdb-5.so
-lib/db50/libdb.a
-lib/db50/libdb.so
-lib/db50/libdb_cxx-5.0.a
-lib/db50/libdb_cxx-5.0.la
-lib/db50/libdb_cxx-5.0.so
-lib/db50/libdb_cxx-5.0.so.0
-lib/db50/libdb_cxx-5.so
-lib/db50/libdb_cxx.a
-lib/db50/libdb_cxx.so
-lib/db50/libdb_stl-5.0.a
-lib/db50/libdb_stl-5.0.la
-lib/db50/libdb_stl-5.0.so
-lib/db50/libdb_stl-5.0.so.0
-lib/db50/libdb_stl-5.so
-lib/db50/libdb_stl.a
-lib/db50/libdb_stl.so
-%%JAVA%%lib/db50/db.jar
-%%JAVA%%lib/db50/libdb_java-5.0.a
-%%JAVA%%lib/db50/libdb_java-5.0.la
-%%JAVA%%lib/db50/libdb_java-5.0.so
-%%JAVA%%lib/db50/libdb_java-5.0.so.0
-%%JAVA%%lib/db50/libdb_java-5.0_g.so
-%%JAVA%%lib/db50/libdb_java-5.so
-%%JAVA%%lib/db50/libdb_java.a
-%%JAVA%%lib/db50/libdb_java.so
-%%JAVA%%lib/libdb_java-5.0.so
-%%JAVA%%lib/libdb_java-5.0.so.0
-%%SQL%%lib/db50/libdb_sql-5.0.so.0
-%%SQL%%lib/db50/libdb_sql-5.0.la
-%%SQL%%lib/db50/libdb_sql-5.0.a
-%%SQL%%lib/db50/libdb_sql.a
-lib/libdb-5.0.so
-lib/libdb-5.0.so.0
-lib/libdb_cxx-5.0.so
-lib/libdb_cxx-5.0.so.0
-lib/libdb_stl-5.0.so
-lib/libdb_stl-5.0.so.0
-@dirrmtry lib/db50
-@dirrmtry include/db50
-@dirrmtry bin/db50