Skip site navigation (1)Skip section navigation (2)
Date:      Wed,  2 Jul 2003 01:26:00 -0400 (EDT)
From:      Tim Middleton <x@vex.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/53997: update py-psycopg from 1.0.13 to 1.1.5.1
Message-ID:  <20030702052600.796255C76@bee.vii.net>
Resent-Message-ID: <200307020530.h625UEOr062283@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         53997
>Category:       ports
>Synopsis:       update py-psycopg from 1.0.13 to 1.1.5.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 01 22:30:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Tim Middleton
>Release:        FreeBSD 5.1-RELEASE i386
>Organization:
The Cain Gang Ltd
>Environment:
System: FreeBSD bee.vii.net 5.1-RELEASE FreeBSD 5.1-RELEASE #3: Tue Jun 10 08:17:29 EDT 2003 toor@bee.vii.net:/usr/src/sys/i386/compile/BEE2 i386


>Description:
The py-psycopg port is growing very old; please apply this patch to update 
it. There have been a few files added and removed. 

I've also created a port of the zope database adaptor portion of this
package which relies on this update, which I will send-pr shortly.

>How-To-Repeat:
cd /usr/ports/databases/py-psycopg
make install

>Fix:
diff -ruN py-psycopg.orig/Makefile py-psycopg/Makefile
--- py-psycopg.orig/Makefile	Fri Feb 21 06:15:04 2003
+++ py-psycopg/Makefile	Wed Jul  2 01:00:39 2003
@@ -3,14 +3,13 @@
 # Whom:			Alex Rodioukov <simuran@shaw.ca>
 #
 # $FreeBSD: ports/databases/py-psycopg/Makefile,v 1.7 2003/02/21 11:15:04 knu Exp $
-#
 
-PORTNAME=	psycopg
-PORTVERSION=	1.0.13
-CATEGORIES=	databases python
+PORTNAME=		psycopg
+PORTVERSION=	1.1.5.1
+CATEGORIES=		databases python
 MASTER_SITES=	http://initd.org/pub/software/psycopg/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	psycopg-${PORTVERSION}
+DISTNAME=		psycopg-${PORTVERSION}
 
 MAINTAINER=	simuran@shaw.ca
 COMMENT=	The high perfomance Python adapter for PostgreSQL
@@ -20,8 +19,9 @@
 LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 
 POSTGRESQL_PORT?=	databases/postgresql7
-USE_GMAKE=	yes
+DIST_SUBDIR=	python
 USE_PYTHON=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 ALL_TARGET=	sharedmods
@@ -37,14 +37,13 @@
 DOCSDIR=	${PREFIX}/share/doc/py-psycopg
 EXAMPLESDIR=	${PREFIX}/share/examples/py-psycopg
 
-EXAMPLES=	binary.py commit.py dictfetch.py dt.py first.py oid.py \
-		somehackers.jpg threads.py usercast.py whereareyou.jpg \
-		work.py
+EXAMPLES=	binary.py commit.py copy_from.py copy_from2.py copy_to.py \
+			dictfetch.py dt.py first.py integrity.py oid.py \
+			somehackers.jpg threads.py usercast.py whereareyou.jpg \
+			work.py
 
-DOCS=		AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README \
-		RELEASE-1.0 SUCCESS TODO
-
-TEXDOCS=	dbapi20programming.tex dbapiext.tex psycopg-guide.tex
+DOCS=		AUTHORS COPYING CREDITS ChangeLog FAQ INSTALL NEWS README \
+			RELEASE-1.0 SUCCESS TODO
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/psycopgmodule.so \
@@ -60,9 +59,9 @@
 .for file in ${DOCS}
 	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
-.for file in ${TEXDOCS}
-	${INSTALL_MAN} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
+.if !defined(BATCH)
+	@${CAT} ${PKGMESSAGE}
+.endif
 .else
 PLIST=	${WRKDIR}/PLIST.nodocs
 pre-install:
