Update to the version of the PostgreSQL JDBC support which comes with

postgresql-7.1.2.

Most visible changes are that the authors now use jakarta-ant to build
this package, and that the authors have removed support for building
javadoc documentation for this package.  This latter is rather unfortunate,
and may need to be addressed within the package.

Also, at some point this week, I will try to rework this package to use
the postgresql Makefile.common, as the original package now fits a little
more closely into the postgresql build hierarchy.

This package also adds one to the number of jakarta-ant using packages in
pkgsrc.  At some point soonish I will code up a USE_ANT flag in bsd.pkg.mk
to cut out the duplication of effort...

Other changes include:


Tue Mar 06 12:05:00 GMT 2001 peter@retep.org.uk
        - Removed org.postgresql.xa.Test from the JDBC EE driver as it's an old
          test class and prevented it from compiling.

Fri Mar 02 10:00:00 GMT 2001 peter@retep.org.uk
        - Fixed build.xml so that PGclob is not built in the JDBC1.2 driver


Fri Feb 17 18:25:00 GMT 2001 peter@retep.org.uk
        - Removed the last deprecation warnings from the Java2 driver. Now only
          the old examples give deprecation warnings.
        - Added a new class into core that (JDK1.3+) ensures all connections are
          closed when the VM terminates.

Fri Feb 17 15:11:00 GMT 2001 peter@retep.org.uk
        - Reduced the object overhead in PreparedStatement by reusing the same
          StringBuffer object throughout. Similarly SimpleDateStamp's are alse
          reused in a thread save manner.
        - Implemented in PreparedStatement: setNull(), setDate/Time/Timestamp
          using Calendar, setBlob(), setCharacterStream()
        - Clob's are now implemented in ResultSet & PreparedStatement!
        - Implemented a lot of DatabaseMetaData & ResultSetMetaData methods.
          We have about 18 unimplemented methods left in JDBC2 at the current
          time.

Web Feb 14 17:29:00 GMT 2001 peter@retep.org.uk
        - Fixed bug in LargeObject & BlobOutputStream where the stream's output
          was not flushed when either the stream or the blob were closed.
        - Fixed PreparedStatement.setBinaryStream() where it ignored the length

Tue Feb 13 16:33:00 GMT 2001 peter@retep.org.uk
        - More TestCases implemented. Refined the test suite api's.
        - Removed need for SimpleDateFormat in ResultSet.getDate() improving
          performance.
        - Rewrote ResultSet.getTime() so that it uses JDK api's better.

Tue Feb 13 10:25:00 GMT 2001 peter@retep.org.uk
        - Added MiscTest to hold reported problems from users.
        - Fixed PGMoney.
        - JBuilder4/JDBCExplorer now works with Money fields. Patched Field &
          ResultSet (lots of methods) for this one. Also changed cash/money to
          return type DOUBLE not DECIMAL. This broke JBuilder as zero scale
          BigDecimal's can't have decimal places!
        - When a Statement is reused, the previous ResultSet is now closed.
        - Removed deprecated call in ResultSet.getTime()

Thu Feb 08 18:53:00 GMT 2001 peter@retep.org.uk
        - Changed a couple of settings in DatabaseMetaData where 7.1 now
          supports those features
        - Implemented the DatabaseMetaData TestCase.

Wed Feb 07 18:06:00 GMT 2001 peter@retep.org.uk
        - Added comment to Connection.isClosed() explaining why we deviate from
          the JDBC2 specification.
        - Fixed bug where the Isolation Level is lost while in autocommit mode.
        - Fixed bug where several calls to getTransactionIsolationLevel()
          returned the first call's result.

Tue Feb 06 19:00:00 GMT 2001 peter@retep.org.uk
        - Completed first two TestCase's for the test suite. JUnit is now
          recognised by ant.

Wed Jan 31 08:46:00 GMT 2001 peter@retep.org.uk
        - Some minor additions to Statement to make our own extensions more
          portable.
        - Statement.close() will now call ResultSet.close() rather than just
          dissasociating with it.

Tue Jan 30 22:24:00 GMT 2001 peter@retep.org.uk
        - Fixed bug where Statement.setMaxRows() was a global setting. Now
          limited to just itself.
        - Changed LargeObject.read(byte[],int,int) to return the actual number
          of bytes read (used to be void).
        - LargeObject now supports InputStream's!
        - PreparedStatement.setBinaryStream() now works!
        - ResultSet.getBinaryStream() now returns an InputStream that doesn't
          copy the blob into memory first!
        - Connection.isClosed() now tests to see if the connection is still alive
          rather than if it thinks it's alive.
