aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/py-psycopg/Makefile31
-rw-r--r--databases/py-psycopg/distinfo2
-rw-r--r--databases/py-psycopg/files/patch-configure27
-rw-r--r--databases/py-psycopg/pkg-plist10
4 files changed, 34 insertions, 36 deletions
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index f5df736b814f..29dfa625fdb1 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -6,24 +6,25 @@
#
PORTNAME= psycopg
-PORTVERSION= 1.0.13
+PORTVERSION= 1.1.7
CATEGORIES= databases python
MASTER_SITES= http://initd.org/pub/software/psycopg/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= psycopg-${PORTVERSION}
MAINTAINER= simuran@shaw.ca
-COMMENT= The high perfomance Python adapter for PostgreSQL
+COMMENT= The high performance Python adapter for PostgreSQL
RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
BUILD_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-POSTGRESQL_PORT?= databases/postgresql7
USE_GMAKE= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
+POSTGRESQL_PORT?= databases/postgresql7
+
ALL_TARGET= sharedmods
CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \
@@ -37,14 +38,13 @@ DATETIME_INC= ${PYTHON_SITELIBDIR}/mx/DateTime/mxDateTime/
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 bool.py commit.py copy_from.py copy_from2.py \
+ copy_to.py dictfetch.py dt.py first.py integrity.py \
+ oid.py notify.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 \
@@ -53,15 +53,12 @@ do-install:
.if !defined(NOPORTDOCS)
post-install:
${MKDIR} ${EXAMPLESDIR}
-.for file in ${EXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/doc/examples/${file} ${EXAMPLESDIR}
+.for f in ${EXAMPLES}
+ ${INSTALL_DATA} ${WRKSRC}/doc/examples/${f} ${EXAMPLESDIR}
.endfor
${MKDIR} ${DOCSDIR}
-.for file in ${DOCS}
- ${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.for file in ${TEXDOCS}
- ${INSTALL_MAN} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.for f in ${DOCS}
+ ${INSTALL_MAN} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.else
PLIST= ${WRKDIR}/PLIST.nodocs
diff --git a/databases/py-psycopg/distinfo b/databases/py-psycopg/distinfo
index ab2de4a108d8..372fefe44699 100644
--- a/databases/py-psycopg/distinfo
+++ b/databases/py-psycopg/distinfo
@@ -1 +1 @@
-MD5 (psycopg-1.0.13.tar.gz) = ff5ef0748effefb3c2a456cbfe821be7
+MD5 (psycopg-1.1.7.tar.gz) = c8a73eba14ac642e6112cb30c2fe4d43
diff --git a/databases/py-psycopg/files/patch-configure b/databases/py-psycopg/files/patch-configure
index dda56daeb910..09c36dfbd732 100644
--- a/databases/py-psycopg/files/patch-configure
+++ b/databases/py-psycopg/files/patch-configure
@@ -1,18 +1,15 @@
---- configure.orig Mon Jan 6 02:06:33 2003
-+++ configure Mon Jan 6 02:07:07 2003
-@@ -1316,11 +1316,11 @@
-
- echo $ac_n "checking PostgreSQL type catalog""... $ac_c" 1>&6
- echo "configure:1319: checking PostgreSQL type catalog" >&5
--if test -d $PGSQLDIR/catalog ; then
-- PGSQLTYPES="$PGSQLDIR/catalog/pg_type.h"
-+if test -d $PGSQLDIR/postgresql/catalog ; then
-+ PGSQLTYPES="$PGSQLDIR/postgresql/catalog/pg_type.h"
- else
-- if test -d $PGSQLDIR/server/catalog ; then
-- PGSQLTYPES="$PGSQLDIR/server/catalog/pg_type.h"
-+ if test -d $PGSQLDIR/postgresql/server/catalog ; then
-+ PGSQLTYPES="$PGSQLDIR/postgresql/server/catalog/pg_type.h"
+--- configure.orig Thu Jul 31 12:01:15 2003
++++ configure Thu Jul 31 12:01:15 2003
+@@ -1326,6 +1326,12 @@
+ PGSQLTYPES="$PGSQLDIR/server/catalog/pg_type.h"
+ PGSQLDIR="$PGSQLDIR/server"
+ CPPFLAGS="$CPPFLAGS -I$PGSQLDIR"
++ else
++ if test -d $PGSQLDIR/postgresql/server/catalog ; then
++ PGSQLTYPES="$PGSQLDIR/postgresql/server/catalog/pg_type.h"
++ PGSQLDIR="$PGSQLDIR/postgresql/server"
++ CPPFLAGS="$CPPFLAGS -I$PGSQLDIR"
++ fi
fi
fi
test -z "$PGSQLTYPES" && { echo "configure: error: pg_type.h not found" 1>&2; exit 1; }
diff --git a/databases/py-psycopg/pkg-plist b/databases/py-psycopg/pkg-plist
index b21fed1ffa07..cc34f1054779 100644
--- a/databases/py-psycopg/pkg-plist
+++ b/databases/py-psycopg/pkg-plist
@@ -3,20 +3,24 @@
%%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/bool.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/notify.py
%%PORTDOCS%%share/examples/py-psycopg/somehackers.jpg
%%PORTDOCS%%share/examples/py-psycopg/threads.py
%%PORTDOCS%%share/examples/py-psycopg/usercast.py