2 files changed, 93 insertions, 96 deletions

diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index 2733d2bf6b59..58ab5b6f7972 100644
--- a/databases/gadfly/Makefile
+++ b/databases/gadfly/Makefile
@@ -13,13 +13,10 @@ DISTNAME=       kwP
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python15
-
+USE_PYTHON=	yes
 NO_WRKSUBDIR=	yes
 
-PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-GADFLYDIR=	${PYTHONSCRIPTDIR}/site-packages/gadfly
+GADFLYDIR=	${PYTHON_SITELIBDIR}/gadfly
 GADFLYDOCDIR=	${PREFIX}/share/doc/gadfly
 
 do-build:
@@ -28,10 +25,10 @@ do-install:
 	${MKDIR} ${GADFLYDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.py ${GADFLYDIR}
 	${INSTALL_DATA} ${WRKSRC}/sql.mar ${GADFLYDIR}
-	${ECHO} 'gadfly' > ${PYTHONSCRIPTDIR}/site-packages/gadfly.pth
-	(cd ${GADFLYDIR}; python gfinstall.py)
-	@${PREFIX}/bin/python ${PYTHONSCRIPTDIR}/compileall.py ${GADFLYDIR}
-	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${GADFLYDIR}
+	${ECHO} 'gadfly' > ${PYTHON_SITELIBDIR}/gadfly.pth
+	(cd ${GADFLYDIR}; ${PYTHON_CMD} gfinstall.py)
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${GADFLYDIR}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${GADFLYDIR}
 	${MKDIR} ${GADFLYDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${GADFLYDOCDIR}
 .if !defined(${NOPORTDOCS})
diff --git a/databases/gadfly/pkg-plist b/databases/gadfly/pkg-plist
index abcd2d0739e6..5c5bf3e67049 100644
--- a/databases/gadfly/pkg-plist
+++ b/databases/gadfly/pkg-plist
@@ -1,90 +1,89 @@
-lib/python1.5/site-packages/gadfly.pth
-lib/python1.5/site-packages/gadfly/DLispShort.py
-lib/python1.5/site-packages/gadfly/DLispShort.pyc
-lib/python1.5/site-packages/gadfly/DLispShort.pyo
-lib/python1.5/site-packages/gadfly/DumbLispGen.py
-lib/python1.5/site-packages/gadfly/DumbLispGen.pyc
-lib/python1.5/site-packages/gadfly/DumbLispGen.pyo
-lib/python1.5/site-packages/gadfly/SQLTESTG.py
-lib/python1.5/site-packages/gadfly/SQLTESTG.pyc
-lib/python1.5/site-packages/gadfly/SQLTESTG.pyo
-lib/python1.5/site-packages/gadfly/gadfly.py
-lib/python1.5/site-packages/gadfly/gadfly.pyc
-lib/python1.5/site-packages/gadfly/gadfly.pyo
-lib/python1.5/site-packages/gadfly/gfclient.py
-lib/python1.5/site-packages/gadfly/gfclient.pyc
-lib/python1.5/site-packages/gadfly/gfclient.pyo
-lib/python1.5/site-packages/gadfly/gfdb0.py
-lib/python1.5/site-packages/gadfly/gfdb0.pyc
-lib/python1.5/site-packages/gadfly/gfdb0.pyo
-lib/python1.5/site-packages/gadfly/gfinstall.py
-lib/python1.5/site-packages/gadfly/gfinstall.pyc
-lib/python1.5/site-packages/gadfly/gfinstall.pyo
-lib/python1.5/site-packages/gadfly/gfintrospect.py
-lib/python1.5/site-packages/gadfly/gfintrospect.pyc
-lib/python1.5/site-packages/gadfly/gfintrospect.pyo
-lib/python1.5/site-packages/gadfly/gfserve.py
-lib/python1.5/site-packages/gadfly/gfserve.pyc
-lib/python1.5/site-packages/gadfly/gfserve.pyo
-lib/python1.5/site-packages/gadfly/gfsocket.py
-lib/python1.5/site-packages/gadfly/gfsocket.pyc
-lib/python1.5/site-packages/gadfly/gfsocket.pyo
-lib/python1.5/site-packages/gadfly/gfstest.py
-lib/python1.5/site-packages/gadfly/gfstest.pyc
-lib/python1.5/site-packages/gadfly/gfstest.pyo
-lib/python1.5/site-packages/gadfly/gftest.py
-lib/python1.5/site-packages/gadfly/gftest.pyc
-lib/python1.5/site-packages/gadfly/gftest.pyo
-lib/python1.5/site-packages/gadfly/idl.py
-lib/python1.5/site-packages/gadfly/idl.pyc
-lib/python1.5/site-packages/gadfly/idl.pyo
-lib/python1.5/site-packages/gadfly/kjParseBuild.py
-lib/python1.5/site-packages/gadfly/kjParseBuild.pyc
-lib/python1.5/site-packages/gadfly/kjParseBuild.pyo
-lib/python1.5/site-packages/gadfly/kjParser.py
-lib/python1.5/site-packages/gadfly/kjParser.pyc
-lib/python1.5/site-packages/gadfly/kjParser.pyo
-lib/python1.5/site-packages/gadfly/kjSet.py
-lib/python1.5/site-packages/gadfly/kjSet.pyc
-lib/python1.5/site-packages/gadfly/kjSet.pyo
-lib/python1.5/site-packages/gadfly/kjbuckets0.py
-lib/python1.5/site-packages/gadfly/kjbuckets0.pyc
-lib/python1.5/site-packages/gadfly/kjbuckets0.pyo
-lib/python1.5/site-packages/gadfly/kjpylint.py
-lib/python1.5/site-packages/gadfly/kjpylint.pyc
-lib/python1.5/site-packages/gadfly/kjpylint.pyo
-lib/python1.5/site-packages/gadfly/pygram.py
-lib/python1.5/site-packages/gadfly/pygram.pyc
-lib/python1.5/site-packages/gadfly/pygram.pyo
-lib/python1.5/site-packages/gadfly/relalg.py
-lib/python1.5/site-packages/gadfly/relalg.pyc
-lib/python1.5/site-packages/gadfly/relalg.pyo
-lib/python1.5/site-packages/gadfly/remotetest.py
-lib/python1.5/site-packages/gadfly/remotetest.pyc
-lib/python1.5/site-packages/gadfly/remotetest.pyo
-lib/python1.5/site-packages/gadfly/sql.mar
-lib/python1.5/site-packages/gadfly/sqlbind.py
-lib/python1.5/site-packages/gadfly/sqlbind.pyc
-lib/python1.5/site-packages/gadfly/sqlbind.pyo
-lib/python1.5/site-packages/gadfly/sqlgen.py
-lib/python1.5/site-packages/gadfly/sqlgen.pyc
-lib/python1.5/site-packages/gadfly/sqlgen.pyo
-lib/python1.5/site-packages/gadfly/sqlgram.py
-lib/python1.5/site-packages/gadfly/sqlgram.pyc
-lib/python1.5/site-packages/gadfly/sqlgram.pyo
-lib/python1.5/site-packages/gadfly/sqlgtest.py
-lib/python1.5/site-packages/gadfly/sqlgtest.pyc
-lib/python1.5/site-packages/gadfly/sqlgtest.pyo
-lib/python1.5/site-packages/gadfly/sqlmod.py
-lib/python1.5/site-packages/gadfly/sqlmod.pyc
-lib/python1.5/site-packages/gadfly/sqlmod.pyo
-lib/python1.5/site-packages/gadfly/sqlsem.py
-lib/python1.5/site-packages/gadfly/sqlsem.pyc
-lib/python1.5/site-packages/gadfly/sqlsem.pyo
-lib/python1.5/site-packages/gadfly/sqlwhere.py
-lib/python1.5/site-packages/gadfly/sqlwhere.pyc
-lib/python1.5/site-packages/gadfly/sqlwhere.pyo
-@dirrm lib/python1.5/site-packages/gadfly
+lib/%%PYTHON_VERSION%%/site-packages/gadfly.pth
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/DLispShort.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/DLispShort.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/DLispShort.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/DumbLispGen.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/DumbLispGen.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/DumbLispGen.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/SQLTESTG.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/SQLTESTG.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/SQLTESTG.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gadfly.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gadfly.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gadfly.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfclient.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfclient.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfclient.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfdb0.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfdb0.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfdb0.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfinstall.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfinstall.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfinstall.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfintrospect.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfintrospect.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfintrospect.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfserve.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfserve.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfserve.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfsocket.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfsocket.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfsocket.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfstest.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfstest.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gfstest.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gftest.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gftest.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/gftest.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/idl.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/idl.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/idl.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParseBuild.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParseBuild.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParseBuild.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParser.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParser.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjParser.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjSet.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjSet.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjSet.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjbuckets0.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjbuckets0.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjbuckets0.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjpylint.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjpylint.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/kjpylint.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/pygram.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/pygram.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/pygram.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/relalg.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/relalg.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/relalg.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/remotetest.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/remotetest.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/remotetest.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sql.mar
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlbind.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlbind.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlbind.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgen.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgen.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgen.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgram.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgram.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgram.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgtest.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgtest.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlgtest.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlmod.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlmod.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlmod.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlsem.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlsem.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlsem.pyo
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlwhere.py
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlwhere.pyc
+lib/%%PYTHON_VERSION%%/site-packages/gadfly/sqlwhere.pyo
 share/doc/gadfly/COPYRIGHT
 share/doc/gadfly/gadfly.JPG
 share/doc/gadfly/gadfly.html
@@ -95,3 +94,4 @@ share/doc/gadfly/index.html
 share/doc/gadfly/kwParsing.html
 share/doc/gadfly/server.html
 @dirrm share/doc/gadfly
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/gadfly