diff -ruN py-psycopg.orig/distinfo py-psycopg/distinfo
--- py-psycopg.orig/distinfo	Fri Nov  8 01:01:28 2002
+++ py-psycopg/distinfo	Wed Jul  2 00:54:39 2003
@@ -1 +1 @@
-MD5 (psycopg-1.0.13.tar.gz) = ff5ef0748effefb3c2a456cbfe821be7
+MD5 (python/psycopg-1.1.5.1.tar.gz) = 01ffd2a77d722c736281631ed9537259
diff -ruN py-psycopg.orig/files/patch-configure py-psycopg/files/patch-configure
--- py-psycopg.orig/files/patch-configure	Wed Jan  8 06:44:18 2003
+++ py-psycopg/files/patch-configure	Wed Jul  2 00:23:42 2003
@@ -1,9 +1,8 @@
---- configure.orig	Mon Jan  6 02:06:33 2003
-+++ configure	Mon Jan  6 02:07:07 2003
-@@ -1316,11 +1316,11 @@
- 
+--- configure.orig	Sun Jun 22 18:42:26 2003
++++ configure	Wed Jul  2 00:14:16 2003
+@@ -1320,9 +1320,9 @@
  echo $ac_n "checking PostgreSQL type catalog""... $ac_c" 1>&6
- echo "configure:1319: checking PostgreSQL type catalog" >&5
+ echo "configure:1322: checking PostgreSQL type catalog" >&5
 -if test -d $PGSQLDIR/catalog ; then
 -  PGSQLTYPES="$PGSQLDIR/catalog/pg_type.h"
 +if test -d $PGSQLDIR/postgresql/catalog ; then
@@ -13,6 +12,5 @@
 -    PGSQLTYPES="$PGSQLDIR/server/catalog/pg_type.h"
 +  if test -d $PGSQLDIR/postgresql/server/catalog ; then
 +    PGSQLTYPES="$PGSQLDIR/postgresql/server/catalog/pg_type.h"
-   fi
- fi
- test -z "$PGSQLTYPES" && { echo "configure: error: pg_type.h not found" 1>&2; exit 1; }
+     PGSQLDIR="$PGSQLDIR/server"
+     CPPFLAGS="$CPPFLAGS -I$PGSQLDIR"
diff -ruN py-psycopg.orig/pkg-message py-psycopg/pkg-message
--- py-psycopg.orig/pkg-message	Wed Dec 31 19:00:00 1969
+++ py-psycopg/pkg-message	Wed Jul  2 00:57:24 2003
@@ -0,0 +1,7 @@
+Psycopg
+
+    There isn't really any documentation distributed with this package.
+    Look over the examples that were installed for instruction, or 
+    visit the Psycopg web site and look for the DB-API 2.0 Programming
+    Guide. If you're very brave you can try 'pydoc psycopg'.
+
diff -ruN py-psycopg.orig/pkg-plist py-psycopg/pkg-plist
--- py-psycopg.orig/pkg-plist	Wed Apr 17 03:10:56 2002
+++ py-psycopg/pkg-plist	Wed Jul  2 00:35:29 2003
@@ -3,19 +3,21 @@
 %%PORTDOCS%%share/doc/py-psycopg/CREDITS
 %%PORTDOCS%%share/doc/py-psycopg/ChangeLog
 %%PORTDOCS%%share/doc/py-psycopg/FAQ
+%%PORTDOCS%%share/doc/py-psycopg/INSTALL
 %%PORTDOCS%%share/doc/py-psycopg/NEWS
 %%PORTDOCS%%share/doc/py-psycopg/README
 %%PORTDOCS%%share/doc/py-psycopg/RELEASE-1.0
 %%PORTDOCS%%share/doc/py-psycopg/SUCCESS
 %%PORTDOCS%%share/doc/py-psycopg/TODO
-%%PORTDOCS%%share/doc/py-psycopg/dbapi20programming.tex
-%%PORTDOCS%%share/doc/py-psycopg/dbapiext.tex
-%%PORTDOCS%%share/doc/py-psycopg/psycopg-guide.tex
 %%PORTDOCS%%share/examples/py-psycopg/binary.py
 %%PORTDOCS%%share/examples/py-psycopg/commit.py
+%%PORTDOCS%%share/examples/py-psycopg/copy_from.py
+%%PORTDOCS%%share/examples/py-psycopg/copy_from2.py
+%%PORTDOCS%%share/examples/py-psycopg/copy_to.py
 %%PORTDOCS%%share/examples/py-psycopg/dictfetch.py
 %%PORTDOCS%%share/examples/py-psycopg/dt.py
 %%PORTDOCS%%share/examples/py-psycopg/first.py
+%%PORTDOCS%%share/examples/py-psycopg/integrity.py
 %%PORTDOCS%%share/examples/py-psycopg/oid.py
 %%PORTDOCS%%share/examples/py-psycopg/somehackers.jpg
 %%PORTDOCS%%share/examples/py-psycopg/threads.py
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030702052600.796255C76>