- Update to 1.0.4 [1]

- Fix pkg-plist when Python version >= 3.2
  (solution approved by maintainer via private email)

PR:		ports/167569
Submitted by:	William Grzybowski <william88 at gmail.com>
Approved by:	Volodymyr Kostyrko <c.kworr at gmail.com> (maintainer)

3 files changed, 27 insertions, 12 deletions

diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index dee1040f52a5..dfb1c5e3b839 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	postgresql
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.4
 CATEGORIES=	databases python
 MASTER_SITES=	http://python.projects.postgresql.org/files/ \
 		http://limbo.xim.bz/distfiles/
@@ -17,11 +17,30 @@ DIST_SUBDIR=	postgresql
 MAINTAINER=	c.kworr@gmail.com
 COMMENT=	Python 3 compatible PostgreSQL database driver and tools
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_PGSQL=	yes
 USE_PYTHON=	3.1+
 USE_PYDISTUTILS=	yes
 
 PYDISTUTILS_EGGINFO=	py_${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# 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/)
+.if ${PYTHON_REL} >= 320
+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}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/py-postgresql/distinfo b/databases/py-postgresql/distinfo
index 3f8d93cf25a5..5632f63ec40c 100644
--- a/databases/py-postgresql/distinfo
+++ b/databases/py-postgresql/distinfo
@@ -1,2 +1,2 @@
-SHA256 (postgresql/py-postgresql-1.0.2.tar.bz2) = 93b595f8ae23d8c6537d60f33da776588ed0c7cccd73c2cb45cb9a4e8a21df7a
-SIZE (postgresql/py-postgresql-1.0.2.tar.bz2) = 586009
+SHA256 (postgresql/py-postgresql-1.0.4.tar.xz) = d0ed0a98a33c598d416a3c713befcdedb14f37b961c6985547a120f8830a41fe
+SIZE (postgresql/py-postgresql-1.0.4.tar.xz) = 605228
diff --git a/databases/py-postgresql/pkg-plist b/databases/py-postgresql/pkg-plist
index a8e41206f78d..be43c113966b 100644
--- a/databases/py-postgresql/pkg-plist
+++ b/databases/py-postgresql/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 %%PYTHON_SITELIBDIR%%/postgresql/alock.py
 %%PYTHON_SITELIBDIR%%/postgresql/alock.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/alock.pyo
@@ -37,10 +38,10 @@
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/bin.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/bin.pyo
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/bin.txt
+%%PYTHON_SITELIBDIR%%/postgresql/documentation/changes-v1.0.txt
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/changes.py
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/changes.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/changes.pyo
-%%PYTHON_SITELIBDIR%%/postgresql/documentation/changes.txt
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/clientparameters.py
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/clientparameters.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/clientparameters.pyo
@@ -73,6 +74,7 @@
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/notifyman.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/notifyman.pyo
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/notifyman.txt
+%%PYTHON_SITELIBDIR%%/postgresql/documentation/modules.txt
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/__init__.py
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/__init__.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/documentation/__init__.pyo
@@ -153,9 +155,6 @@
 %%PYTHON_SITELIBDIR%%/postgresql/python/command.py
 %%PYTHON_SITELIBDIR%%/postgresql/python/command.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/python/command.pyo
-%%PYTHON_SITELIBDIR%%/postgresql/python/contextlib.py
-%%PYTHON_SITELIBDIR%%/postgresql/python/contextlib.pyc
-%%PYTHON_SITELIBDIR%%/postgresql/python/contextlib.pyo
 %%PYTHON_SITELIBDIR%%/postgresql/python/datetime.py
 %%PYTHON_SITELIBDIR%%/postgresql/python/datetime.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/python/datetime.pyo
@@ -342,9 +341,6 @@
 %%PYTHON_SITELIBDIR%%/postgresql/types/namedtuple.py
 %%PYTHON_SITELIBDIR%%/postgresql/types/namedtuple.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/types/namedtuple.pyo
-%%PYTHON_SITELIBDIR%%/postgresql/unittest.py
-%%PYTHON_SITELIBDIR%%/postgresql/unittest.pyc
-%%PYTHON_SITELIBDIR%%/postgresql/unittest.pyo
 %%PYTHON_SITELIBDIR%%/postgresql/versionstring.py
 %%PYTHON_SITELIBDIR%%/postgresql/versionstring.pyc
 %%PYTHON_SITELIBDIR%%/postgresql/versionstring.pyo