5 files changed, 79 insertions, 34 deletions
diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile
index 4e51aa6bb24..3f4ad8872c5 100644
--- a/databases/jdbc-postgresql/Makefile
+++ b/databases/jdbc-postgresql/Makefile
@@ -1,17 +1,22 @@
-# $NetBSD: Makefile,v 1.16 2002/12/31 15:44:28 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/02 18:46:39 jlam Exp $
 #
 
-DISTNAME=		postgresql-${VERSION}
+DISTNAME=		postgresql-${DIST_VERS}
 PKGNAME=		jdbc-${DISTNAME}
 WRKSRC=			${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
 CATEGORIES=		databases
-MASTER_SITES=		ftp://ftp.PostgreSQL.org/pub/ \
-			ftp://ftp.sunsite.auc.dk/mirrors/www.postgresql.org/pub/ \
-			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/
-
-VERSION=		7.2.2
+MASTER_SITES?=		http://www.postgresql.org/ftpsite/source/v${DIST_VERS}/ \
+			ftp://ftp.postgresql.org/pub/source/v${DIST_VERS}/ \
+			ftp://ftp.de.postgresql.org/pub/source/v${DIST_VERS}/ \
+			ftp://ch.postgresql.org/mirror/postgresql/source/v${DIST_VERS}/ \
+			ftp://gd.tuwien.ac.at/db/www.postgresql.org/pub/source/v${DIST_VERS}/ \
+			ftp://looking-glass.usask.ca/pub/postgresql/source/v${DIST_VERS}/ \
+			ftp://ftp.sunsite.auc.dk/mirrors/postgresql/source/v${DIST_VERS}/ \
+			ftp://ftp.jaist.ac.jp/pub/dbms/postgres95/source/v${DIST_VERS}/
+
+DIST_VERS=		7.3.1
 MAINTAINER=		jwise@netbsd.org
-HOMEPAGE=		http://www.PostgreSQL.ORG/
+HOMEPAGE=		http://www.postgresql.org/
 COMMENT=		100% Java JDBC driver for PostgreSQL
 
 # No, we don't depend on postgresql.  This code base stands alone.
@@ -19,29 +24,26 @@ BUILD_DEPENDS+=		jakarta-ant-[0-9]*:../../devel/jakarta-ant
 
 EXTRACT_ELEMENTS=	${DISTNAME}/src/interfaces/jdbc
 
-.include "../../mk/bsd.prefs.mk"
-
-USE_GMAKE=
-NO_CONFIGURE=
+USE_GMAKE=		YES
 
-HELP_FILES=		README Implementation CHANGELOG
+EXAMPLEDIR=		${PREFIX}/share/examples/java/jdbc-postgresql
+DOCDIR=			${PREFIX}/share/doc/java/jdbc-postgresql
 
-pre-build:
-	${ECHO} "VERSION=${VERSION}" > ${WRKSRC}/../../../src/Makefile.global
-	${ECHO} "ANT=${LOCALBASE}/bin/ant" >> ${WRKSRC}/../../../src/Makefile.global
-	${ECHO} "srcdir=." >> ${WRKSRC}/../../../src/Makefile.global
-	${ECHO} "DEF_PGPORT=5432" >> ${WRKSRC}/../../../src/Makefile.global
+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} ${PREFIX}/share/examples/java/jdbc-postgresql
-	${INSTALL_DATA} ${WRKSRC}/example/*.java ${PREFIX}/share/examples/java/jdbc-postgresql
-	${INSTALL_DATA} ${WRKSRC}/jars/postgresql-examples.jar ${PREFIX}/share/examples/java/jdbc-postgresql
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jdbc-postgresql
-.for X in ${HELP_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${X} ${PREFIX}/share/doc/java/jdbc-postgresql
-.endfor
+	${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
index 918eaa8c773..0a9c6580319 100644
--- a/databases/jdbc-postgresql/PLIST
+++ b/databases/jdbc-postgresql/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/19 17:59:18 jwise Exp $
+@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
@@ -9,8 +9,6 @@ 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/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/
+@dirrm share/examples/java/jdbc-postgresql
+@dirrm share/doc/java/jdbc-postgresql
diff --git a/databases/jdbc-postgresql/distinfo b/databases/jdbc-postgresql/distinfo
index d05488afd86..ef989b2af86 100644
--- a/databases/jdbc-postgresql/distinfo
+++ b/databases/jdbc-postgresql/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.7 2002/09/26 10:07:15 abs Exp $
+$NetBSD: distinfo,v 1.8 2003/01/02 18:46:40 jlam Exp $
 
-SHA1 (postgresql-7.2.2.tar.gz) = 69ef43ef5d22d4ae675ff12e05d98e2be557e3f5
-Size (postgresql-7.2.2.tar.gz) = 9239158 bytes
+SHA1 (postgresql-7.3.1.tar.gz) = 428757df30ab4acad3c87254d4c75140f0a3406d
+Size (postgresql-7.3.1.tar.gz) = 11171551 bytes
+SHA1 (patch-aa) = 4740338ad87748c6619eb674808c11e1b57826af
diff --git a/databases/jdbc-postgresql/patches/patch-aa b/databases/jdbc-postgresql/patches/patch-aa
new file mode 100644
index 00000000000..4e29bf81015
--- /dev/null
+++ b/databases/jdbc-postgresql/patches/patch-aa
@@ -0,0 +1,43 @@
+$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 --git a/doc/CHANGES b/doc/CHANGES
index 1bee9a7f4e0..981aea02000 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.977 2003/01/02 17:22:33 grant Exp $
+$NetBSD: CHANGES,v 1.978 2003/01/02 18:47:19 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -38,3 +38,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Added p5-Test-Inline-0.15 [mjl 2002-01-02]
 	Updated p5-DBIx-SearchBuilder to 0.76 [mjl 2002-01-02]
 	Updated docbook-xsl to 1.58.1nb1 [grant 2002-01-02]
+	Updated jdbc-postgresql to 7.3.1 [jlam 2002-01-02]