ports/66111: [Maintainer update] bsd.java.mk tracking

[Matthew Seaman]

>Number:         66111
>Category:       ports
>Synopsis:       [Maintainer update] bsd.java.mk tracking
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 30 06:20:23 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 4.10-BETA i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 4.10-BETA FreeBSD 4.10-BETA #66: Fri Apr 23 15:48:39 BST 2004 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

Update to the latest bsd.java.mk style.
Move PLIST_FILES to later in the Makefile for consistencies' sake.

>How-To-Repeat:

>Fix:


--- mysql-connector-java.diff begins here ---
diff -Nur /usr/ports/databases/mysql-connector-java/Makefile mysql-connector-java/Makefile
--- /usr/ports/databases/mysql-connector-java/Makefile	Sat Feb 21 10:00:12 2004
+++ mysql-connector-java/Makefile	Fri Apr 30 13:58:29 2004
@@ -26,16 +26,13 @@
 MAINTAINER=	m.seaman at infracaninophile.co.uk
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
 
-PLIST_FILES=	share/java/classes/jdbc2_0-stdext.jar \
-		share/java/classes/jta-spec1_0_1.jar \
-		share/java/classes/mysql-connector-java.jar
-
 .if !defined(WITHOUT_COMPILE)
 
 BUILD_DEPENDS=	${ANT_CMD}:${PORTSDIR}/devel/apache-ant \
 		${LOCALBASE}/share/java/classes/junit.jar:${PORTSDIR}/java/junit
-USE_JAVA=	1.4+
-NEED_JAVAC=	YES
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
+JAVA_BUILD=	yes
 
 ANT_CMD?=	${LOCALBASE}/bin/ant
 ANT=		${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD}
@@ -44,7 +41,9 @@
 
 .else
 
-USE_JAVA=	1.2+
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
+JAVA_RUN=	yes
 BUILDDIR=	${WRKDIR}/${DISTNAME}
 
 .endif
@@ -55,6 +54,10 @@
 EXTRADOCS=	README CHANGES
 JARFILE=	${DISTNAME}-bin.jar
 JDCLASSPATH=	${WRKSRC}:${WRKSRC}/lib/jdbc2_0-stdext.jar:${WRKSRC}/lib/jta-spec1_0_1.jar:${CLASSPATH}
+
+PLIST_FILES=	share/java/classes/jdbc2_0-stdext.jar \
+		share/java/classes/jta-spec1_0_1.jar \
+		share/java/classes/mysql-connector-java.jar
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
--- mysql-connector-java.diff ends here ---


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