summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/jdbc-postgresql/Makefile16
-rw-r--r--databases/jdbc-postgresql/distinfo8
-rw-r--r--databases/jdbc-postgresql/patches/patch-aa24
-rw-r--r--databases/jdbc-postgresql/pkg/MESSAGE8
-rw-r--r--databases/jdbc-postgresql/pkg/PLIST26
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/