Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 May 2016 23:00:16 +0000 (UTC)
From:      Ben Woods <woodsb02@FreeBSD.org>
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
Message-ID:  <201605272300.u4RN0GHF095508@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <woodsb02@FreeBSD.org>
 # $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,<db\.h>,<${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 <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605272300.u4RN0GHF095508>