pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases Updated jdbc-postgresql74 to 216



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfa504f7d735
branches:  trunk
changeset: 508891:dfa504f7d735
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Feb 27 14:52:08 2006 +0000

description:
Updated jdbc-postgresql74 to 216
Updated jdbc-postgresql80 to 315
Updated jdbc-postgresql81 to 405
        No change logs found.

Removed jdbc-postgresql (has been re-imported as jdbc-postgresql73)

diffstat:

 databases/Makefile                           |   4 +-
 databases/jdbc-postgresql/DESCR              |   1 -
 databases/jdbc-postgresql/Makefile           |  52 -----------------------
 databases/jdbc-postgresql/PLIST              |  14 ------
 databases/jdbc-postgresql/distinfo           |   6 --
 databases/jdbc-postgresql/patches/patch-aa   |  43 -------------------
 databases/jdbc-postgresql74/DESCR            |   8 +++-
 databases/jdbc-postgresql74/Makefile         |  62 ++++++++-------------------
 databases/jdbc-postgresql74/PLIST            |  16 +------
 databases/jdbc-postgresql74/distinfo         |   9 +--
 databases/jdbc-postgresql74/patches/patch-aa |  13 -----
 databases/jdbc-postgresql80/Makefile         |   5 +-
 databases/jdbc-postgresql80/distinfo         |  14 +++---
 databases/jdbc-postgresql81/Makefile         |   5 +-
 databases/jdbc-postgresql81/distinfo         |  14 +++---
 15 files changed, 51 insertions(+), 215 deletions(-)

diffs (truncated from 380 to 300 lines):

diff -r 6bec12567954 -r dfa504f7d735 databases/Makefile
--- a/databases/Makefile        Mon Feb 27 14:48:36 2006 +0000
+++ b/databases/Makefile        Mon Feb 27 14:52:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.203 2006/02/15 15:04:59 joerg Exp $
+# $NetBSD: Makefile,v 1.204 2006/02/27 14:52:08 abs Exp $
 #
 
 COMMENT=       Databases
@@ -27,7 +27,7 @@
 SUBDIR+=       iodbc
 SUBDIR+=       java-db3
 SUBDIR+=       jdb
