From c4892da7c93620f9309fbce565f0187e47f73f36 Mon Sep 17 00:00:00 2001 From: abs Date: Mon, 27 Feb 2006 14:52:08 +0000 Subject: 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) --- 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 | 60 ++++++++-------------------- 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, 50 insertions(+), 214 deletions(-) delete mode 100644 databases/jdbc-postgresql/DESCR delete mode 100644 databases/jdbc-postgresql/Makefile delete mode 100644 databases/jdbc-postgresql/PLIST delete mode 100644 databases/jdbc-postgresql/distinfo delete mode 100644 databases/jdbc-postgresql/patches/patch-aa delete mode 100644 databases/jdbc-postgresql74/patches/patch-aa diff --git a/databases/Makefile b/databases/Makefile index 8175251d988..0284f3b543d 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -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+= guile-pg SUBDIR+= iodbc SUBDIR+= java-db3 SUBDIR+= jdb -SUBDIR+= jdbc-postgresql +SUBDIR+= jdbc-postgresql73 SUBDIR+= jdbc-postgresql74 SUBDIR+= jdbc-postgresql80 SUBDIR+= jdbc-postgresql81 diff --git a/databases/jdbc-postgresql/DESCR b/databases/jdbc-postgresql/DESCR deleted file mode 100644 index e197dad6c33..00000000000 --- a/databases/jdbc-postgresql/DESCR +++ /dev/null @@ -1 +0,0 @@ -This package contains a complete Type 4 JDBC driver for the Postgresql RDBMS. diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile deleted file mode 100644 index da47aa05916..00000000000 --- a/databases/jdbc-postgresql/Makefile +++ /dev/null @@ -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 -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 --git a/databases/jdbc-postgresql/PLIST b/databases/jdbc-postgresql/PLIST deleted file mode 100644 index 0a9c6580319..00000000000 --- a/databases/jdbc-postgresql/PLIST +++ /dev/null @@ -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 --git a/databases/jdbc-postgresql/distinfo b/databases/jdbc-postgresql/distinfo deleted file mode 100644 index 1d855513725..00000000000 --- a/databases/jdbc-postgresql/distinfo +++ /dev/null @@ -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 --git a/databases/jdbc-postgresql/patches/patch-aa b/databases/jdbc-postgresql/patches/patch-aa deleted file mode 100644 index 4e29bf81015..00000000000 --- a/databases/jdbc-postgresql/patches/patch-aa +++ /dev/null @@ -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 @@ - - - -- -- -+ -+ - - - - -- -- -- -+ -+ -+ - - - - -- -- -+ -+ - - - -@@ -156,9 +156,6 @@ - - - -- -- -- - - - diff --git a/databases/jdbc-postgresql74/DESCR b/databases/jdbc-postgresql74/DESCR index e197dad6c33..604592cb879 100644 --- a/databases/jdbc-postgresql74/DESCR +++ b/databases/jdbc-postgresql74/DESCR @@ -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 --git a/databases/jdbc-postgresql74/Makefile b/databases/jdbc-postgresql74/Makefile index 082ee770a35..e65fd215503 100644 --- a/databases/jdbc-postgresql74/Makefile +++ b/databases/jdbc-postgresql74/Makefile @@ -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 -HOMEPAGE= http://www.postgresql.org/ -COMMENT= Pure Java JDBC driver for PostgreSQL 7.4.x +MAINTAINER= abs@NetBSD.org +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 +PGBUILD= 216 +JARDIST= pg74.${PGBUILD}.jdbc3.jar +JARFILE= postgresql74.jar +EXTRACT_ONLY= -EXTRACT_ELEMENTS= ${DISTNAME}/src/interfaces/jdbc +USE_JAVA2= 1.4 +NO_BUILD= YES -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 - ${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 +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 --git a/databases/jdbc-postgresql74/PLIST b/databases/jdbc-postgresql74/PLIST index 6964dfc5baf..4825108241f 100644 --- a/databases/jdbc-postgresql74/PLIST +++ b/databases/jdbc-postgresql74/PLIST @@ -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 --git a/databases/jdbc-postgresql74/distinfo b/databases/jdbc-postgresql74/distinfo index feb018900f2..a2cc57edece 100644 --- a/databases/jdbc-postgresql74/distinfo +++ b/databases/jdbc-postgresql74/distinfo @@ -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 --git a/databases/jdbc-postgresql74/patches/patch-aa b/databases/jdbc-postgresql74/patches/patch-aa deleted file mode 100644 index 436d5d12978..00000000000 --- a/databases/jdbc-postgresql74/patches/patch-aa +++ /dev/null @@ -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 --git a/databases/jdbc-postgresql80/Makefile b/databases/jdbc-postgresql80/Makefile index b28da1ca80a..3153366f755 100644 --- a/databases/jdbc-postgresql80/Makefile +++ b/databases/jdbc-postgresql80/Makefile @@ -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 $ # DISTNAME= postgresql-jdbc-8.0-${PGBUILD}.src PKGNAME= jdbc-postgresql80-${PGBUILD} DISTFILES+= ${DISTNAME}.tar.gz ${JARDIST} -PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= http://jdbc.postgresql.org/download/ @@ -12,7 +11,7 @@ MAINTAINER= abs@NetBSD.org HOMEPAGE= http://jdbc.postgresql.org/ COMMENT= PostgreSQL 8.0 JDBC3 driver -PGBUILD= 314 +PGBUILD= 315 JARDIST= postgresql-8.0-${PGBUILD}.jdbc3.jar JARFILE= postgresql80.jar EXTRACT_ONLY= ${DISTFILES:N*.jar} diff --git a/databases/jdbc-postgresql80/distinfo b/databases/jdbc-postgresql80/distinfo index fe949b8c43c..6e639efd917 100644 --- a/databases/jdbc-postgresql80/distinfo +++ b/databases/jdbc-postgresql80/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/01/03 17:54:09 abs Exp $ +$NetBSD: distinfo,v 1.2 2006/02/27 14:52:09 abs Exp $ -SHA1 (postgresql-jdbc-8.0-314.src.tar.gz) = e4ce68156d8068ff8b56fa19dc1c1805562dfa31 -RMD160 (postgresql-jdbc-8.0-314.src.tar.gz) = 65aee7adf433b2a48ce77c7d7af77e5ae1e3dabb -Size (postgresql-jdbc-8.0-314.src.tar.gz) = 424387 bytes -SHA1 (postgresql-8.0-314.jdbc3.jar) = 60fe595359658a9541e5d99c86ff7d8fb06bba9e -RMD160 (postgresql-8.0-314.jdbc3.jar) = 49d2112e98a3332f04c4e753aaff1bfd37515952 -Size (postgresql-8.0-314.jdbc3.jar) = 358513 bytes +SHA1 (postgresql-jdbc-8.0-315.src.tar.gz) = 9ad02cf076afb662cabd6f443076014880c0c21d +RMD160 (postgresql-jdbc-8.0-315.src.tar.gz) = 53811081e54a880e35569032d8680d0d390e945c +Size (postgresql-jdbc-8.0-315.src.tar.gz) = 424801 bytes +SHA1 (postgresql-8.0-315.jdbc3.jar) = 2036c9537164c3e4310914a1515deaee21e77238 +RMD160 (postgresql-8.0-315.jdbc3.jar) = 7bb8a166f84bb14cadc877291edbeb886cdf1968 +Size (postgresql-8.0-315.jdbc3.jar) = 358738 bytes diff --git a/databases/jdbc-postgresql81/Makefile b/databases/jdbc-postgresql81/Makefile index fa82a52b393..72feb50e8f2 100644 --- a/databases/jdbc-postgresql81/Makefile +++ b/databases/jdbc-postgresql81/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:31 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2006/02/27 14:52:09 abs Exp $ # DISTNAME= postgresql-jdbc-8.1-${PGBUILD}.src PKGNAME= jdbc-postgresql81-${PGBUILD} DISTFILES+= ${DISTNAME}.tar.gz ${JARDIST} -PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= http://jdbc.postgresql.org/download/ @@ -12,7 +11,7 @@ MAINTAINER= abs@NetBSD.org HOMEPAGE= http://jdbc.postgresql.org/ COMMENT= PostgreSQL 8.1 JDBC3 driver -PGBUILD= 404 +PGBUILD= 405 JARDIST= postgresql-8.1-${PGBUILD}.jdbc3.jar JARFILE= postgresql81.jar EXTRACT_ONLY= ${DISTFILES:N*.jar} diff --git a/databases/jdbc-postgresql81/distinfo b/databases/jdbc-postgresql81/distinfo index fc378e053be..f0395274465 100644 --- a/databases/jdbc-postgresql81/distinfo +++ b/databases/jdbc-postgresql81/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/01/04 11:54:38 abs Exp $ +$NetBSD: distinfo,v 1.2 2006/02/27 14:52:09 abs Exp $ -SHA1 (postgresql-jdbc-8.1-404.src.tar.gz) = 60872374660228966b723f03bfa2ae63bd7e2b4a -RMD160 (postgresql-jdbc-8.1-404.src.tar.gz) = 2258d2ab1d743afbfeacb60e0d53b7d58de519a7 -Size (postgresql-jdbc-8.1-404.src.tar.gz) = 474266 bytes -SHA1 (postgresql-8.1-404.jdbc3.jar) = 60d123adf4c273925566c43f5c5670ddc88428a6 -RMD160 (postgresql-8.1-404.jdbc3.jar) = eb8c2b42db11e506ac60482cf70f7ac362634710 -Size (postgresql-8.1-404.jdbc3.jar) = 401336 bytes +SHA1 (postgresql-jdbc-8.1-405.src.tar.gz) = 342266b3b252c80efaf185aca43906a8f137bcfd +RMD160 (postgresql-jdbc-8.1-405.src.tar.gz) = 89b8f82154178c2fa9f4859ba4837192527ab494 +Size (postgresql-jdbc-8.1-405.src.tar.gz) = 478428 bytes +SHA1 (postgresql-8.1-405.jdbc3.jar) = 8d643d7e51d5b5d66ea8a215189312efe69934ef +RMD160 (postgresql-8.1-405.jdbc3.jar) = 78e74a46f66fdde82c34977f32c170766a5c2da5 +Size (postgresql-8.1-405.jdbc3.jar) = 402505 bytes -- cgit v1.2.3