From a0748d649bef85812e9cf36eb0da02e58d74c09c Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 24 Nov 2014 18:29:58 +0000
Subject: [PATCH] - Update to 2.5.4 - Add LICENSE - Add DOCS and EXAMPLES to
 OPTIONS_DEFINE

Changes:	http://initd.org/psycopg/articles/2014/08/30/psycopg-254-released/
---
 databases/py-psycopg2/Makefile | 26 ++++++++++++--------------
 databases/py-psycopg2/distinfo |  4 ++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index a4c66f98f10b..0d6bc85f83af 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	psycopg2
-PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTVERSION=	2.5.4
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/psycopg/tarballs/PSYCOPG-2-5/ \
 		CHEESESHOP
@@ -12,21 +11,20 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	High performance Python adapter for PostgreSQL
 
-USES=		pgsql python
+LICENSE=	LGPL3
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 USE_PYTHON=	autoplist concurrent distutils
+USES=		pgsql python
 
-PORTEXAMPLES=	binary.py copy_from.py copy_to.py cursor.py dialtone.py \
-		dict.py dt.py encoding.py fetch.py lastrowid.py lobject.py \
-		mogrify.py myfirstrecipe.py notify.py simple.py somehackers.jpg \
-		threads.py typecast.py tz.py usercast.py whereareyou.jpg
-
-PORTDOCS=	AUTHORS INSTALL README NEWS PKG-INFO
+PORTDOCS=	AUTHORS INSTALL NEWS PKG-INFO README
+PORTEXAMPLES=	*
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} ${STAGEDIR}${EXAMPLESDIR}
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index 91d704e56fc4..743f3685e218 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (psycopg2-2.5.3.tar.gz) = 3a2df3bb113187227aa97d0dd3d06e0f26be3d50dcdeeaef67fac59ed51a030a
-SIZE (psycopg2-2.5.3.tar.gz) = 690689
+SHA256 (psycopg2-2.5.4.tar.gz) = 24ba3f328aba08d8d505bc2a8f68a94ebe24a85e8483640b667221bc0efd3b1e
+SIZE (psycopg2-2.5.4.tar.gz) = 682578