From girgen@smtp.chello.se  Mon Jan 19 16:49:08 2004
Return-Path: <girgen@smtp.chello.se>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CE44616A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Jan 2004 16:49:08 -0800 (PST)
Received: from amsfep12-int.chello.nl (amsfep12-int.chello.nl [213.46.243.18])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4A53C43D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 19 Jan 2004 16:49:00 -0800 (PST)
	(envelope-from girgen@smtp.chello.se)
Received: from palle.girgensohn.se ([213.89.138.245])
          by amsfep12-int.chello.nl
          (InterMail vM.6.00.05.02 201-2115-109-103-20031105) with ESMTP
          id <20040120004858.DCQS8991.amsfep12-int.chello.nl@palle.girgensohn.se>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Tue, 20 Jan 2004 01:48:58 +0100
Received: from palle.girgensohn.se (localhost [127.0.0.1])
	by palle.girgensohn.se (8.12.9p2/8.12.9) with ESMTP id i0K0mvkC072735
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 20 Jan 2004 01:48:57 +0100 (CET)
	(envelope-from girgen@palle.girgensohn.se)
Received: (from girgen@localhost)
	by palle.girgensohn.se (8.12.9p2/8.12.9/Submit) id i0K0mt4U072734;
	Tue, 20 Jan 2004 01:48:55 +0100 (CET)
	(envelope-from girgen)
Message-Id: <200401200048.i0K0mt4U072734@palle.girgensohn.se>
Date: Tue, 20 Jan 2004 01:48:55 +0100 (CET)
From: Palle Girgensohn <girgen@pingpong.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] databases/py23-PyGreSQL: update to 3.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61597
>Category:       ports
>Synopsis:       [MAINTAINER] databases/py23-PyGreSQL: update to 3.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 19 16:50:12 PST 2004
>Closed-Date:    Thu Jan 29 20:28:59 PST 2004
>Last-Modified:  Thu Jan 29 20:28:59 PST 2004
>Originator:     Palle Girgensohn
>Release:        FreeBSD 4.9-RELEASE i386
>Organization:
Ping Pong AB
>Environment:
System: FreeBSD palle.girgensohn.se 4.9-RELEASE FreeBSD 4.9-RELEASE #6: Tue Nov  4 22:56:29 CET
>Description:
Update PyGreSQL to 3.4. Previous version was packed with the
postgresql dist, and while postgresql was version 7.3.5, PyGreSQL's
own version just bumped from 3.3 to 3.4. Hence portepoch.

cvs remove patch-configure
cvs remoce patch-src::interfaces::python::GNUmakefile

cvs add files/patch-setup.py

/Palle

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- py23-PyGreSQL-3.4,1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/py-PyGreSQL/Makefile,v
retrieving revision 1.38
diff -u -u -r1.38 Makefile
--- Makefile	12 Jan 2004 16:46:25 -0000	1.38
+++ Makefile	20 Jan 2004 00:35:59 -0000
@@ -6,34 +6,33 @@
 #
 
 PORTNAME=	PyGreSQL
-PORTREVISION=	0
+PORTVERSION=	3.4
+PORTEPOCH=	1
 CATEGORIES=	databases python
+MASTER_SITES=	ftp://ftp.pygresql.org/pub/distrib/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	girgen@pingpong.net
-COMMENT=	A Python interface to PostgreSQL, including a DP-API 2.0 wrapper
+COMMENT=	A Python interface to PostgreSQL, both classic interface and DP-API 2.0
 
 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}
+LIB_DEPENDS=	pq:${PORTSDIR}/${POSTGRESQL_PORT}
 
 POSTGRESQL_PORT?=	databases/postgresql7
-POSTGRESQL_SUBPORT=YES
+USE_PYTHON=	yes
+DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
+USE_REINPLACE=yes
 
-WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
+pre-build:
+	@ cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' setup.py
 
-# The PyGreSQL distfile is nowhere to be found, but exists in
-# postgresql-7.3 distribution so do not be alarmed if you use
-# a newer version of postgresql
-.include <${.CURDIR}/../postgresql73/Makefile>
+do-build:
+	@ cd ${WRKSRC} ; ${PYTHON_CMD} setup.py build
 
-USE_PYTHON=	yes
-CONFIGURE_ARGS=	--with-python --prefix=${PREFIX}
-MAKE_ARGS+=	-C src/interfaces/python
-CFLAGS+=	-L${LOCALBASE}/lib
-MAKEFILE=	GNUmakefile
-
-DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
+do-install:
+	@ cd ${WRKSRC} ; ${PYTHON_CMD} setup.py install
 
 post-install:
 	@ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -lf \
@@ -41,9 +40,9 @@
 	@ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -lf \
 	  ${PYTHONPREFIX_SITELIBDIR}
 .if !defined(NOPORTDOCS)
