Update 2.4 -> 3.0

4 files changed, 31 insertions, 26 deletions

diff --git a/databases/py-PyGreSQL/Makefile b/databases/py-PyGreSQL/Makefile
index f2babb0faebc..3f2d5cfc02e7 100644
--- a/databases/py-PyGreSQL/Makefile
+++ b/databases/py-PyGreSQL/Makefile
@@ -5,22 +5,29 @@
 # $FreeBSD$
 #
 
-PORTNAME=		py-PyGreSQL
-PORTVERSION=		2.4
+PORTNAME=		PyGreSQL
+PORTVERSION=		3.0
 CATEGORIES=		databases python
 MASTER_SITES=		ftp://ftp.druid.net/pub/distrib/
+PKGNAMEPREFIX=		py-
 DISTNAME=		PyGreSQL-${PORTVERSION}
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		nectar@FreeBSD.org
 
-BUILD_DEPENDS=		python1.5:${PORTSDIR}/lang/python15
-RUN_DEPENDS=		python1.5:${PORTSDIR}/lang/python15
+BUILD_DEPENDS=		${DATETIME_DEP}:${PORTSDIR}/devel/py-mxDateTime
+RUN_DEPENDS=		${DATETIME_DEP}:${PORTSDIR}/devel/py-mxDateTime
 LIB_DEPENDS=		pq.2:${PORTSDIR}/databases/postgresql7
 
-MAKE_ENV=		PYTHON=${PREFIX}/bin/python \
+USE_PYTHON=		yes
+MAKE_ENV=		PYTHON_VERSION=${PYTHON_VERSION} \
+			PYTHON_LIBDIR=${PYTHON_LIBDIR} \
+			PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
+			PYTHON=${PYTHON_CMD} \
 			LN="${LN}" SETENV="${SETENV}" MKDIR="${MKDIR}"
 
+DATETIME_DEP=		${PYTHON_SITELIBDIR}/DateTime/__init__.py
+
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
 
diff --git a/databases/py-PyGreSQL/distinfo b/databases/py-PyGreSQL/distinfo
index f28308974ade..f25e8f0efbb0 100644
--- a/databases/py-PyGreSQL/distinfo
+++ b/databases/py-PyGreSQL/distinfo
@@ -1 +1 @@
-MD5 (PyGreSQL-2.4.tgz) = 7241ae4f9b2e901d05f62e029b35a302
+MD5 (PyGreSQL-3.0.tgz) = 3f67b76d6cfece4ac21eee1a9154a206
diff --git a/databases/py-PyGreSQL/files/Makefile b/databases/py-PyGreSQL/files/Makefile
index a5a0f5988bd7..b1aa7a29fc6c 100644
--- a/databases/py-PyGreSQL/files/Makefile
+++ b/databases/py-PyGreSQL/files/Makefile
@@ -1,28 +1,26 @@
+# grr, commit_prep wants the next line
+# $FreeBSD$
 .SUFFIXES:  .py .pyc
 
-SITE_PACKAGES=${PREFIX}/lib/python1.5/site-packages
-
-all: _pgmodule.so pg.pyc pgtools.pyc
+all: _pgmodule.so pg.pyc pgdb.pyc
 
 install: 
-	@${MKDIR} ${SITE_PACKAGES}
-	${BSD_INSTALL_PROGRAM} _pgmodule.so ${SITE_PACKAGES}
-	${BSD_INSTALL_DATA} pg.py pg.pyc pgtools.py pgtools.pyc \
-		${SITE_PACKAGES}
+	@${MKDIR} ${PYTHON_SITELIBDIR}
+	${BSD_INSTALL_PROGRAM} _pgmodule.so ${PYTHON_SITELIBDIR}
+	${BSD_INSTALL_DATA} pg.py pg.pyc pgdb.py pgdb.pyc \
+	    ${PYTHON_SITELIBDIR}
 
 clean:
-	rm -f *.so *.o *.pyc pgtools.py
-
-pgtools.py: tutorial/pgtools.py
-	${LN} -fs ${.ALLSRC} ${.TARGET}
+	rm -f *.so *.o *.pyc
 
 _pgmodule.so: pgmodule.o
-	${LD} -Bshareable -lc_r -L${PREFIX}/lib/python1.5/config -lpython1.5 \
-		-L${PREFIX}/pgsql/lib -lpq ${.ALLSRC} -o ${.TARGET}
+	${LD} -Bshareable -lc_r -L${PYTHON_LIBDIR}/config \
+	    -l${PYTHON_VERSION} -L${PREFIX}/pgsql/lib -lpq \
+	    ${.ALLSRC} -o ${.TARGET}
 
 pgmodule.o: pgmodule.c
-	${CC} -c -I${PREFIX}/include/python1.5 -I${PREFIX}/pgsql/include \
-		 ${.ALLSRC}
+	${CC} -c -I${PREFIX}/include/${PYTHON_VERSION} \
+	    -I${PREFIX}/pgsql/include ${.ALLSRC}
 
 .py.pyc:
 	${SETENV} PYTHONPATH=${.CURDIR} ${PYTHON} -c 'import ${.IMPSRC:.py=}'
diff --git a/databases/py-PyGreSQL/pkg-plist b/databases/py-PyGreSQL/pkg-plist
index ad7375fb33d5..ea0dd1d957f7 100644
--- a/databases/py-PyGreSQL/pkg-plist
+++ b/databases/py-PyGreSQL/pkg-plist
@@ -1,6 +1,6 @@
-lib/python1.5/site-packages/_pgmodule.so
-lib/python1.5/site-packages/pg.py
-lib/python1.5/site-packages/pg.pyc
-lib/python1.5/site-packages/pgtools.py
-lib/python1.5/site-packages/pgtools.pyc
+lib/%%PYTHON_VERSION%%/site-packages/_pgmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/pg.py
+lib/%%PYTHON_VERSION%%/site-packages/pg.pyc
+lib/%%PYTHON_VERSION%%/site-packages/pgdb.py
+lib/%%PYTHON_VERSION%%/site-packages/pgdb.pyc
 share/doc/README.PyGreSQL