Mark deprecated, for 41/42, add CONFLICTS between crypto/-nocrypto ports.

10 files changed, 28 insertions, 4 deletions

diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index cce66b48f198..f127e32e25e8 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -10,6 +10,8 @@ MASTER_SITES=	http://download.oracle.com/berkeley-db/
 DISTNAME=	db-${PORTVERSION}
 DIST_SUBDIR=	bdb
 
+DEPRECATED=	Please migrate to databases/db5
+
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	The Berkeley DB package, revision 4
 
diff --git a/databases/db41-nocrypto/Makefile b/databases/db41-nocrypto/Makefile
index 34f745c88ab4..0bac28b2e401 100644
--- a/databases/db41-nocrypto/Makefile
+++ b/databases/db41-nocrypto/Makefile
@@ -8,4 +8,6 @@ MASTERDIR=	${.CURDIR}/../db41
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 NO_STAGE=	yes
+CONFLICTS=	db41-4*
+
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/db41/Makefile b/databases/db41/Makefile
index b2c973f90659..7f305618bb83 100644
--- a/databases/db41/Makefile
+++ b/databases/db41/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	db41
 PORTVERSION=	4.1.25
 PORTREVISION=	4
 CATEGORIES=	databases
-MASTER_SITES=	http://download.oracle.com/berkeley-db/ 
+MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMESUFFIX?=
 DISTNAME?=	db-${PORTVERSION}
 DIST_SUBDIR=	bdb
@@ -17,6 +17,10 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	The Berkeley DB package, revision 4.1
 
+CONFLICTS?=	db41-nocrypto-4*
+
+DEPRECATED=	Please migrate to databases/db5
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 GNU_CONFIGURE=	yes
@@ -26,7 +30,9 @@ CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 \
 		--includedir=${PREFIX}/include/db41
 USE_LDCONFIG=	yes
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install install_docs
 PORTDOCS=	*
 .endif
diff --git a/databases/db41/pkg-descr b/databases/db41/pkg-descr
index b2e41cbcfc16..c37f1604f9e6 100644
--- a/databases/db41/pkg-descr
+++ b/databases/db41/pkg-descr
@@ -6,5 +6,5 @@ compatibility with programs using the v1.85 interface.
 
 For details on compatibility with other DB versions, see:
 http://www.sleepycat.com/download/patchlogs.shtml
-  
-WWW:	http://www.oracle.com/us/products/database/berkeley-db/db/
+
+WWW: http://www.oracle.com/us/products/database/berkeley-db/db/
diff --git a/databases/db42-nocrypto/Makefile b/databases/db42-nocrypto/Makefile
index 8db6ea68ee30..2fce4e57ed28 100644
--- a/databases/db42-nocrypto/Makefile
+++ b/databases/db42-nocrypto/Makefile
@@ -10,4 +10,6 @@ MASTERDIR=	${.CURDIR}/../db42
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 NO_STAGE=	yes
+CONFLICTS=	db42-4*
+
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/db42/Makefile b/databases/db42/Makefile
index 4c58a4c3ba6d..3d9e2f5ba4f5 100644
--- a/databases/db42/Makefile
+++ b/databases/db42/Makefile
@@ -14,6 +14,10 @@ PATCHFILES=	patch.${PORTVERSION}.1  patch.${PORTVERSION}.2 \
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	The Berkeley DB package, revision 4.2
 
+DEPRECATED=	Please migrate to databases/db5
+
+CONFLICTS?=	db42-nocrypto-4*
+
 MASTERDIR?=	${.CURDIR}
 
 SLAVE_PORT=	no
diff --git a/databases/db43/Makefile b/databases/db43/Makefile
index 6a36e0cd23aa..3330cd0ca0a4 100644
--- a/databases/db43/Makefile
+++ b/databases/db43/Makefile
@@ -14,6 +14,8 @@ COMMENT=	The Berkeley DB package, revision 4.3
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
+DEPRECATED=	Please migrate to databases/db5
+
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../dist/configure
diff --git a/databases/db44/Makefile b/databases/db44/Makefile
index 33ae4014ea64..1aa40ab2b30a 100644
--- a/databases/db44/Makefile
+++ b/databases/db44/Makefile
@@ -14,6 +14,8 @@ COMMENT=	The Berkeley DB package, revision 4.4
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
+DEPRECATED=	Please migrate to databases/db5
+
 USE_LDCONFIG=		yes
 GNU_CONFIGURE=		yes
 DEBUG_FLAGS=		-g -O1	# need -O1 for inline assembly
diff --git a/databases/db46/Makefile b/databases/db46/Makefile
index 53e7f6ffd410..4c77bb0eb365 100644
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@@ -32,6 +32,8 @@ PATCH_DIST_STRIP=	-d .. -l
 MAINTAINER=	gslin@gslin.org
 COMMENT=	The Berkeley DB package, revision 4.6
 
+DEPRECATED=	Please migrate to databases/db5
+
 BDBVER=		${PORTVERSION:R:R}
 CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx \
 		--enable-dynamic --enable-rpc --enable-pthread_api \
diff --git a/databases/db47/Makefile b/databases/db47/Makefile
index ff0edd3aa4b6..991c6e029a1e 100644
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@@ -30,6 +30,8 @@ PATCH_DIST_STRIP=	-d .. --ignore-whitespace
 MAINTAINER=	gslin@gslin.org
 COMMENT=	The Berkeley DB package, revision 4.7
 
+DEPRECATED=	Please migrate to databases/db5
+
 BDBVER=		${PORTVERSION:R:R}
 CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx \
 		--enable-dynamic --enable-rpc --enable-pthread_api \