ports/79527: [maintainer] databases/postgis-jdbc: unbreak and update to 1.0.0r3

[Sam Lawrance]

>Number:         79527
>Category:       ports
>Synopsis:       [maintainer] databases/postgis-jdbc: unbreak and update to 1.0.0r3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 04 13:40:06 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sam Lawrance
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD dirk.no.domain 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #11: Sun Mar  6 12:44:50 EST
>Description:
- Update to 1.0.0r3 (same as postgis version in ports)

Other minor changes
- REMOVE files/patch-Makefile
- Add do-install target to help keep things simple

>How-To-Repeat:
>Fix:

--- postgis-jdbc-1.0.0r3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/databases/postgis-jdbc/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	26 Mar 2005 21:15:56 -0000	1.3
+++ Makefile	4 Apr 2005 13:28:37 -0000
@@ -6,28 +6,33 @@
 #
 
 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 at brooknet.com.au
 COMMENT=	PostGIS spatial data structures for JDBC
 
 BUILD_DEPENDS=	${JAVAJARDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc
 
-BROKEN=		Does not build
-
 USE_JAVA=	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}"
-
-WRKSRC=		${WRKDIR}/postgis-${PORTVERSION}/jdbc
+		JAR="${JAR}" \
+		CLASSPATH="${JAVALIBDIR}/postgresql.jar" \
+		mkinstalldirs="${MKDIR}"
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/jdbc2
+
+do-install:
+		${INSTALL_DATA} ${WRKSRC}/postgis.jar ${JAVAJARDIR}
+		${MKDIR} ${EXAMPLESDIR}
+		${INSTALL_DATA} ${WRKSRC}/src/examples/* ${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/databases/postgis-jdbc/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	30 Jun 2004 03:51:47 -0000	1.1
+++ distinfo	4 Apr 2005 12:09:20 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/databases/postgis-jdbc/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	30 Jun 2004 03:51:47 -0000	1.1
+++ pkg-plist	4 Apr 2005 13:00:54 -0000
@@ -1,4 +1,8 @@
 share/java/classes/postgis.jar
 %%EXAMPLESDIR%%/Test.java
+%%EXAMPLESDIR%%/TestAutoregister.java
+%%EXAMPLESDIR%%/TestBoxes.java
+%%EXAMPLESDIR%%/TestParser.java
 %%EXAMPLESDIR%%/TestServer.java
+%%EXAMPLESDIR%%/VersionPrinter.java
 @dirrm %%EXAMPLESDIR%%
--- postgis-jdbc-1.0.0r3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: