From owner-svn-ports-all@FreeBSD.ORG Fri Dec 13 23:27:36 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87E01CD1; Fri, 13 Dec 2013 23:27:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 726B7193A; Fri, 13 Dec 2013 23:27:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBDNRaO7074853; Fri, 13 Dec 2013 23:27:36 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBDNRYuf074843; Fri, 13 Dec 2013 23:27:34 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312132327.rBDNRYuf074843@svn.freebsd.org> From: Matthias Andree Date: Fri, 13 Dec 2013 23:27:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336383 - in head/databases: db4 db41 db41-nocrypto db42 db42-nocrypto db43 db44 db46 db47 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2013 23:27:36 -0000 Author: mandree Date: Fri Dec 13 23:27:33 2013 New Revision: 336383 URL: http://svnweb.freebsd.org/changeset/ports/336383 Log: Mark deprecated, for 41/42, add CONFLICTS between crypto/-nocrypto ports. Modified: head/databases/db4/Makefile head/databases/db41-nocrypto/Makefile head/databases/db41/Makefile head/databases/db41/pkg-descr head/databases/db42-nocrypto/Makefile head/databases/db42/Makefile head/databases/db43/Makefile head/databases/db44/Makefile head/databases/db46/Makefile head/databases/db47/Makefile Modified: head/databases/db4/Makefile ============================================================================== --- head/databases/db4/Makefile Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db4/Makefile Fri Dec 13 23:27:33 2013 (r336383) @@ -10,6 +10,8 @@ MASTER_SITES= http://download.oracle.com DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb +DEPRECATED= Please migrate to databases/db5 + MAINTAINER= mandree@FreeBSD.org COMMENT= The Berkeley DB package, revision 4 Modified: head/databases/db41-nocrypto/Makefile ============================================================================== --- head/databases/db41-nocrypto/Makefile Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db41-nocrypto/Makefile Fri Dec 13 23:27:33 2013 (r336383) @@ -8,4 +8,6 @@ MASTERDIR= ${.CURDIR}/../db41 DISTINFO_FILE= ${.CURDIR}/distinfo NO_STAGE= yes +CONFLICTS= db41-4* + .include "${MASTERDIR}/Makefile" Modified: head/databases/db41/Makefile ============================================================================== --- head/databases/db41/Makefile Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db41/Makefile Fri Dec 13 23:27:33 2013 (r336383) @@ -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}/${DISTNAM 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 --ena --includedir=${PREFIX}/include/db41 USE_LDCONFIG= yes -.if !defined(NOPORTDOCS) +.include + +.if ${PORT_OPTIONS:MDOCS} INSTALL_TARGET= install install_docs PORTDOCS= * .endif Modified: head/databases/db41/pkg-descr ============================================================================== --- head/databases/db41/pkg-descr Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db41/pkg-descr Fri Dec 13 23:27:33 2013 (r336383) @@ -6,5 +6,5 @@ compatibility with programs using the v1 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/ Modified: head/databases/db42-nocrypto/Makefile ============================================================================== --- head/databases/db42-nocrypto/Makefile Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db42-nocrypto/Makefile Fri Dec 13 23:27:33 2013 (r336383) @@ -10,4 +10,6 @@ MASTERDIR= ${.CURDIR}/../db42 DISTINFO_FILE= ${.CURDIR}/distinfo NO_STAGE= yes +CONFLICTS= db42-4* + .include "${MASTERDIR}/Makefile" Modified: head/databases/db42/Makefile ============================================================================== --- head/databases/db42/Makefile Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db42/Makefile Fri Dec 13 23:27:33 2013 (r336383) @@ -14,6 +14,10 @@ PATCHFILES= patch.${PORTVERSION}.1 patc 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 Modified: head/databases/db43/Makefile ============================================================================== --- head/databases/db43/Makefile Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db43/Makefile Fri Dec 13 23:27:33 2013 (r336383) @@ -14,6 +14,8 @@ COMMENT= The Berkeley DB package, revisi WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix +DEPRECATED= Please migrate to databases/db5 + USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../dist/configure Modified: head/databases/db44/Makefile ============================================================================== --- head/databases/db44/Makefile Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db44/Makefile Fri Dec 13 23:27:33 2013 (r336383) @@ -14,6 +14,8 @@ COMMENT= The Berkeley DB package, revisi 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 Modified: head/databases/db46/Makefile ============================================================================== --- head/databases/db46/Makefile Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db46/Makefile Fri Dec 13 23:27:33 2013 (r336383) @@ -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 \ Modified: head/databases/db47/Makefile ============================================================================== --- head/databases/db47/Makefile Fri Dec 13 23:25:36 2013 (r336382) +++ head/databases/db47/Makefile Fri Dec 13 23:27:33 2013 (r336383) @@ -30,6 +30,8 @@ PATCH_DIST_STRIP= -d .. --ignore-whitesp 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 \