16 files changed, 63 insertions, 191 deletions

diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index 94b7ed92ee17..b985f420bdcb 100644
--- a/databases/gadfly/Makefile
+++ b/databases/gadfly/Makefile
@@ -8,26 +8,30 @@ CATEGORIES=	databases
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An SQL database written in Python
+COMMENT=	SQL database written in Python
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/kjbuckets.so:${PORTSDIR}/devel/py-kjbuckets
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USE_PYTHON=		-2.7
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/build_html.py ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.txt ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/build_html.py ${STAGEDIR}${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}/kjParsing
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/kjParsing
 	@${INSTALL_DATA} ${WRKSRC}/doc/demo/kjParsing/*.py \
-		${EXAMPLESDIR}/kjParsing
+		${STAGEDIR}${EXAMPLESDIR}/kjParsing
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/gadfly/pkg-plist b/databases/gadfly/pkg-plist
index 045a2c81abb9..9fe494a727f6 100644
--- a/databases/gadfly/pkg-plist
+++ b/databases/gadfly/pkg-plist
@@ -1,71 +1,3 @@
-bin/gfplus
-bin/gfserver
-%%PYTHON_SITELIBDIR%%/gadfly/__init__.py
-%%PYTHON_SITELIBDIR%%/gadfly/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/bindings.py
-%%PYTHON_SITELIBDIR%%/gadfly/bindings.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/bindings.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/client.py
-%%PYTHON_SITELIBDIR%%/gadfly/client.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/client.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/database.py
-%%PYTHON_SITELIBDIR%%/gadfly/database.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/database.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/gfsocket.py
-%%PYTHON_SITELIBDIR%%/gadfly/gfsocket.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/gfsocket.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/grammar.py
-%%PYTHON_SITELIBDIR%%/gadfly/grammar.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/grammar.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/introspection.py
-%%PYTHON_SITELIBDIR%%/gadfly/introspection.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/introspection.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/kjParseBuild.py
-%%PYTHON_SITELIBDIR%%/gadfly/kjParseBuild.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/kjParseBuild.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/kjParser.py
-%%PYTHON_SITELIBDIR%%/gadfly/kjParser.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/kjParser.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/kjSet.py
-%%PYTHON_SITELIBDIR%%/gadfly/kjSet.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/kjSet.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets0.py
-%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets0.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets0.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets_select.py
-%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets_select.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/kjbuckets_select.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/operations.py
-%%PYTHON_SITELIBDIR%%/gadfly/operations.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/operations.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/scripts/__init__.py
-%%PYTHON_SITELIBDIR%%/gadfly/scripts/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/scripts/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfplus.py
-%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfplus.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfplus.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfserver.py
-%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfserver.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/scripts/gfserver.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/semantics.py
-%%PYTHON_SITELIBDIR%%/gadfly/semantics.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/semantics.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/serialize.py
-%%PYTHON_SITELIBDIR%%/gadfly/serialize.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/serialize.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/server.py
-%%PYTHON_SITELIBDIR%%/gadfly/server.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/server.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/sql.py
-%%PYTHON_SITELIBDIR%%/gadfly/sql.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/sql.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/sql_mar.py
-%%PYTHON_SITELIBDIR%%/gadfly/sql_mar.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/sql_mar.pyo
-%%PYTHON_SITELIBDIR%%/gadfly/store.py
-%%PYTHON_SITELIBDIR%%/gadfly/store.pyc
-%%PYTHON_SITELIBDIR%%/gadfly/store.pyo
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.txt
 %%PORTDOCS%%%%DOCSDIR%%/announcement.txt
@@ -90,5 +22,3 @@ bin/gfserver
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/kjParsing
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/gadfly/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/gadfly
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index aa35a7314e46..39ae59b8d400 100644
--- a/databases/pgworksheet/Makefile
+++ b/databases/pgworksheet/Makefile
@@ -15,11 +15,11 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:${PORTSDIR}/database
 USE_PGSQL=	yes
 USE_BZIP2=	yes
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGVERSION=	1.9
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e \
 		's|@PIXMAP_PATH@|${PREFIX}/share/pixmaps/pgworksheet|' \
diff --git a/databases/pgworksheet/pkg-plist b/databases/pgworksheet/pkg-plist
deleted file mode 100644
index c320704c9705..000000000000
--- a/databases/pgworksheet/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-bin/pgworksheet
-%%PYTHON_SITELIBDIR%%/pgw/__init__.py
-%%PYTHON_SITELIBDIR%%/pgw/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pgw/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pgw/DBConnection.py
-%%PYTHON_SITELIBDIR%%/pgw/DBConnection.pyc
-%%PYTHON_SITELIBDIR%%/pgw/DBConnection.pyo
-%%PYTHON_SITELIBDIR%%/pgw/Execute.py
-%%PYTHON_SITELIBDIR%%/pgw/Execute.pyc
-%%PYTHON_SITELIBDIR%%/pgw/Execute.pyo
-%%PYTHON_SITELIBDIR%%/pgw/RunSQL.py
-%%PYTHON_SITELIBDIR%%/pgw/RunSQL.pyc
-%%PYTHON_SITELIBDIR%%/pgw/RunSQL.pyo
-%%PYTHON_SITELIBDIR%%/pgw/UI.py
-%%PYTHON_SITELIBDIR%%/pgw/UI.pyc
-%%PYTHON_SITELIBDIR%%/pgw/UI.pyo
-%%PYTHON_SITELIBDIR%%/pgw/MyPgSQL.py
-%%PYTHON_SITELIBDIR%%/pgw/MyPgSQL.pyc
-%%PYTHON_SITELIBDIR%%/pgw/MyPgSQL.pyo
-%%PYTHON_SITELIBDIR%%/pgw/Syntax.py
-%%PYTHON_SITELIBDIR%%/pgw/Syntax.pyc
-%%PYTHON_SITELIBDIR%%/pgw/Syntax.pyo
-%%PYTHON_SITELIBDIR%%/pgw/Undo.py
-%%PYTHON_SITELIBDIR%%/pgw/Undo.pyc
-%%PYTHON_SITELIBDIR%%/pgw/Undo.pyo
-%%PYTHON_SITELIBDIR%%/pgw/Lexical.py
-%%PYTHON_SITELIBDIR%%/pgw/Lexical.pyc
-%%PYTHON_SITELIBDIR%%/pgw/Lexical.pyo
-share/applications/pgworksheet.desktop
-share/pixmaps/pgworksheet.png
-share/pixmaps/pgworksheet/connect.png
-share/pixmaps/pgworksheet/disconnect.png
-share/pixmaps/pgworksheet/about.png
-share/pixmaps/pgworksheet/pgworksheet.png
-share/pixmaps/pgworksheet/pgworksheet-32.png
-share/locale/fr/LC_MESSAGES/pgworksheet.mo
-share/locale/ja/LC_MESSAGES/pgworksheet.mo
-@dirrm %%PYTHON_SITELIBDIR%%/pgw
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
-@dirrm share/pixmaps/pgworksheet
-@dirrmtry share/applications
diff --git a/databases/py-PyGreSQL/Makefile b/databases/py-PyGreSQL/Makefile
index 39a1e70d349f..14a0c9155b9a 100644
--- a/databases/py-PyGreSQL/Makefile
+++ b/databases/py-PyGreSQL/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Python interface to PostgreSQL, both classic and DP-API 2.0
 USE_PGSQL=	yes
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-PyGreSQL/pkg-plist b/databases/py-PyGreSQL/pkg-plist
index 8ba836328719..650d21726907 100644
--- a/databases/py-PyGreSQL/pkg-plist
+++ b/databases/py-PyGreSQL/pkg-plist
@@ -1,10 +1,3 @@
-%%PYTHON_SITELIBDIR%%/_pg.so
-%%PYTHON_SITELIBDIR%%/pg.py
-%%PYTHON_SITELIBDIR%%/pg.pyc
-%%PYTHON_SITELIBDIR%%/pg.pyo
-%%PYTHON_SITELIBDIR%%/pgdb.py
-%%PYTHON_SITELIBDIR%%/pgdb.pyc
-%%PYTHON_SITELIBDIR%%/pgdb.pyo
 %%PORTDOCS%%%%DOCSDIR%%/announce.html
 %%PORTDOCS%%%%DOCSDIR%%/announce.txt
 %%PORTDOCS%%%%DOCSDIR%%/changelog.html
diff --git a/databases/py-cdb/Makefile b/databases/py-cdb/Makefile
index 6f89958308af..f07f5048f59c 100644
--- a/databases/py-cdb/Makefile
+++ b/databases/py-cdb/Makefile
@@ -11,8 +11,9 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python interface to DJB's constant database library
 
-USE_PYTHON=	yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	python-cdb
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
@@ -21,13 +22,18 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 DOCS=		ChangeLog README
 EXAMPLES=	Example
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
+
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+.endif
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-cdb/pkg-plist b/databases/py-cdb/pkg-plist
index 50bb9151a341..9bc09bc61ec0 100644
--- a/databases/py-cdb/pkg-plist
+++ b/databases/py-cdb/pkg-plist
@@ -1,6 +1,5 @@
-%%PYTHON_SITELIBDIR%%/cdbmodule.so
-%%EXAMPLESDIR%%/Example
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Example
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index c146f8fef875..9357f1245cc3 100644
--- a/databases/py-forgetsql/Makefile
+++ b/databases/py-forgetsql/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	forgetsql
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,37 +12,37 @@ DISTNAME=	forgetSQL-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module for object-oriented access to SQL databases
 
-.if defined(WITH_POSTGRESQL)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg
-.endif
-.if defined(WITH_MYSQL)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
-.endif
-
-USE_PYTHON=	yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	forgetSQL
 
 DOCS=	BUGS README TODO
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS MYSQL PGSQL
+
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
+PGSQL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg
+
+.include <bsd.port.options.mk>
+
 post-build:
 	@cd ${WRKSRC}/lib && ${PYTHON_CMD} -c 'import forgetSQL'
 	@cd ${WRKSRC}/lib && ${PYTHON_CMD} -O -c 'import forgetSQL'
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/forgetSQL.pyc ${PYTHON_SITELIBDIR}/
-	${INSTALL_DATA} ${WRKSRC}/lib/forgetSQL.pyo ${PYTHON_SITELIBDIR}/
-.if !defined(WITH_POSTGRESQL) && !defined(WITH_MYSQL)
+	${INSTALL_DATA} ${WRKSRC}/lib/forgetSQL.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/lib/forgetSQL.pyo ${STAGEDIR}${PYTHON_SITELIBDIR}/
+.if !${PORT_OPTIONS:MPGSQL} && !${PORT_OPTIONS:MMYSQL}
 	@${ECHO}
-	@${ECHO_MSG} "===> You did not set WITH_MYSQL or WITH_POSTGRESQL. To make this port usable,"
+	@${ECHO_MSG} "===> You did not set MYSQL or PGSQL. To make this port usable,"
 	@${ECHO_MSG} "===> you should install py-psycopg or py-MySQLdb from ports/databases."
 	@${ECHO}
 .endif
-.if !defined(NOPORTDOCS)
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 
diff --git a/databases/py-forgetsql/pkg-plist b/databases/py-forgetsql/pkg-plist
index 2d672fd9bcf2..35a0a75e7cc2 100644
--- a/databases/py-forgetsql/pkg-plist
+++ b/databases/py-forgetsql/pkg-plist
@@ -1,7 +1,3 @@
-bin/forgetsql-generate
-%%PYTHON_SITELIBDIR%%/forgetSQL.py
-%%PYTHON_SITELIBDIR%%/forgetSQL.pyc
-%%PYTHON_SITELIBDIR%%/forgetSQL.pyo
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/databases/py-mssql/Makefile b/databases/py-mssql/Makefile
index 63d3a4026153..8fd3b48ed7e0 100644
--- a/databases/py-mssql/Makefile
+++ b/databases/py-mssql/Makefile
@@ -11,11 +11,11 @@ DISTNAME=	pymssql-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python database interface for simple MS-SQL access
 
-LIB_DEPENDS=	sybdb.5:${PORTSDIR}/databases/freetds-msdblib
+LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds-msdblib
 
-USE_PYTHON=	2.5+
-USE_PYDISTUTILS=yes
+USE_PYTHON=		-2.7
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	pymssql
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/databases/py-mssql/pkg-plist b/databases/py-mssql/pkg-plist
deleted file mode 100644
index 74f10ec2518e..000000000000
--- a/databases/py-mssql/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%PYTHON_SITELIBDIR%%/_mssql.so
-%%PYTHON_SITELIBDIR%%/pymssql.py
-%%PYTHON_SITELIBDIR%%/pymssql.pyc
-%%PYTHON_SITELIBDIR%%/pymssql.pyo
diff --git a/databases/py-oops/Makefile b/databases/py-oops/Makefile
index a3e8459f5a5a..0fc42d3514b8 100644
--- a/databases/py-oops/Makefile
+++ b/databases/py-oops/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object Oriented Database Library For Persistent Storage in Python
 
-USE_PYTHON=	yes
+USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/databases/py-oops/pkg-plist b/databases/py-oops/pkg-plist
deleted file mode 100644
index 6791d11f3cc7..000000000000
--- a/databases/py-oops/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PYTHON_SITELIBDIR%%/oops/__init__.py
-%%PYTHON_SITELIBDIR%%/oops/__init__.pyc
-%%PYTHON_SITELIBDIR%%/oops/__init__.pyo
-%%PYTHON_SITELIBDIR%%/oops/core.py
-%%PYTHON_SITELIBDIR%%/oops/core.pyc
-%%PYTHON_SITELIBDIR%%/oops/core.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/oops
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 45583586deda..9fbf1b08f186 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -12,13 +12,13 @@ DISTNAME=	py-rrdtool-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python interface to RRDTool, the graphing and logging utility
 
-LIB_DEPENDS=	rrd:${PORTSDIR}/databases/rrdtool
+LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
 
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 PYDISTUTILS_PKGNAME=	py-rrdtool
 
 LIBDIR?=	${LOCALBASE}/lib # directory where librrd.so lives
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/databases/py-rrdtool_lgpl/pkg-plist b/databases/py-rrdtool_lgpl/pkg-plist
deleted file mode 100644
index a767b70a4607..000000000000
--- a/databases/py-rrdtool_lgpl/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%PYTHON_SITELIBDIR%%/rrdtool.py
-%%PYTHON_SITELIBDIR%%/rrdtool.pyc
-%%PYTHON_SITELIBDIR%%/rrdtool.pyo
-%%PYTHON_SITELIBDIR%%/_rrdtool.so