From ccb26524fc6531cfabec267f86f9b1d758f028b3 Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Thu, 4 Sep 2003 13:32:30 +0000
Subject: [PATCH] [1] Use new depends scheme for postgresql slave ports: 
 ${MAKE} -V ... instead of .include <...> [2] Utilize ${DOCSDIR}

Submitted by:	Palle Girgensohn <girgen@pingpong.net> (maintainer) [1],
		osa [2]
PR:		56350, 56404
---
 databases/py-PyGreSQL/Makefile  | 15 ++++++++++++---
 databases/py-PyGreSQL/pkg-plist |  8 ++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/databases/py-PyGreSQL/Makefile b/databases/py-PyGreSQL/Makefile
index c442cc236e2c..0d313fe899c4 100644
--- a/databases/py-PyGreSQL/Makefile
+++ b/databases/py-PyGreSQL/Makefile
@@ -4,21 +4,30 @@
 #
 # $FreeBSD$
 #
+POSTGRESQL_PORT?=	databases/postgresql7
 
 PORTNAME=	PyGreSQL
+PORTVERSION!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V PORTVERSION
+PORTREVISION?=	0
 CATEGORIES=	databases python
+MASTER_SITES=	${MASTER_SITE_PGSQL}
+MASTER_SITE_SUBDIR!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V MASTER_SITE_SUBDIR
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTFILES!=	cd ${.CURDIR}/../../${POSTGRESQL_PORT} && ${MAKE} -V DISTFILES
+DIST_SUBDIR=	postgresql
+WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 
-POSTGRESQL_SUBPORT=	YES
-.include <${.CURDIR}/../postgresql7/Makefile>
+MAINTAINER=	girgen@pingpong.net
 COMMENT=	A Python interface to PostgreSQL, including a DP-API 2.0 wrapper
 
 BUILD_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
 RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
-POSTGRESQL_PORT?=	databases/postgresql7
+MD5_FILE=	${.CURDIR}/../../${POSTGRESQL_PORT}/distinfo
 
+USE_GMAKE=	YES
+GNU_CONFIGURE=	YES
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--with-python --prefix=${PREFIX}
 MAKE_ARGS+=	-C src/interfaces/python
diff --git a/databases/py-PyGreSQL/pkg-plist b/databases/py-PyGreSQL/pkg-plist
index 5b741085d7dd..98b386acd7b4 100644
--- a/databases/py-PyGreSQL/pkg-plist
+++ b/databases/py-PyGreSQL/pkg-plist
@@ -1,6 +1,6 @@
-%%PORTDOCS%%share/doc/PyGreSQL/Announce
-%%PORTDOCS%%share/doc/PyGreSQL/ChangeLog
-%%PORTDOCS%%share/doc/PyGreSQL/README
+%%PORTDOCS%%%%DOCSDIR%%/Announce
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PYTHON_SITELIBDIR%%/_pgmodule.so
 %%PYTHON_SITELIBDIR%%/pg.py
 %%PYTHON_SITELIBDIR%%/pg.pyc
@@ -8,4 +8,4 @@
 %%PYTHON_SITELIBDIR%%/pgdb.py
 %%PYTHON_SITELIBDIR%%/pgdb.pyc
 %%PYTHON_SITELIBDIR%%/pgdb.pyo
-%%PORTDOCS%%@dirrm share/doc/PyGreSQL
+%%PORTDOCS%%@dirrm %%DOCSDIR%%