Update JDBC support to version 8.0 (build 310).

The PostgreSQL JDBC project has been decoupled from the server
distribution, and is now hosted at http://jdbc.postgresql.org/.

Approved by:	ade (mentor)

7 files changed, 74 insertions, 57 deletions

diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index d825fca4e3d7..264fed1b9eb2 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -6,42 +6,47 @@
 #
 
 PORTNAME=	postgresql
+PORTVERSION=	8.0.310
+DISTVERSIONSUFFIX=.src
 PORTREVISION=	0
 CATEGORIES=	databases java
+MASTER_SITES=	http://jdbc.postgresql.org/download/
 PKGNAMESUFFIX=	-jdbc
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION:C/.([0-9][0-9][0-9]*)/-\1/g}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	The Java JDBC implementation for PostgreSQL
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
-
-MASTERDIR=	${.CURDIR}/../../databases/postgresql74-server
-
-CONFLICTS=	${PORTNAME}${PKGNAMESUFFIX}-7.[0-3]* \
-		${PORTNAME}${PKGNAMESUFFIX}-[1-689]*
-
-CONFIGURE_ARGS=	--with-java
+DIST_SUBDIR=	postgresql
 
+USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION?=	"1.1+"
+USE_REINPLACE=	yes
 
-CONFIGURE_ENV=	JAVA_HOME="${JAVA_HOME}"
-MAKE_ENV+=	JAVA_HOME="${JAVA_HOME}"
-BUILD_DIRS=	src/interfaces/jdbc
-SLAVE_ONLY=	yes
+PKGMESSAGE=	${WRKDIR}/.pkg-message
 