-.for docfile in Announce ChangeLog README
+.for docfile in Announce ChangeLog
 	@ ${MKDIR} ${DOCSDIR}
-	  ${INSTALL_DATA} ${WRKSRC}/src/interfaces/python/${docfile} \
+	  ${INSTALL_DATA} ${WRKSRC}/${docfile} \
 	  ${DOCSDIR}
 .endfor
 .endif
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/databases/py-PyGreSQL/pkg-plist,v
retrieving revision 1.6
diff -u -u -r1.6 pkg-plist
--- pkg-plist	4 Sep 2003 13:32:30 -0000	1.6
+++ pkg-plist	20 Jan 2004 00:21:21 -0000
@@ -1,7 +1,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/Announce
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PYTHON_SITELIBDIR%%/_pgmodule.so
+%%PYTHON_SITELIBDIR%%/_pg.so
 %%PYTHON_SITELIBDIR%%/pg.py
 %%PYTHON_SITELIBDIR%%/pg.pyc
 %%PYTHON_SITELIBDIR%%/pg.pyo
--- /dev/null	Tue Jan 20 01:39:32 2004
+++ files/patch-setyp.py	Tue Jan 20 01:21:21 2004
@@ -0,0 +1,13 @@
+--- setup.py~	Tue Jan 13 13:29:57 2004
++++ setup.py	Tue Jan 13 16:14:50 2004
+@@ -30,8 +30,8 @@
+ 	optional_libs=[ 'libpqdll', 'wsock32', 'advapi32' ]
+ 	data_files = [ 'libpq.dll' ]
+ else:
+-	include_dirs=['/usr/include/pgsql']
+-	library_dirs=['/usr/lib/pgsql']
++	include_dirs=['%%LOCALBASE%%/include', '%%LOCALBASE%%/include/postgresql', '%%LOCALBASE%%/include/postgresql/server']
++	library_dirs=['%%LOCALBASE%%/lib']
+ 	optional_libs=['pq']
+ 	data_files = []
+ 
--- files/patch-src::interfaces::python::GNUmakefile	Tue Jan 20 01:46:23 2004
+++ /dev/null	Tue Jan 20 01:42:23 2004
@@ -1,28 +0,0 @@
---- src/interfaces/python/GNUmakefile.orig	Thu Dec 13 20:39:04 2001
-+++ src/interfaces/python/GNUmakefile	Wed Oct 23 15:52:18 2002
-@@ -34,9 +34,9 @@
- echo "*** become the appropriate user, and do '$(MAKE) install'."; }
- 
- install: all installdirs
--	@if test -w $(DESTDIR)$(python_moduleexecdir) && test -w $(DESTDIR)$(python_moduledir); then \
--	  echo "$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX)"; \
--	  $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX); \
-+	@if test -w $(DESTDIR)$(python_moduledir); then \
-+	  echo "$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduledir)/_pgmodule$(DLSUFFIX)"; \
-+	  $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduledir)/_pgmodule$(DLSUFFIX); \
- 	\
- 	  echo "$(INSTALL_DATA) $(srcdir)/pg.py $(DESTDIR)$(python_moduledir)/pg.py"; \
- 	  $(INSTALL_DATA) $(srcdir)/pg.py $(DESTDIR)$(python_moduledir)/pg.py; \
-@@ -48,10 +48,10 @@
- 	fi
- 
- installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(python_moduleexecdir) $(DESTDIR)$(python_moduledir)
-+	$(mkinstalldirs) $(DESTDIR)$(python_moduledir)
- 
- uninstall:
--	rm -f $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX) \
-+	rm -f $(DESTDIR)$(python_moduledir)/_pgmodule$(DLSUFFIX) \
- 	      $(DESTDIR)$(python_moduledir)/pg.py \
- 	      $(DESTDIR)$(python_moduledir)/pgdb.py
- 
--- files/patch-configure	Tue Jan 20 01:45:51 2004
+++ /dev/null	Tue Jan 20 01:42:23 2004
@@ -1,11 +0,0 @@
---- configure.orig	Tue Oct  1 05:34:27 2002
-+++ configure	Wed Oct 23 15:50:31 2002
-@@ -3239,7 +3239,7 @@
- echo $ac_n "checking Python installation directories""... $ac_c" 1>&6
- echo "configure:3241: checking Python installation directories" >&5
- python_version=`${PYTHON} -c "import sys; print sys.version[:3]"`
--python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
-+python_prefix="${prefix}"
- python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
- python_configdir="${python_execprefix}/lib/python${python_version}/config"
- python_moduledir="${python_prefix}/lib/python${python_version}/site-packages"
--- py23-PyGreSQL-3.4,1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Thu Jan 29 20:28:50 PST 2004 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61597 
>Unformatted:
