Index: head/databases/py-pyPgSQL/Makefile
===================================================================
--- head/databases/py-pyPgSQL/Makefile	(revision 469613)
+++ head/databases/py-pyPgSQL/Makefile	(revision 469614)
@@ -1,52 +1,47 @@
 # Created by: Gerhard Haering <gerhard.haering@gmx.de>
 # $FreeBSD$
 
 PORTNAME=	pyPgSQL
 PORTVERSION=	2.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	python@FreeBSD.org
-COMMENT=	Python DB-API 2 compliant library for using PostgreSQL databases
+MAINTAINER=	portmaster@BSDforge.com
+COMMENT=	Python DB-API 2.0 compliant interface to PostgreSQL
 
-BROKEN=		Invalid checksum
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2018-06-06
+LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${DATETIME_DEP}:lang/py-mx-base
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base
 
-USES=	pgsql python:2.7
-USE_PYTHON=	distutils
+USES=		pgsql python:2.7
+USE_PYTHON=	distutils autoplist
 
 DOCS=		Announce ChangeLog README README.html
 EXAMPLES=	examples/*.py
 
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
-
-OPTIONS_DEFINE=	BYTEA_CONN EXAMPLES DOCS
+OPTIONS_DEFINE=		BYTEA_CONN EXAMPLES DOCS
 OPTIONS_DEFAULT=	BYTEA_CONN
+
 BYTEA_CONN_DESC=	Apply Bytea connection patch
+BYTEA_CONN_VARS=	PATCH_SITES=	https://sourceforge.net/p/pypgsql/patches/_discuss/thread/c9fcb468/43b1/attachment/ \
+			PATCHFILES=	patch-byteaconn
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MBYTEA_CONN}
-PATCH_SITES=	http://sourceforge.net/tracker/download.php?group_id=16528&atid=316528&file_id=273956&aid=1939119/
-PATCHFILES=	pyPgSQL-patch_byteaconn
-.endif
-
 DOCSDIR=	${PREFIX}/share/doc/py-pyPgSQL
 EXAMPLESDIR=	${PREFIX}/share/examples/py-pyPgSQL
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyPgSQL/libpq/libpqmodule.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${EXAMPLES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/databases/py-pyPgSQL/distinfo
===================================================================
--- head/databases/py-pyPgSQL/distinfo	(revision 469613)
+++ head/databases/py-pyPgSQL/distinfo	(revision 469614)
@@ -1,4 +1,3 @@
+TIMESTAMP = 1526023581
 SHA256 (pyPgSQL-2.5.1.tar.gz) = 498486f066f11a68f5b02a54ba5a008d01d507038c873bfd901c14d3f5ca18af
 SIZE (pyPgSQL-2.5.1.tar.gz) = 152840
-SHA256 (pyPgSQL-patch_byteaconn) = 73a324808aef49382e736245023eb8c468e1ca0803052a2a45162465b0ad28d7
-SIZE (pyPgSQL-patch_byteaconn) = 4718
Index: head/databases/py-pyPgSQL/pkg-plist
===================================================================
--- head/databases/py-pyPgSQL/pkg-plist	(revision 469613)
+++ head/databases/py-pyPgSQL/pkg-plist	(revision 469614)
@@ -1,19 +1,9 @@
-%%PYTHON_SITELIBDIR%%/pyPgSQL/__init__.py
-%%PYTHON_SITELIBDIR%%/pyPgSQL/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyPgSQL/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyPgSQL/PgSQL.py
-%%PYTHON_SITELIBDIR%%/pyPgSQL/PgSQL.pyc
-%%PYTHON_SITELIBDIR%%/pyPgSQL/PgSQL.pyo
-%%PYTHON_SITELIBDIR%%/pyPgSQL/libpq/__init__.py
-%%PYTHON_SITELIBDIR%%/pyPgSQL/libpq/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyPgSQL/libpq/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyPgSQL/libpq/libpqmodule.so
 %%PORTDOCS%%%%DOCSDIR%%/Announce
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo1a.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo1b.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo2a.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo2b.py