Thu Jan 25 09:11:00 GMT 2001 peter@retep.org.uk
        - Added an alternative constructor to PGSQLException so that debugging
          some more osteric bugs is easier. If only 1 arg is supplied and it's
          of type Exception, then that Exception's stacktrace is now included.

Wed Jan 24 09:18:00 GMT 2001 peter@retep.org.uk
	- Removed the 8k limit by setting it to 64k

Fri Jan 19 08:47:00 GMT 2001 peter@retep.org.uk
        - Applied patch submitted by John Schutz <schutz@austin.rr.com> that
          fixed a bug with ANT's SQL functions (not needed for building but nice
          to have fixed).

Thu Jan 18 17:30:00 GMT 2001 peter@retep.org.uk
        - Added new error message into errors.properties "postgresql.notsensitive"
          This is used by jdbc2.ResultSet when a method is called that should
          fetch the current value of a row from the database refreshRow() for
          example.
        - These methods no longer throw the not implemented but the new noupdate
          error. This is in preparation for the Updateable ResultSet support
          which will overide these methods by extending the existing class to
          implement that functionality, but needed to show something other than
          notimplemented:
            moveToCurrentRow()
            moveToInsertRow()
            rowDeleted()
            rowInserted()
            all update*() methods, except those that took the column as a String
            as they were already implemented to convert the String to an int.
        - getFetchDirection() and setFetchDirection() now throws
          "postgresql.notimp" as we only support one direction.
          The CursorResultSet will overide this when its implemented.
        - Created a new class under jdbc2 UpdateableResultSet which extends
          ResultSet and overides the relevent update methods.
          This allows us to implement them easily at a later date.
        - In jdbc2.Connection, the following methods are now implemented:
            createStatement(type,concurrency);
            getTypeMap();
            setTypeMap(Map);
        - The JDBC2 type mapping scheme almost complete, just needs SQLInput &
          SQLOutput to be implemented.
        - Removed some Statement methods that somehow appeared in Connection.
        - In jdbc2.Statement()
            getResultSetConcurrency()
            getResultSetType()
            setResultSetConcurrency()
            setResultSetType()
        - Finally removed the old 6.5.x driver.

Thu Jan 18 12:24:00 GMT 2001 peter@retep.org.uk
        - These methods in org.postgresql.jdbc2.ResultSet are now implemented:
            getBigDecimal(int) ie: without a scale (why did this get missed?)
            getBlob(int)
            getCharacterStream(int)
            getConcurrency()
            getDate(int,Calendar)
            getFetchDirection()
            getFetchSize()
            getTime(int,Calendar)
            getTimestamp(int,Calendar)
            getType()
          NB: Where int represents the column name, the associated version
              taking a String were already implemented by calling the int
              version.
        - These methods no longer throw the not implemented but the new noupdate
          error. This is in preparation for the Updateable ResultSet support
          which will overide these methods by extending the existing class to
          implement that functionality, but needed to show something other than
          notimplemented:
            cancelRowUpdates()
            deleteRow()
        - Added new error message into errors.properties "postgresql.noupdate"
          This is used by jdbc2.ResultSet when an update method is called and
          the ResultSet is not updateable. A new method notUpdateable() has been
          added to that class to throw this exception, keeping the binary size
          down.
        - Added new error message into errors.properties "postgresql.psqlnotimp"
          This is used instead of unimplemented when it's a feature in the
          backend that is preventing this method from being implemented.
        - Removed getKeysetSize() as its not part of the ResultSet API

Thu Jan 18 09:46:00 GMT 2001 peter@retep.org.uk
        - Applied modified patch from Richard Bullington-McGuire
          <rbulling@microstate.com>. I had to modify it as some of the code
          patched now exists in different classes, and some of it actually
          patched obsolete code.

Wed Jan 17 10:19:00 GMT 2001 peter@retep.org.uk
        - Updated Implementation to include both ANT & JBuilder
        - Updated README to reflect the changes since 7.0
	- Created jdbc.jpr file which allows JBuilder to be used to edit the
          source. JBuilder _CAN_NOT_ be used to compile. You must use ANT for
          that. It's only to allow JBuilders syntax checking to improve the
          drivers source. Refer to Implementation for more details

