2 files changed, 17 insertions, 83 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