ports/80271: [maintainer] Use $JAVAJARDIR and $JAVALIBDIR correctly

[Matthew Seaman]

>Number:         80271
>Category:       ports
>Synopsis:       [maintainer] Use $JAVAJARDIR and $JAVALIBDIR correctly
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 23 06:20:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD gravitas.thebunker.net 5.4-STABLE FreeBSD 5.4-STABLE #11: Sat Apr 9 12:49:23 BST 2005 root at gravitas.thebunker.net:/usr/obj/usr/src/sys/GRAVITAS i386


	
>Description:

The Porter's Handbook says:

    Table 6-7. Constants defined for ports that use Java
    Constant 	Value
    JAVASHAREDIR 	The base directory for everything related to Java. Default: ${PREFIX}/share/java.
    JAVAJARDIR 	The directory where JAR files should be installed. Default: ${JAVASHAREDIR}/classes.
    JAVALIBDIR 	The directory where JAR files installed by other ports are located. Default: ${LOCALBASE}/share/java/classes.
    
and I now realise that in various places where I've been using
JAVAJARDIR, I should really have been using JAVALIBDIR

(Second PR on the same port tonight.  Sorry about that)

>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 Apr 23 06:37:07 2005
+++ mysql-connector-java/Makefile	Sat Apr 23 06:30:39 2005
@@ -2,7 +2,7 @@
 # Date created:		8 October 2003
 # Whom:			Matthew Seaman <m.seaman at infracaninophile.co.uk>
 #
-# $FreeBSD: ports/databases/mysql-connector-java/Makefile,v 1.32 2005/04/23 03:15:00 hq Exp $
+# $FreeBSD: ports/databases/mysql-connector-java/Makefile,v 1.31 2005/02/22 21:17:44 hq Exp $
 #
 
 PORTNAME=	mysql-connector-java
@@ -25,7 +25,7 @@
 USE_ANT=	yes
 JAVA_VERSION=	1.4+
 ALL_TARGET=	clean compile-driver
-MAKE_ARGS=	-Djavajardir=${JAVAJARDIR}
+MAKE_ARGS=	-Djavalibdir=${JAVALIBDIR}
 BUILDDIR=	${WRKDIR}/build-mysql-jdbc/${DISTNAME}
 
 .else
diff -Nur /usr/ports/databases/mysql-connector-java/files/patch-build.xml mysql-connector-java/files/patch-build.xml
--- /usr/ports/databases/mysql-connector-java/files/patch-build.xml	Wed Feb 23 09:20:10 2005
+++ mysql-connector-java/files/patch-build.xml	Sat Apr 23 06:31:03 2005
@@ -4,7 +4,7 @@
  			<include name="**/*.jar"/>
  		</fileset>
  
-+		<fileset dir="${javajardir}">
++		<fileset dir="${javalibdir}">
 +			<include name="junit.jar"/>
 +			<include name="log4j.jar"/>
 +		</fileset>
--- mysql-connector-java.diff ends here ---


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