-post-install:
-	@- ${MKDIR} -m 0555 ${PREFIX}/share/java/classes ;\
-	  ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/jars/postgresql.jar \
-			  ${PREFIX}/share/java/classes/postgresql.jar
+post-patch:
+	${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${PREFIX}/share/java/classes,' ${WRKSRC}/README
+
+do-install:
+	@- ${MKDIR} -m 0755 ${PREFIX}/share/java/classes ;\
+	  ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar \
+		${PREFIX}/share/java/classes/postgresql.jar ;\
+	  ${MKDIR} -m 0755 ${DOCSDIR} ;\
+	  ${INSTALL_DATA} ${WRKSRC}/README \
+			  ${DOCSDIR}/README-jdbc
 .if !defined(NOPORTDOCS)
-	@- ${MKDIR} -m 0555 ${EXAMPLESDIR} ;\
-	  cd ${WRKSRC}/src/interfaces/jdbc/example ;\
-	  ${PAX} -rw . ${EXAMPLESDIR}
-.for i in README
-	@- ${INSTALL_DATA} ${WRKSRC}/src/interfaces/jdbc/$i \
-			  ${EXAMPLESDIR}
-.endfor
+	@- ${MKDIR} -m 0755 ${EXAMPLESDIR}/jdbc ;\
+	  ${INSTALL_DATA} ${WRKSRC}/jars/postgresql-examples.jar \
+			  ${EXAMPLESDIR}/jdbc/postgresql-examples.jar ;\
+	  cd ${WRKSRC}/example ;\
+	  ${PAX} -rw . ${EXAMPLESDIR}/jdbc
 .endif
 
-.include "${MASTERDIR}/Makefile"
+post-install:
+	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
+	  < ${PKGDIR}/pkg-message > ${PKGMESSAGE}
+	@ ${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/databases/postgresql-jdbc/distinfo b/databases/postgresql-jdbc/distinfo
new file mode 100644
index 000000000000..9165aa2fdf67
--- /dev/null
+++ b/databases/postgresql-jdbc/distinfo
@@ -0,0 +1,2 @@
+MD5 (postgresql/postgresql-jdbc-8.0-310.src.tar.gz) = 036e05ac278109b56bed125ebfd9c159
+SIZE (postgresql/postgresql-jdbc-8.0-310.src.tar.gz) = 387635
diff --git a/databases/postgresql-jdbc/files/patch-build-xml b/databases/postgresql-jdbc/files/patch-build-xml
new file mode 100644
index 000000000000..19b135090bd7
--- /dev/null
+++ b/databases/postgresql-jdbc/files/patch-build-xml
@@ -0,0 +1,14 @@
+--- build.xml.orig	Tue Feb  1 08:27:53 2005
++++ build.xml	Fri Feb 11 00:33:41 2005
+@@ -105,10 +105,7 @@
+ 
+   <target name="compile" depends="prepare,check_versions,driver">
+ 
+-    <available classname="org.postgresql.Driver" property="old.driver.present" />
+-    <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
+-
+-    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
++    <javac includeAntRuntime="no" classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
+       <!-- This is the core of the driver.  It is common for all versions. -->
+        <include name="${package}/*.java" />
+        <include name="${package}/core/**" />
diff --git a/databases/postgresql-jdbc/pkg-descr b/databases/postgresql-jdbc/pkg-descr
index 69d500395c46..1060c1d54b24 100644
--- a/databases/postgresql-jdbc/pkg-descr
+++ b/databases/postgresql-jdbc/pkg-descr
@@ -1,6 +1,4 @@
-This is the implementation of JDBC, the Java Database Connectivity API,
-for accessing PostgreSQL databases from Java.
+This is the official implementation of JDBC, the Java Database
+Connectivity API, for accessing PostgreSQL databases from Java.
 
-This software is part of the standard PostgreSQL distribution.
-
-WWW: http://www.postgresql.org/
+WWW: http://jdbc.postgresql.org/
diff --git a/databases/postgresql74-server/pkg-message-jdbc b/databases/postgresql-jdbc/pkg-message
index d00982c26c05..fc42b83d60ad 100644
--- a/databases/postgresql74-server/pkg-message-jdbc
+++ b/databases/postgresql-jdbc/pkg-message
@@ -1,8 +1,8 @@
 PostgreSQL JDBC support installed!
 
 postgresql.jar resides in
-/usr/local/share/java/classes/postgresql.jar
+%%PREFIX%%/share/java/classes/postgresql.jar
 Add this to your CLASSPATH!
 
 java examples reside in
-/usr/local/share/examples/postgresql
+%%PREFIX%%/share/examples/postgresql/jdbc
diff --git a/databases/postgresql-jdbc/pkg-plist b/databases/postgresql-jdbc/pkg-plist
new file mode 100644
index 000000000000..74d577eef8f3
--- /dev/null
+++ b/databases/postgresql-jdbc/pkg-plist
@@ -0,0 +1,24 @@
+%%DOCSDIR%%/README-jdbc
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/ImageViewer.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/Unicode.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/basic.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/blobtest.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/corba/StockClient.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/corba/StockDB.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/corba/StockDispenserImpl.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/corba/StockItemImpl.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/corba/StockServer.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/corba/readme
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/corba/stock.idl
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/corba/stock.sql
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/datestyle.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/metadata.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/postgresql-examples.jar
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/psql.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/threadsafe.java
+share/java/classes/postgresql.jar
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/jdbc/corba
+%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%%/jdbc 2>/dev/null || true
+%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
+%%PORTDOCS%%@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
diff --git a/databases/postgresql74-server/pkg-plist-jdbc b/databases/postgresql74-server/pkg-plist-jdbc
deleted file mode 100644
index 1eb2342375a6..000000000000
--- a/databases/postgresql74-server/pkg-plist-jdbc
+++ /dev/null
@@ -1,26 +0,0 @@
-%%DOCSDIR%%/README-jdbc
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/Unicode.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/basic.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/blobtest.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockClient.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDB.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockDispenserImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockItemImpl.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/StockServer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/readme
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/corba/stock.sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/datestyle.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/metadata.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/psql.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/threadsafe.java
-share/java/classes/postgresql.jar
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/corba
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
-share/postgresql/java/postgresql-examples.jar
-share/postgresql/java/postgresql.jar
-@dirrm share/postgresql/java
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true