Wed Dec 20 16:19:00 GMT 2000 peter@retep.org.uk
	- Finished build.xml and updated Driver.java.in and buildDriver to
	  match how Makefile and ANT operate.

Tue Dec 19 17:30:00 GMT 2000 peter@retep.org.uk
	- Finally created ant build.xml file

Mon Nov 20 08:12:00 GMT 2000 peter@retep.org.uk
	- Encoding patch to Connection by wrobell@posexperts.com.pl

Tue Oct 17 15:35:00 BST 2000 petermount@maidstone.gov.uk
	- Changed getTimestamp() again. This time Michael Stephenson's
	  <mstephenson@tirin.openworld.co.uk> solution looked far better
	  than the original solution put in June.

Tue Oct 10 13:12:00 BST 2000 peter@retep.org.uk
	- DatabaseMetaData.supportsAlterTableWithDropColumn() as psql doesn't
	  support dropping of individual columns
	- Merged in some last patches. Only 1 left, which may not be compatible
	  with jdbc1
	- Merged in my old retepsql project. Makefile now includes it.

Mon Oct 02 12:30:00 BST 2000 peter@retep.org.uk
	- Merged in byte[] array allocation changes submitted by Gunnar R|nning
	  <gunnar@candleweb.no>

Mon Sep 25 14:22:00 BST 2000 peter@retep.org.uk
	- Removed the DriverClass kludge. Now the org.postgresql.Driver class
	  is compiled from a template file, and now has both the connection
	  class (ie jdbc1/jdbc2) and the current version's from Makefile.global

Thu Jul 20 16:30:00 BST 2000 petermount@it.maidstone.gov.uk
	- Fixed DatabaseMetaData.getTableTypes()

5 files changed, 30 insertions, 52 deletions

diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile
index 628d7144eff..c1182afa37b 100644
--- a/databases/jdbc-postgresql/Makefile
+++ b/databases/jdbc-postgresql/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2001/04/21 13:42:38 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/09 23:35:39 jwise Exp $
 #
 
