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)

3 files changed, 6 insertions, 131 deletions

diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 8e670b8b9dd7..1d4a192d8d5e 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -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=${PREFIX} --berkeley-db=${LOCALBASE}
 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>
diff --git a/databases/py-bsddb3/files/py3k-fix-pkg-plist.inc b/databases/py-bsddb3/files/py3k-fix-pkg-plist.inc
deleted file mode 100644
index 93acb972e248..000000000000
--- a/databases/py-bsddb3/files/py3k-fix-pkg-plist.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-# When Python version is 3.2+ we rewrite all the filenames
-# of TMPPLIST that end with .py[co], so that they conform
-# to PEP 3147 (see http://www.python.org/dev/peps/pep-3147/)
-PYMAGICTAG=	${PYTHON_CMD} -c 'import imp; print(imp.get_tag())'
-add-plist-post:
-	@${AWK} '\
-		/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.py[co]$$/,  "." mt "&"); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
-		/^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
-		{print} \
-		END {if (sp in dirs) {print "@dirrm " sp "/" pc}} \
-		' \
-		pc="__pycache__" mt="$$(${PYMAGICTAG})" sp="${PYTHON_SITELIBDIR:S,${PYTHONBASE}/,,g}" \
-		${TMPPLIST} > ${TMPPLIST}.pyc_tmp
-	@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
diff --git a/databases/py-bsddb3/pkg-plist b/databases/py-bsddb3/pkg-plist
deleted file mode 100644
index 8863de01a286..000000000000
--- a/databases/py-bsddb3/pkg-plist
+++ /dev/null
@@ -1,104 +0,0 @@
-%%PYTHON_INCLUDEDIR%%/bsddb3/bsddb.h
-%%PYTHON_SITELIBDIR%%/bsddb3/__init__.py
-%%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/_pybsddb.so
-%%PYTHON_SITELIBDIR%%/bsddb3/db.py
-%%PYTHON_SITELIBDIR%%/bsddb3/db.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/db.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/dbobj.py
-%%PYTHON_SITELIBDIR%%/bsddb3/dbobj.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/dbobj.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/dbrecio.py
-%%PYTHON_SITELIBDIR%%/bsddb3/dbrecio.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/dbrecio.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/dbshelve.py
-%%PYTHON_SITELIBDIR%%/bsddb3/dbshelve.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/dbshelve.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/dbtables.py
-%%PYTHON_SITELIBDIR%%/bsddb3/dbtables.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/dbtables.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/dbutils.py
-%%PYTHON_SITELIBDIR%%/bsddb3/dbutils.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/dbutils.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/test_support.py
-%%PYTHON_SITELIBDIR%%/bsddb3/test_support.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/test_support.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_all.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_associate.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_associate.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_associate.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_basics.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_basics.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_basics.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compare.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compare.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compare.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compat.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compat.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_compat.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_cursor_pget_bug.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_cursor_pget_bug.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_cursor_pget_bug.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_db.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_db.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_db.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbenv.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbenv.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbenv.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbobj.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbobj.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbobj.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbshelve.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbshelve.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbshelve.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbtables.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbtables.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_dbtables.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_distributed_transactions.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_distributed_transactions.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_distributed_transactions.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_early_close.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_early_close.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_early_close.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_fileid.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_fileid.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_fileid.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_get_none.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_get_none.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_get_none.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_join.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_join.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_join.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_lock.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_lock.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_lock.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_misc.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_misc.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_misc.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_pickle.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_pickle.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_pickle.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_queue.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_queue.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_queue.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_recno.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_recno.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_recno.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_replication.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_replication.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_replication.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_sequence.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_sequence.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_sequence.pyo
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.py
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.pyc
-%%PYTHON_SITELIBDIR%%/bsddb3/tests/test_thread.pyo
-@dirrm %%PYTHON_INCLUDEDIR%%/bsddb3
-@dirrm %%PYTHON_SITELIBDIR%%/bsddb3/tests
-@dirrm %%PYTHON_SITELIBDIR%%/bsddb3