- Update to 1.0.0r3 [1]

- Update to bsd.java.mk 2.0
- Use JAVALIBDIR in BUILD_DEPENDS
- Use %%JAVAJARDIR%% in pkg-plist

PR:		79527
Submitted by:	maintainer [1]
Approved by:	maintainer

4 files changed, 23 insertions, 64 deletions

diff --git a/databases/postgis-jdbc/Makefile b/databases/postgis-jdbc/Makefile
index 75322db0ba06..e470ea6db95e 100644
--- a/databases/postgis-jdbc/Makefile
+++ b/databases/postgis-jdbc/Makefile
@@ -6,28 +6,34 @@
 #
 
 PORTNAME=	postgis-jdbc
-PORTVERSION=	0.8.2
+PORTVERSION=	1.0.0r3
 CATEGORIES=	databases java
 MASTER_SITES=	http://postgis.refractions.net/
-DISTNAME=	postgis-${PORTVERSION}
+DISTNAME=	postgis-1.0.0-rc3
 
 MAINTAINER=	boris@brooknet.com.au
 COMMENT=	PostGIS spatial data structures for JDBC
 
-BUILD_DEPENDS=	${JAVAJARDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
+BUILD_DEPENDS=	${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
 
-BROKEN=		Does not build
-
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
+USE_GMAKE=	yes
 MAKE_ARGS=	EXAMPLESDIR="${EXAMPLESDIR}" \
-		DESTDIR="${PREFIX}" \
+		DESTDIR="${JAVAJARDIR}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
-		JAVAJARDIR="${JAVAJARDIR}" \
 		JAVAC="${JAVAC}" \
 		JAVA="${JAVA}" \
-		JAR="${JAR}"
+		JAR="${JAR}" \
+		CLASSPATH="${JAVALIBDIR}/postgresql.jar" \
+		mkinstalldirs="${MKDIR}"
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/jdbc2
 
-WRKSRC=		${WRKDIR}/postgis-${PORTVERSION}/jdbc
+do-install:
+		${INSTALL_DATA} ${WRKSRC}/postgis.jar ${JAVAJARDIR}
+		${MKDIR} ${EXAMPLESDIR}
+		${INSTALL_DATA} ${WRKSRC}/src/examples/* ${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/databases/postgis-jdbc/distinfo b/databases/postgis-jdbc/distinfo
index 77425a69e556..38e18837bdd7 100644
--- a/databases/postgis-jdbc/distinfo
+++ b/databases/postgis-jdbc/distinfo
@@ -1,2 +1,2 @@
-MD5 (postgis-0.8.2.tar.gz) = 0a2ed054e7a1ad74153eb844d1b56046
-SIZE (postgis-0.8.2.tar.gz) = 1875280
+MD5 (postgis-1.0.0-rc3.tar.gz) = 46091f2a9b8a32a23c5970e58d5f20bf
+SIZE (postgis-1.0.0-rc3.tar.gz) = 1358189
diff --git a/databases/postgis-jdbc/files/patch-Makefile b/databases/postgis-jdbc/files/patch-Makefile
deleted file mode 100644
index d657301bc048..000000000000
--- a/databases/postgis-jdbc/files/patch-Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN ../jdbc.orig/Makefile ./Makefile
---- ../jdbc.orig/Makefile	Fri Jun 25 18:11:45 2004
-+++ ./Makefile	Fri Jun 25 18:12:52 2004
-@@ -1,15 +1,21 @@
- JAVAC = javac
- JAVA = java
- JAR = jar
--CLASSPATH = ../../../src/interfaces/jdbc/jars/postgresql.jar:.
-+CLASSPATH = $(JAVAJARDIR)/postgresql.jar:.
- 
- all: 	ogis \
- 	pgobjs \
--	test
-+	test \
-+	jar
- 
- jar:
- 	$(JAR) -cf postgis.jar org/postgis/*.java org/postgis/*.class README	
- 
-+install:
-+	$(INSTALL_DATA) postgis.jar $(JAVAJARDIR)
-+	[ -d $(EXAMPLESDIR) ] || mkdir $(EXAMPLESDIR) || exit -1
-+	$(INSTALL_DATA) examples/Test.java examples/TestServer.java $(EXAMPLESDIR)
-+
- ogis: 
- 	$(JAVAC) -classpath $(CLASSPATH) \
- 		org/postgis/Geometry.java \
-@@ -20,19 +26,21 @@
- 		org/postgis/LinearRing.java \
- 		org/postgis/Polygon.java \
- 		org/postgis/MultiPolygon.java
-+	touch ogis
- 
- 
- pgobjs:
- 	$(JAVAC) -classpath $(CLASSPATH) \
- 		org/postgis/PGgeometry.java \
- 		org/postgis/PGbox3d.java
-+	touch pgobjs
- 
- test:
- 	$(JAVAC) -classpath $(CLASSPATH) examples/Test.java
- 	$(JAVA) -classpath $(CLASSPATH) examples/Test
--	
-+	touch test
- 
- jtest:
- 	$(JAVAC) -classpath $(CLASSPATH) examples/TestServer.java
- 	$(JAVA) -classpath $(CLASSPATH) examples/TestServer
--
-+	touch jtest
diff --git a/databases/postgis-jdbc/pkg-plist b/databases/postgis-jdbc/pkg-plist
index 24e89d6002e4..f55d5e7f2014 100644
--- a/databases/postgis-jdbc/pkg-plist
+++ b/databases/postgis-jdbc/pkg-plist
@@ -1,4 +1,8 @@
-share/java/classes/postgis.jar
+%%JAVAJARDIR%%/postgis.jar
 %%EXAMPLESDIR%%/Test.java
+%%EXAMPLESDIR%%/TestAutoregister.java
+%%EXAMPLESDIR%%/TestBoxes.java
+%%EXAMPLESDIR%%/TestParser.java
 %%EXAMPLESDIR%%/TestServer.java
+%%EXAMPLESDIR%%/VersionPrinter.java
 @dirrm %%EXAMPLESDIR%%