Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Mar 2014 11:41:39 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346882 - in head/databases/py-bsddb3: . files
Message-ID:  <201403031141.s23BfdmV082707@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Mon Mar  3 11:41:38 2014
New Revision: 346882
URL: http://svnweb.freebsd.org/changeset/ports/346882
QAT: https://qat.redports.org/buildarchive/r346882/

Log:
  databases/py-bsddb3: remove local plist hack and support staging
  
  - convert to using auto-generated packing list and remove NO_STAGE
  - install docs into staging area uncoditionally
  - remove local plist hack - it is now handled by bsd.python.mk
  
  Approved by:	portmgr (blanket)

Deleted:
  head/databases/py-bsddb3/files/py3k-fix-pkg-plist.inc
  head/databases/py-bsddb3/pkg-plist
Modified:
  head/databases/py-bsddb3/Makefile

Modified: head/databases/py-bsddb3/Makefile
==============================================================================
--- head/databases/py-bsddb3/Makefile	Mon Mar  3 11:09:52 2014	(r346881)
+++ head/databases/py-bsddb3/Makefile	Mon Mar  3 11:41:38 2014	(r346882)
@@ -11,8 +11,10 @@ MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python extension module for BerkeleyDB 3 and 4
 
 USE_BDB=	43+
-USE_PYTHON=	yes
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+
 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}
@@ -20,21 +22,12 @@ PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 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
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR})
-.endif
-
-.if ${PYTHON_REL} >= 320
-.include "${FILESDIR}/py3k-fix-pkg-plist.inc"
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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