-DISTNAME=		postgresql-7.0.3
+DISTNAME=		postgresql-7.1.2
 PKGNAME=		jdbc-${DISTNAME}
 WRKSRC=			${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
 CATEGORIES=		databases
@@ -14,6 +14,7 @@ HOMEPAGE=		http://www.PostgreSQL.ORG/
 COMMENT=		100% Java JDBC driver for PostgreSQL
 
 # No, we don't depend on postgresql.  This code base stands alone.
+DEPENDS+=		jakarta-ant-*:../../devel/jakarta-ant
 
 EXTRACT_ELEMENTS=	${DISTNAME}/src/interfaces/jdbc
 
@@ -22,14 +23,18 @@ EXTRACT_ELEMENTS=	${DISTNAME}/src/interfaces/jdbc
 USE_GMAKE=
 USE_JAVA=
 NO_CONFIGURE=
-ALL_TARGET=		jdbc1 doc
 CLASSPATH:=		${CLASSPATH}:.
 
-HELP_FILES=		README README_6.3 Implementation CHANGELOG
+HELP_FILES=		README Implementation CHANGELOG
+
+pre-build:
+	${ECHO} "VERSION=7.1.2" > ${WRKSRC}/../../../src/Makefile.global
+	${ECHO} "ANT=${LOCALBASE}/bin/ant" >> ${WRKSRC}/../../../src/Makefile.global
+	${ECHO} "top_srcdir=." >> ${WRKSRC}/../../../src/Makefile.global
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-	${INSTALL_DATA} ${WRKSRC}/postgresql.jar ${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/jdbc-postgresql
 	${INSTALL_DATA} ${WRKSRC}/example/*.java ${PREFIX}/share/examples/java/jdbc-postgresql
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jdbc-postgresql
@@ -37,6 +42,5 @@ do-install:
 .for X in ${HELP_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${X} ${PREFIX}/share/doc/java/jdbc-postgresql
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/java/jdbc-postgresql/api
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/jdbc-postgresql/distinfo b/databases/jdbc-postgresql/distinfo
index 662b24628f2..ec5e22a84b1 100644
--- a/databases/jdbc-postgresql/distinfo
+++ b/databases/jdbc-postgresql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:10:58 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/09/09 23:35:39 jwise Exp $
 
-SHA1 (postgresql-7.0.3.tar.gz) = df653a2c1972e0908ea7c176a9c55131739ac6da
-Size (postgresql-7.0.3.tar.gz) = 7222232 bytes
-SHA1 (patch-aa) = 84cd2e3ef3b9aa6b65c8cf21891b372cfc473821
+SHA1 (postgresql-7.1.2.tar.gz) = d428b911b97fce1aea43f7322cc8c081322d258c
+Size (postgresql-7.1.2.tar.gz) = 8117016 bytes
+SHA1 (patch-aa) = 2052c2952199b2d324a42400dc51c1ae2ccdc292
diff --git a/databases/jdbc-postgresql/patches/patch-aa b/databases/jdbc-postgresql/patches/patch-aa
index 4fea51573e5..276cc4bc69f 100644
--- a/databases/jdbc-postgresql/patches/patch-aa
+++ b/databases/jdbc-postgresql/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2000/07/14 17:25:55 jwise Exp $
---- Makefile.orig	Wed Jun  7 10:31:07 2000
-+++ Makefile	Wed Jun  7 10:33:52 2000
-@@ -83,8 +83,7 @@
+--- build.xml.orig	Sat Sep  8 19:53:58 2001
++++ build.xml	Sat Sep  8 19:54:45 2001
+@@ -134,9 +134,8 @@
+   </target>
  
- # This rule builds the javadoc documentation
- doc:
--	export CLASSPATH=.;\
--		$(JAVADOC) -public \
-+		-$(JAVADOC) -public \
- 			org.postgresql \
- 			org.postgresql.fastpath \
- 			org.postgresql.largeobject
+   <!-- This builds the jar file containing the driver -->
+-  <target name="jar" depends="compile,examples">
++  <target name="jar" depends="compile">
+     <jar jarfile="${jars}/postgresql.jar" basedir="${dest}" includes="${package}/**" excludes="${package}/test/**"/>
+-    <jar jarfile="${jars}/postgresql-examples.jar" basedir="${dest}" includes="example/**" />
+   </target>
+ 
+   <!--
diff --git a/databases/jdbc-postgresql/pkg/MESSAGE b/databases/jdbc-postgresql/pkg/MESSAGE
deleted file mode 100644
index 8a7358281dc..00000000000
--- a/databases/jdbc-postgresql/pkg/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/02/06 14:24:05 wiz Exp $
-
-  Please note that in this release of the JDBC drivers for PostgreSQL
-  the class names have changed from postgresql.* to org.postgresql.*
-  and update your code accordingly.
-
-========================================================================
diff --git a/databases/jdbc-postgresql/pkg/PLIST b/databases/jdbc-postgresql/pkg/PLIST
index d0076a744fc..a23afbf055c 100644
--- a/databases/jdbc-postgresql/pkg/PLIST
+++ b/databases/jdbc-postgresql/pkg/PLIST
@@ -1,33 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2000/07/14 17:25:55 jwise Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/09/09 23:35:40 jwise Exp $
 lib/java/postgresql.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/api/AllNames.html
-share/doc/java/jdbc-postgresql/api/Package-org.postgresql.fastpath.html
-share/doc/java/jdbc-postgresql/api/Package-org.postgresql.html
-share/doc/java/jdbc-postgresql/api/Package-org.postgresql.largeobject.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.Connection.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.Driver.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.DriverClass.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.Field.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.PG_Stream.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.ResultSet.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.fastpath.Fastpath.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.fastpath.FastpathArg.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.largeobject.LargeObject.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.largeobject.LargeObjectManager.html
-share/doc/java/jdbc-postgresql/api/org.postgresql.largeobject.PGblob.html
-share/doc/java/jdbc-postgresql/api/packages.html
-share/doc/java/jdbc-postgresql/api/tree.html
-share/doc/java/jdbc-postgresql/README
-share/doc/java/jdbc-postgresql/README_6.3
-share/doc/java/jdbc-postgresql/Implementation
 share/doc/java/jdbc-postgresql/CHANGELOG
+share/doc/java/jdbc-postgresql/Implementation
+share/doc/java/jdbc-postgresql/README
 @dirrm share/examples/java/jdbc-postgresql/
-@dirrm share/doc/java/jdbc-postgresql/api
 @dirrm share/doc/java/jdbc-postgresql/