From owner-svn-ports-head@freebsd.org Fri May 27 23:00:17 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 592F9B4DCBC; Fri, 27 May 2016 23:00:17 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 196C31DC8; Fri, 27 May 2016 23:00:17 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4RN0Ghl095510; Fri, 27 May 2016 23:00:16 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4RN0GHF095508; Fri, 27 May 2016 23:00:16 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201605272300.u4RN0GHF095508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Fri, 27 May 2016 23:00:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415968 - in head/databases: py-bsddb3 py3-bsddb3 py3-bsddb3/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2016 23:00:17 -0000 Author: woodsb02 Date: Fri May 27 23:00:15 2016 New Revision: 415968 URL: https://svnweb.freebsd.org/changeset/ports/415968 Log: databases/py-bsddb3: Convert to master port for databases/py3-bsddb3 - Convert databases/py3-bsddb3 from stand-alone port to slave of databases/py-bsddb3 - Prevent databases/py-bsddb3 from clobbering USES from databases/py3-bsddb3 - Convert USE_BDB=yes to USES=bdb in both databases/py-bsddb3 and databases/py3-bsddb3 PR: 208285 Reviewed by: mat (mentor) Approved by: bofh (maintainer), adamw (mentor) Differential Revision: https://reviews.freebsd.org/D6614 Deleted: head/databases/py3-bsddb3/distinfo head/databases/py3-bsddb3/files/ head/databases/py3-bsddb3/pkg-descr Modified: head/databases/py-bsddb3/Makefile head/databases/py3-bsddb3/Makefile Modified: head/databases/py-bsddb3/Makefile ============================================================================== --- head/databases/py-bsddb3/Makefile Fri May 27 22:39:28 2016 (r415967) +++ head/databases/py-bsddb3/Makefile Fri May 27 23:00:15 2016 (r415968) @@ -12,8 +12,7 @@ COMMENT= Python extension module for Ber LICENSE= BSD3CLAUSE -USE_BDB= yes -USES= python +USES?= bdb python USE_PYTHON= distutils autoplist PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE} Modified: head/databases/py3-bsddb3/Makefile ============================================================================== --- head/databases/py3-bsddb3/Makefile Fri May 27 22:39:28 2016 (r415967) +++ head/databases/py3-bsddb3/Makefile Fri May 27 23:00:15 2016 (r415968) @@ -1,37 +1,8 @@ # Created by: Ben Woods # $FreeBSD$ -PORTNAME= bsddb3 -PORTVERSION= 6.1.1 -CATEGORIES= databases python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +MASTERDIR= ${.CURDIR}/../py-bsddb3 -MAINTAINER= woodsb02@FreeBSD.org -COMMENT= Python extension module for BerkeleyDB 3 and 4 +USES= bdb python:3.2+ -LICENSE= BSD3CLAUSE - -USE_BDB= yes -USES= python:3 -USE_PYTHON= distutils autoplist - -PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE} -PYDISTUTILS_BUILDARGS= --libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE} -PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE} - -PORTDOCS= * -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} - -post-patch: - ${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py - ${REINPLACE_CMD} 's,,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/Modules/bsddb.h - ${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py - ${REINPLACE_CMD} 's,%%BDB_LIB_NAME%%,${BDB_LIB_NAME},' ${WRKSRC}/setup3.py - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/bsddb3/_pybsddb.so - -.include +.include "${MASTERDIR}/Makefile"