-SUBDIR+=       jdbc-postgresql
+SUBDIR+=       jdbc-postgresql73
 SUBDIR+=       jdbc-postgresql74
 SUBDIR+=       jdbc-postgresql80
 SUBDIR+=       jdbc-postgresql81
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql/DESCR
--- a/databases/jdbc-postgresql/DESCR   Mon Feb 27 14:48:36 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-This package contains a complete Type 4 JDBC driver for the Postgresql RDBMS.
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql/Makefile
--- a/databases/jdbc-postgresql/Makefile        Mon Feb 27 14:48:36 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2006/02/05 23:08:31 joerg Exp $
-#
-
-DISTNAME=              postgresql-${DIST_VERS}
-PKGNAME=               jdbc-${DISTNAME}
-PKGREVISION=           1
-CATEGORIES=            databases java
-MASTER_SITES?=         http://www.postgresql.org/ftp/source/OLD/v${DIST_VERS}/ \
-                       ftp://ftp.postgresql.org/pub/source/OLD/v${DIST_VERS}/ \
-                       ftp://ftp.de.postgresql.org/pub/source/OLD/v${DIST_VERS}/ \
-                       ftp://ch.postgresql.org/mirror/postgresql/source/OLD/v${DIST_VERS}/ \
-                       ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/source/OLD/v${DIST_VERS}/ \
-                       ftp://looking-glass.usask.ca/pub/postgresql/source/OLD/v${DIST_VERS}/ \
-                       ftp://ftp.sunsite.auc.dk/mirrors/postgresql/source/OLD/v${DIST_VERS}/ \
-                       ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/source/OLD/v${DIST_VERS}/
-
-DIST_VERS=             7.3.8
-MAINTAINER=            jwise%NetBSD.org@localhost
-HOMEPAGE=              http://www.postgresql.org/
-COMMENT=               100% Java JDBC driver for PostgreSQL
-
-BROKEN_IN=             pkgsrc-2005Q4
-
-# No, we don't depend on postgresql.  This code base stands alone.
-BUILD_DEPENDS+=                apache-ant-[0-9]*:../../devel/apache-ant
-
-EXTRACT_ELEMENTS=      ${DISTNAME}/src/interfaces/jdbc
-
-WRKSRC=                        ${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
-USE_TOOLS+=            gmake
-
-EXAMPLEDIR=            ${PREFIX}/share/examples/java/jdbc-postgresql
-DOCDIR=                        ${PREFIX}/share/doc/java/jdbc-postgresql
-
-do-configure:
-       ( ${ECHO} "VERSION=             ${DIST_VERS}";                  \
-         ${ECHO} "ANT=                 ${LOCALBASE}/bin/ant";          \
-         ${ECHO} "DEF_PGPORT=          5432";                          \
-         ${ECHO} "srcdir=              .";                             \
-       ) > ${WRKSRC}/../../../src/Makefile.global
-
-do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-       ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${PREFIX}/lib/java
-       ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-       ${INSTALL_DATA} ${WRKSRC}/example/*.java ${EXAMPLEDIR}
-       ${INSTALL_DATA} ${WRKSRC}/jars/postgresql-examples.jar ${EXAMPLEDIR}
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-
-.include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql/PLIST
--- a/databases/jdbc-postgresql/PLIST   Mon Feb 27 14:48:36 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/02 18:46:39 jlam Exp $
-lib/java/postgresql.jar
-share/examples/java/jdbc-postgresql/postgresql-examples.jar
-share/examples/java/jdbc-postgresql/ImageViewer.java
-share/examples/java/jdbc-postgresql/Unicode.java
-share/examples/java/jdbc-postgresql/basic.java
-share/examples/java/jdbc-postgresql/blobtest.java
-share/examples/java/jdbc-postgresql/datestyle.java
-share/examples/java/jdbc-postgresql/metadata.java
-share/examples/java/jdbc-postgresql/psql.java
-share/examples/java/jdbc-postgresql/threadsafe.java
-share/doc/java/jdbc-postgresql/README
-@dirrm share/examples/java/jdbc-postgresql
-@dirrm share/doc/java/jdbc-postgresql
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql/distinfo
--- a/databases/jdbc-postgresql/distinfo        Mon Feb 27 14:48:36 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 16:33:06 agc Exp $
-
-SHA1 (postgresql-7.3.8.tar.gz) = bd27703cbcc219d36521a0e57233408a6f70b342
-RMD160 (postgresql-7.3.8.tar.gz) = 1478a9f96dfc10fa8db0802325e67cc89e04dcca
-Size (postgresql-7.3.8.tar.gz) = 11293472 bytes
-SHA1 (patch-aa) = 4740338ad87748c6619eb674808c11e1b57826af
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql/patches/patch-aa
--- a/databases/jdbc-postgresql/patches/patch-aa        Mon Feb 27 14:48:36 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2003/01/02 18:46:42 jlam Exp $
-
---- build.xml.orig     Sat Oct 19 20:10:55 2002
-+++ build.xml
-@@ -48,21 +48,21 @@
-     <available property="junit" classname="junit.framework.Test" />
-     <condition property="jdbc2tests">
-       <and>
--        <isset property="jdbc2"/>
--        <isset property="junit"/>
-+        <equals arg1="${jdbc2}" arg2="true"/>
-+        <equals arg1="${junit}" arg2="true"/>
-       </and>
-     </condition>
-     <condition property="jdbc2optionaltests">
-       <and>
--        <isset property="jdbc2"/>
--        <isset property="datasource"/>
--        <isset property="junit"/>
-+        <equals arg1="${jdbc2}" arg2="true"/>
-+        <equals arg1="${datasource}" arg2="true"/>
-+        <equals arg1="${junit}" arg2="true"/>
-       </and>
-     </condition>
-     <condition property="jdbc3tests">
-       <and>
--        <isset property="jdbc3"/>
--        <isset property="junit"/>
-+        <equals arg1="${jdbc3}" arg2="true"/>
-+        <equals arg1="${junit}" arg2="true"/>
-       </and>
-     </condition>
-   </target>
-@@ -156,9 +156,6 @@
-     <filter token="JDBCCONNECTCLASS" value="${connectclass}" />
-     <filter token="DEF_PGPORT" value="${def_pgport}" />
- 
--     <fail unless="major" message="'major' undefined. Please follow the directions in README."/>
--     <fail unless="minor" message="'minor' undefined. Please follow the directions in README."/>
-- 
-     <!-- Put a check for the current version here -->
- 
-     <!-- now copy and filter the file -->
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql74/DESCR
--- a/databases/jdbc-postgresql74/DESCR Mon Feb 27 14:48:36 2006 +0000
+++ b/databases/jdbc-postgresql74/DESCR Mon Feb 27 14:52:08 2006 +0000
@@ -1,1 +1,7 @@
-This package contains a complete Type 4 JDBC driver for the Postgresql RDBMS.
+This is a pure Java (Type IV) JDBC driver for the PostgreSQL
+database.  It allows Java programs to connect to a PostgreSQL
+database using standard, database independent Java code.
+
+The driver provides a reasonably complete implementation of the
+JDBC 3 specification in addition to some PostgreSQL specific
+extensions.
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql74/Makefile
--- a/databases/jdbc-postgresql74/Makefile      Mon Feb 27 14:48:36 2006 +0000
+++ b/databases/jdbc-postgresql74/Makefile      Mon Feb 27 14:52:08 2006 +0000
@@ -1,55 +1,29 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:31 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/27 14:52:09 abs Exp $
 #
 
-DIST_VERS=             7.4.6
-DISTNAME=              postgresql-${DIST_VERS}
-PKGNAME=               jdbc-${DISTNAME}
-PKGREVISION=           1
-CATEGORIES=            databases java
-MASTER_SITES?=         http://www.postgresql.org/ftpsite/source/OLD/v${DIST_VERS}/ \
-                       ftp://ftp.postgresql.org/pub/source/OLD/v${DIST_VERS}/ \
-                       ftp://ftp.de.postgresql.org/pub/source/OLD/v${DIST_VERS}/ \
-                       ftp://ch.postgresql.org/mirror/postgresql/source/OLD/v${DIST_VERS}/ \
-                       ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/source/OLD/v${DIST_VERS}/ \
-                       ftp://looking-glass.usask.ca/pub/postgresql/source/OLD/v${DIST_VERS}/ \
-                       ftp://ftp.sunsite.auc.dk/mirrors/postgresql/source/OLD/v${DIST_VERS}/ \
-                       ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/source/OLD/v${DIST_VERS}/
-EXTRACT_SUFX=          .tar.bz2
+DISTNAME=              ${JARDIST}
+PKGNAME=               jdbc-postgresql74-${PGBUILD}
+DISTFILES+=            ${JARDIST}
+CATEGORIES=            databases
+MASTER_SITES=          http://jdbc.postgresql.org/download/
 
-MAINTAINER=            jwise%NetBSD.org@localhost
-HOMEPAGE=              http://www.postgresql.org/
-COMMENT=               Pure Java JDBC driver for PostgreSQL 7.4.x
+MAINTAINER=            abs%NetBSD.org@localhost
+HOMEPAGE=              http://jdbc.postgresql.org/
+COMMENT=               PostgreSQL 7.4 JDBC3 driver
 
-# No, we don't depend on postgresql.  This code base stands alone.
-BUILD_DEPENDS+=                apache-ant-[0-9]*:../../devel/apache-ant
-
-EXTRACT_ELEMENTS=      ${DISTNAME}/src/interfaces/jdbc
-
-WRKSRC=                        ${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
-USE_TOOLS+=            gmake
-
-EXAMPLEDIR=            ${PREFIX}/share/examples/java/jdbc-postgresql
-DOCDIR=                        ${PREFIX}/share/doc/java/jdbc-postgresql
+PGBUILD=               216
+JARDIST=               pg74.${PGBUILD}.jdbc3.jar
+JARFILE=               postgresql74.jar
+EXTRACT_ONLY=           
 
-do-configure:
-       ( ${ECHO} "VERSION=             ${DIST_VERS}";                  \
-         ${ECHO} "ANT=                 ${LOCALBASE}/bin/ant";          \
-         ${ECHO} "DEF_PGPORT=          5432";                          \
-         ${ECHO} "srcdir=              .";                             \
-       ) > ${WRKSRC}/../../../src/Makefile.global
-       ${SED}  -e "s:@FULLVERSION@:${DIST_VERS}:" \
-               -e "s:@MAJOR@:${DIST_VERS:C/\..*//}:" \
-               -e "s:@MINOR@:${DIST_VERS:C/[0-9]*\.//:C/\..*//}:" \
-       ${FILESDIR}/build.properties > ${WRKSRC}/build.properties
+USE_JAVA2=             1.4
+NO_BUILD=              YES
+
+PLIST_SUBST+=          JARFILE=${JARFILE:Q}
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-       ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${PREFIX}/lib/java
-       ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-       ${INSTALL_DATA} ${WRKSRC}/example/*.java ${EXAMPLEDIR}
-       ${INSTALL_DATA} ${WRKSRC}/jars/postgresql-examples.jar ${EXAMPLEDIR}
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+       ${INSTALL_DATA} ${DISTDIR}/${JARDIST} ${PREFIX}/lib/java/${JARFILE}
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql74/PLIST
--- a/databases/jdbc-postgresql74/PLIST Mon Feb 27 14:48:36 2006 +0000
+++ b/databases/jdbc-postgresql74/PLIST Mon Feb 27 14:52:08 2006 +0000
@@ -1,14 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/27 16:38:32 recht Exp $
-lib/java/postgresql.jar
-share/doc/java/jdbc-postgresql/README
-share/examples/java/jdbc-postgresql/ImageViewer.java
-share/examples/java/jdbc-postgresql/Unicode.java
-share/examples/java/jdbc-postgresql/basic.java
-share/examples/java/jdbc-postgresql/blobtest.java
-share/examples/java/jdbc-postgresql/datestyle.java
-share/examples/java/jdbc-postgresql/metadata.java
-share/examples/java/jdbc-postgresql/postgresql-examples.jar
-share/examples/java/jdbc-postgresql/psql.java
-share/examples/java/jdbc-postgresql/threadsafe.java
-@dirrm share/examples/java/jdbc-postgresql
-@dirrm share/doc/java/jdbc-postgresql
+@comment $NetBSD: PLIST,v 1.3 2006/02/27 14:52:09 abs Exp $
+lib/java/${JARFILE}
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql74/distinfo
--- a/databases/jdbc-postgresql74/distinfo      Mon Feb 27 14:48:36 2006 +0000
+++ b/databases/jdbc-postgresql74/distinfo      Mon Feb 27 14:52:08 2006 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 16:33:06 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/02/27 14:52:09 abs Exp $
 
-SHA1 (postgresql-7.4.6.tar.bz2) = 54e9126053579285b29a3a30e3055d1784a28b0a
-RMD160 (postgresql-7.4.6.tar.bz2) = 7d17d216203bb42963c4c481548665aeddd359c9
-Size (postgresql-7.4.6.tar.bz2) = 10200107 bytes
-SHA1 (patch-aa) = 3dea03b653408c0191959c9f2532f6150d7d5d95
+SHA1 (pg74.216.jdbc3.jar) = aa48adcdcb1232ad2fae9d8d139fdaff5da2a029
+RMD160 (pg74.216.jdbc3.jar) = cac5b4ccc7e94516979c77e50180a66145e0fa6f
+Size (pg74.216.jdbc3.jar) = 210371 bytes
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql74/patches/patch-aa
--- a/databases/jdbc-postgresql74/patches/patch-aa      Mon Feb 27 14:48:36 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/06/03 10:23:19 abs Exp $
-
---- org/postgresql/jdbc2/AbstractJdbc2ResultSet.java.orig      2004-05-21 12:54:29.000000000 +0100
-+++ org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
-@@ -1448,7 +1450,7 @@ public abstract class AbstractJdbc2Resul
-                       {
-                               if (name.toLowerCase().equals("from"))
-                               {
--                                      tableName = st.nextToken();
-+                                      tableName = st.nextToken().replaceAll(";", "");
-                                       tableFound = true;
-                               }
-                       }
diff -r 6bec12567954 -r dfa504f7d735 databases/jdbc-postgresql80/Makefile
--- a/databases/jdbc-postgresql80/Makefile      Mon Feb 27 14:48:36 2006 +0000
+++ b/databases/jdbc-postgresql80/Makefile      Mon Feb 27 14:52:08 2006 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:31 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/02/27 14:52:09 abs Exp $



Home | Main Index | Thread Index | Old Index