Attachment #81505 for bug #116724

Lines 22-28 Link Here

(-)archivers/jzip.org/Makefile (-1 / +1 lines)
22	PLIST_FILES= %%JAVAJARDIR%%/jzip.org.jar bin/${PORTNAME}	22	PLIST_FILES= %%JAVAJARDIR%%/jzip.org.jar bin/${PORTNAME}
23	USE_ZIP= yes	23	USE_ZIP= yes
24	USE_JAVA= yes	24	USE_JAVA= yes
25	JAVA_VERSION= 1.2+	25	JAVA_VERSION= 1.3+
26	WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION}.src	26	WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION}.src
27		27
28	SUB_FILES= ${PORTNAME}.sh	28	SUB_FILES= ${PORTNAME}.sh

Lines 20-26 Link Here

(-)benchmarks/scimark2/Makefile (-1 / +1 lines)
20	USE_ZIP= yes	20	USE_ZIP= yes
21		21
22	USE_JAVA= yes	22	USE_JAVA= yes
23	JAVA_VERSION= 1.2+	23	JAVA_VERSION= 1.3+
24	USE_JIKES= NO	24	USE_JIKES= NO
25	NEED_JAVAC= yes	25	NEED_JAVAC= yes
26	JAVAC_OPTS?= -O	26	JAVAC_OPTS?= -O

Lines 19-25 Link Here

(-)comms/rxtx/Makefile (-1 / +1 lines)
19	USE_ZIP= yes	19	USE_ZIP= yes
20	USE_GMAKE= yes	20	USE_GMAKE= yes
21	USE_JAVA= yes	21	USE_JAVA= yes
22	JAVA_VERSION= 1.2+	22	JAVA_VERSION= 1.3+
23	JAVA_OS= native	23	JAVA_OS= native
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25		25

Lines 25-31 Link Here

(-)databases/erserver/Makefile (-1 / +1 lines)
25	USE_GMAKE= yes	25	USE_GMAKE= yes
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	USE_JAVA= yes	27	USE_JAVA= yes
28	JAVA_VERSION= 1.2+	28	JAVA_VERSION= 1.3+
29	USE_PERL5= yes	29	USE_PERL5= yes
30	CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} JAVA=${JAVA}	30	CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} JAVA=${JAVA}
31	CONFIGURE_ARGS= --with-pgincludes=${PGINC}	31	CONFIGURE_ARGS= --with-pgincludes=${PGINC}

Lines 25-31 Link Here

(-)databases/jdbc-oracle8i/Makefile (-1 / +1 lines)
25		25
26	USE_ZIP= yes	26	USE_ZIP= yes
27	USE_JAVA= yes	27	USE_JAVA= yes
28	JAVA_VERSION= 1.2+ # Should be "1.2 1.3" but tested OK with 1.4	28	JAVA_VERSION= 1.3+ # Should be "1.2 1.3" but tested OK with 1.4
29		29
30	NO_BUILD= yes	30	NO_BUILD= yes
31	NO_WRKSUBDIR= yes	31	NO_WRKSUBDIR= yes

Lines 31-37 Link Here

(-)databases/mysql-connector-java/Makefile (-1 / +1 lines)
31	.else	31	.else
32		32
33	USE_JAVA= yes	33	USE_JAVA= yes
34	JAVA_VERSION= 1.2+	34	JAVA_VERSION= 1.3+
35	BUILDDIR= ${WRKDIR}/${DISTNAME}	35	BUILDDIR= ${WRKDIR}/${DISTNAME}
36		36
37	.endif	37	.endif

Lines 26-32 Link Here

(-)devel/apache-ant/Makefile (-1 / +1 lines)
26	MANPAGE_VERSION= 20030908	26	MANPAGE_VERSION= 20030908
27	USE_BZIP2= yes	27	USE_BZIP2= yes
28	USE_JAVA= yes	28	USE_JAVA= yes
29	JAVA_VERSION= 1.2+	29	JAVA_VERSION= 1.3+
30		30
31	NO_BUILD= YES	31	NO_BUILD= YES
32	DATADIR= ${JAVASHAREDIR}/${PORTNAME}	32	DATADIR= ${JAVASHAREDIR}/${PORTNAME}

Lines 18-24 Link Here

(-)devel/excalibur-configuration/Makefile (-1 / +1 lines)
18	RUN_DEPENDS= ${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework	18	RUN_DEPENDS= ${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22	NO_BUILD= yes	22	NO_BUILD= yes
23		23
24	PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar	24	PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar

Lines 20-26 Link Here

(-)devel/glib-java/Makefile (-1 / +1 lines)
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	USE_JAVA= yes	22	USE_JAVA= yes
23	JAVA_VERSION= 1.2+	23	JAVA_VERSION= 1.3+
24	JAVA_OS= native	24	JAVA_OS= native
25	USE_GCC= 3.4+	25	USE_GCC= 3.4+
26	USE_GNOME= gnomehack glib20	26	USE_GNOME= gnomehack glib20

Lines 17-23 Link Here

(-)devel/jakarta-commons-daemon/Makefile (-1 / +1 lines)
17	COMMENT= Wrapper code to start/stop a Java application as a daemon.	17	COMMENT= Wrapper code to start/stop a Java application as a daemon.
18		18
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21	JAVA_OS= native	21	JAVA_OS= native
22	JAVA_BUILD= jdk	22	JAVA_BUILD= jdk
23	NEED_JAVAC= yes	23	NEED_JAVAC= yes

Lines 17-23 Link Here

(-)devel/jakarta-commons-jxpath/Makefile (-1 / +1 lines)
17	COMMENT= Utilities for manipulating Java Beans using the XPath syntax	17	COMMENT= Utilities for manipulating Java Beans using the XPath syntax
18		18
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21	NO_BUILD= yes	21	NO_BUILD= yes
22		22
23	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>

Lines 17-23 Link Here

(-)devel/jakarta-commons-modeler/Makefile (-1 / +1 lines)
17	COMMENT= Mechanisms to create Model MBeans compatible with JMX specification	17	COMMENT= Mechanisms to create Model MBeans compatible with JMX specification
18		18
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21	NO_BUILD= yes	21	NO_BUILD= yes
22		22
23	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>

Lines 17-23 Link Here

(-)devel/java-util-concurrent/Makefile (-1 / +1 lines)
17	COMMENT= Utility classes for concurrent Java programming	17	COMMENT= Utility classes for concurrent Java programming
18		18
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21		21
22	USE_ANT= yes	22	USE_ANT= yes
23	ALL_TARGET= dist	23	ALL_TARGET= dist

Lines 20-26 Link Here

(-)devel/jep/Makefile (-1 / +1 lines)
20	MAKE_ENV= JAVA_HOME=${JAVA_HOME}	20	MAKE_ENV= JAVA_HOME=${JAVA_HOME}
21	CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX}	21	CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX}
22	USE_JAVA= yes	22	USE_JAVA= yes
23	JAVA_VERSION= 1.2+	23	JAVA_VERSION= 1.3+
24	USE_PYTHON= yes	24	USE_PYTHON= yes
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes

Lines 24-30 Link Here

(-)devel/libgconf-java/Makefile (-1 / +1 lines)
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	USE_JAVA= yes	26	USE_JAVA= yes
27	JAVA_VERSION= 1.2+	27	JAVA_VERSION= 1.3+
28	JAVA_OS= native	28	JAVA_OS= native
29	USE_GCC= 3.4+	29	USE_GCC= 3.4+
30	USE_GNOME= gnomehack gconf2	30	USE_GNOME= gnomehack gconf2

Lines 28-34 Link Here

(-)devel/libglade-java/Makefile (-1 / +1 lines)
28	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
29	USE_JAVA= yes	29	USE_JAVA= yes
30	USE_GCC= 3.4+	30	USE_GCC= 3.4+
31	JAVA_VERSION= 1.2+	31	JAVA_VERSION= 1.3+
32	JAVA_OS= native	32	JAVA_OS= native
33	USE_GNOME= gnomehack libglade2	33	USE_GNOME= gnomehack libglade2
34	CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR}	34	CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR}

Lines 19-25 Link Here

(-)devel/p5-Java/Makefile (-1 / +1 lines)
19	USE_RC_SUBR= javaserver.sh	19	USE_RC_SUBR= javaserver.sh
20	PERL_CONFIGURE= YES	20	PERL_CONFIGURE= YES
21	USE_JAVA= yes	21	USE_JAVA= yes
22	JAVA_VERSION= 1.1+	22	JAVA_VERSION= 1.3+
23		23
24	MAN3= Java.3 JavaArray.3	24	MAN3= Java.3 JavaArray.3
25		25

Lines 130-136 Link Here

(-)devel/subversion/Makefile (-1 / +1 lines)
130	.if defined(WITH_JAVA)	130	.if defined(WITH_JAVA)
131	CATEGORIES+= java	131	CATEGORIES+= java
132	USE_JAVA= yes	132	USE_JAVA= yes
133	JAVA_VERSION= 1.2+	133	JAVA_VERSION= 1.3+
134	JAVA_OS= native	134	JAVA_OS= native
135	JAVA_BUILD= yes	135	JAVA_BUILD= yes
136	JAVA_RUN= yes	136	JAVA_RUN= yes

Lines 16-22 Link Here

(-)dns/crossip/Makefile (-1 / +1 lines)
16	COMMENT= Java DNS update client for the ThatIP protocol	16	COMMENT= Java DNS update client for the ThatIP protocol
17		17
18	USE_JAVA= yes	18	USE_JAVA= yes
19	JAVA_VERSION= 1.2+	19	JAVA_VERSION= 1.3+
20	USE_ZIP= yes	20	USE_ZIP= yes
21		21
22	NO_BUILD= yes	22	NO_BUILD= yes

Lines 16-22 Link Here

(-)dns/dnsjava/Makefile (-1 / +1 lines)
16	COMMENT= Implementation of DNS in Java	16	COMMENT= Implementation of DNS in Java
17		17
18	USE_JAVA= yes	18	USE_JAVA= yes
19	JAVA_VERSION= 1.2+	19	JAVA_VERSION= 1.3+
20		20
21	USE_ANT= yes	21	USE_ANT= yes
22	ALL_TARGET= jar	22	ALL_TARGET= jar

Lines 16-22 Link Here

(-)editors/jext/Makefile (-1 / +1 lines)
16	COMMENT= Powerful 100% pure Java text editor	16	COMMENT= Powerful 100% pure Java text editor
17		17
18	USE_JAVA= yes	18	USE_JAVA= yes
19	JAVA_VERSION= 1.2+	19	JAVA_VERSION= 1.3+
20	NO_WRKSUBDIR= yes	20	NO_WRKSUBDIR= yes
21	USE_XLIB= yes	21	USE_XLIB= yes
22	NO_BUILD= yes	22	NO_BUILD= yes

Lines 23-29 Link Here

(-)graphics/cairo-java/Makefile (-1 / +1 lines)
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25	USE_JAVA= yes	25	USE_JAVA= yes
26	JAVA_VERSION= 1.2+	26	JAVA_VERSION= 1.3+
27	JAVA_OS= native	27	JAVA_OS= native
28	USE_GCC= 3.4+	28	USE_GCC= 3.4+
29	USE_GNOME= gnomehack gnometarget	29	USE_GNOME= gnomehack gnometarget

Lines 19-25 Link Here

(-)java/bsh/Makefile (-1 / +1 lines)
19		19
20	PLIST_FILES= %%JAVAJARDIR%%/bsh.jar bin/bsh	20	PLIST_FILES= %%JAVAJARDIR%%/bsh.jar bin/bsh
21	USE_JAVA= yes	21	USE_JAVA= yes
22	JAVA_VERSION= 1.2+	22	JAVA_VERSION= 1.3+
23	NO_BUILD= yes	23	NO_BUILD= yes
24	SUB_FILES= bsh.sh	24	SUB_FILES= bsh.sh
25		25

Lines 16-22 Link Here

(-)java/cryptix-jce/Makefile (-1 / +1 lines)
16	COMMENT= JCE (Java Cryptography Extension) by Cryptix	16	COMMENT= JCE (Java Cryptography Extension) by Cryptix
17		17
18	USE_JAVA= yes	18	USE_JAVA= yes
19	JAVA_VERSION= 1.1+	19	JAVA_VERSION= 1.3+
20	USE_ZIP= yes	20	USE_ZIP= yes
21	NO_BUILD= yes	21	NO_BUILD= yes
22		22

Lines 27-33 Link Here

(-)java/gj/Makefile (-1 / +1 lines)
27	JAVA_VERSION= 1.1	27	JAVA_VERSION= 1.1
28	.else	28	.else
29	GJDIST= 1.2	29	GJDIST= 1.2
30	JAVA_VERSION= 1.2+	30	JAVA_VERSION= 1.3+
31	.endif	31	.endif
32		32
33	JDKSUBDIR= jdk${GJDIST}	33	JDKSUBDIR= jdk${GJDIST}

Lines 17-23 Link Here

(-)java/jakarta-bcel/Makefile (-1 / +1 lines)
17		17
18	NO_BUILD= yes	18	NO_BUILD= yes
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21		21
22	PLIST_FILES= %%JAVAJARDIR%%/bcel.jar	22	PLIST_FILES= %%JAVAJARDIR%%/bcel.jar
23		23

Lines 24-30 Link Here

(-)java/jakarta-commons-beanutils/Makefile (-1 / +1 lines)
24	${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections	24	${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
25		25
26	USE_JAVA= yes	26	USE_JAVA= yes
27	JAVA_VERSION= 1.2+	27	JAVA_VERSION= 1.3+
28		28
29	USE_ANT= yes	29	USE_ANT= yes
30	ALL_TARGET= dist	30	ALL_TARGET= dist

Lines 21-27 Link Here

(-)java/jakarta-commons-cli/Makefile (-1 / +1 lines)
21	BUILD_DEPENDS= ${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang	21	BUILD_DEPENDS= ${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang
22		22
23	USE_JAVA= yes	23	USE_JAVA= yes
24	JAVA_VERSION= 1.2+	24	JAVA_VERSION= 1.3+
25		25
26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
27		27

Lines 18-24 Link Here

(-)java/jakarta-commons-codec/Makefile (-1 / +1 lines)
18	COMMENT= An implementations of common encoders and decoders	18	COMMENT= An implementations of common encoders and decoders
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22	USE_ANT= yes	22	USE_ANT= yes
23		23
24	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	24	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

Lines 18-24 Link Here

(-)java/jakarta-commons-collections/Makefile (-1 / +1 lines)
18	COMMENT= Classes that extend/augment the Java Collections Framework	18	COMMENT= Classes that extend/augment the Java Collections Framework
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22	USE_ANT= yes	22	USE_ANT= yes
23		23
24	ALL_TARGET= jar	24	ALL_TARGET= jar

Lines 18-24 Link Here

(-)java/jakarta-commons-lang/Makefile (-1 / +1 lines)
18	COMMENT= Jakarta library with helper utilities for the java.lang API	18	COMMENT= Jakarta library with helper utilities for the java.lang API
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22		22
23	USE_ANT= yes	23	USE_ANT= yes
24	USE_JIKES= no	24	USE_JIKES= no

Lines 17-23 Link Here

(-)java/jakarta-commons-logging/Makefile (-1 / +1 lines)
17	COMMENT= Generic logging wrapper library	17	COMMENT= Generic logging wrapper library
18		18
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21	NO_BUILD= yes	21	NO_BUILD= yes
22		22
23	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>

Lines 18-24 Link Here

(-)java/jakarta-oro/Makefile (-1 / +1 lines)
18	BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant	18	BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22		22
23	PLIST= ${WRKDIR}/PLIST	23	PLIST= ${WRKDIR}/PLIST
24		24

Lines 17-23 Link Here

(-)java/jakarta-regexp/Makefile (-1 / +1 lines)
17	BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant	17	BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
18		18
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21		21
22	PLIST= ${WRKDIR}/PLIST	22	PLIST= ${WRKDIR}/PLIST
23		23

Lines 20-26 Link Here

(-)java/jasmin/Makefile (-1 / +1 lines)
20	USE_ANT= yes	20	USE_ANT= yes
21	ALL_TARGET= jasmin	21	ALL_TARGET= jasmin
22	USE_JAVA= yes	22	USE_JAVA= yes
23	JAVA_VERSION= 1.2+	23	JAVA_VERSION= 1.3+
24	USE_DOS2UNIX= yes	24	USE_DOS2UNIX= yes
25	DOS2UNIX_REGEX= .*\.(txt\|xml\|j\|class\|java\|mf\|css\|bnf\|html)	25	DOS2UNIX_REGEX= .*\.(txt\|xml\|j\|class\|java\|mf\|css\|bnf\|html)
26		26

Lines 17-23 Link Here

(-)java/jboss2/Makefile (-1 / +1 lines)
17	COMMENT= JBoss 2.x, an open-source J2EE application server	17	COMMENT= JBoss 2.x, an open-source J2EE application server
18		18
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21		21
22	USE_ZIP= YES	22	USE_ZIP= YES
23	NO_BUILD= YES	23	NO_BUILD= YES

Lines 17-23 Link Here

(-)java/jcommon/Makefile (-1 / +1 lines)
17	COMMENT= A collection of useful classes used by JFreeChart and JFreeReport	17	COMMENT= A collection of useful classes used by JFreeChart and JFreeReport
18		18
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21		21
22	.if !defined(WITHOUT_COMPILE)	22	.if !defined(WITHOUT_COMPILE)
23	USE_ANT= yes	23	USE_ANT= yes

Lines 15-21 Link Here

(-)java/jdbcpool/Makefile (-1 / +1 lines)
15	COMMENT= JDBC connection pool	15	COMMENT= JDBC connection pool
16		16
17	USE_JAVA= yes	17	USE_JAVA= yes
18	JAVA_VERSION= 1.2+	18	JAVA_VERSION= 1.3+
19	NO_BUILD= yes	19	NO_BUILD= yes
20		20
21	PORTDOCS= CHANGES LICENSE README	21	PORTDOCS= CHANGES LICENSE README

Lines 18-24 Link Here

(-)java/jdom/Makefile (-1 / +1 lines)
18	RUN_DEPENDS= ${JAVALIBDIR}/jaxen-jdom.jar:${PORTSDIR}/java/jaxen	18	RUN_DEPENDS= ${JAVALIBDIR}/jaxen-jdom.jar:${PORTSDIR}/java/jaxen
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22	USE_ANT= yes	22	USE_ANT= yes
23		23
24	ALL_TARGET= package	24	ALL_TARGET= package

Lines 19-25 Link Here

(-)java/jfreechart/Makefile (-1 / +1 lines)
19	RUN_DEPENDS= ${JAVALIBDIR}/jcommon.jar:${PORTSDIR}/java/jcommon	19	RUN_DEPENDS= ${JAVALIBDIR}/jcommon.jar:${PORTSDIR}/java/jcommon
20		20
21	USE_JAVA= yes	21	USE_JAVA= yes
22	JAVA_VERSION= 1.2+	22	JAVA_VERSION= 1.3+
23		23
24	.if !defined(WITHOUT_COMPILE)	24	.if !defined(WITHOUT_COMPILE)
25	USE_ANT= yes	25	USE_ANT= yes

Lines 17-23 Link Here

(-)java/jmf/Makefile (-1 / +1 lines)
17	COMMENT= Java Media Framework	17	COMMENT= Java Media Framework
18		18
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.2+	20	JAVA_VERSION= 1.3+
21	USE_ZIP= YES	21	USE_ZIP= YES
22	NO_BUILD= YES	22	NO_BUILD= YES
23		23

Lines 25-31 Link Here

(-)java/jmp/Makefile (-1 / +1 lines)
25	USE_GETTEXT= yes	25	USE_GETTEXT= yes
26	USE_GMAKE= yes	26	USE_GMAKE= yes
27	USE_JAVA= yes	27	USE_JAVA= yes
28	JAVA_VERSION= 1.2+	28	JAVA_VERSION= 1.3+
29	JAVA_OS= native	29	JAVA_OS= native
30	JAVA_BUILD= jdk	30	JAVA_BUILD= jdk
31	NEED_JAVAC= yes	31	NEED_JAVAC= yes

Lines 20-26 Link Here

(-)java/jode/Makefile (-1 / +1 lines)
20		20
21	VENDOR_VERSION= 1.1.2-pre1	21	VENDOR_VERSION= 1.1.2-pre1
22	USE_JAVA= yes	22	USE_JAVA= yes
23	JAVA_VERSION= 1.2+	23	JAVA_VERSION= 1.3+
24	NEED_JAVAC= yes	24	NEED_JAVAC= yes
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	USE_GMAKE= yes	26	USE_GMAKE= yes

Lines 18-24 Link Here

(-)java/jomp/Makefile (-1 / +1 lines)
18	COMMENT= Prototype OpenMP implementation for Java	18	COMMENT= Prototype OpenMP implementation for Java
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22		22
23	NO_BUILD= yes	23	NO_BUILD= yes
24	NO_WRKSUBDIR= yes	24	NO_WRKSUBDIR= yes

Lines 16-22 Link Here

(-)java/jump/Makefile (-1 / +1 lines)
16	COMMENT= Java library for arbitrary precision computations	16	COMMENT= Java library for arbitrary precision computations
17		17
18	USE_JAVA= yes	18	USE_JAVA= yes
19	JAVA_VERSION= 1.2+	19	JAVA_VERSION= 1.3+
20	USE_ANT= yes	20	USE_ANT= yes
21		21
22	.if defined(NOPORTDOCS)	22	.if defined(NOPORTDOCS)

Lines 21-27 Link Here

(-)java/xdoclet/Makefile (-1 / +1 lines)
21	RUN_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant	21	RUN_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
22		22
23	USE_JAVA= yes	23	USE_JAVA= yes
24	JAVA_VERSION= 1.2+	24	JAVA_VERSION= 1.3+
25	USE_ZIP= yes	25	USE_ZIP= yes
26	NO_WRKSUBDIR= yes	26	NO_WRKSUBDIR= yes
27	NO_BUILD= yes	27	NO_BUILD= yes

Lines 18-24 Link Here

(-)lang/kawa/Makefile (-1 / +1 lines)
18	BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed	18	BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --enable-kawa-frontend --program-prefix=''	23	CONFIGURE_ARGS= --enable-kawa-frontend --program-prefix=''
24		24

Lines 16-22 Link Here

(-)lang/starlogo/Makefile (-1 / +1 lines)
16	COMMENT= Specialized version of the Logo programming language written in Java	16	COMMENT= Specialized version of the Logo programming language written in Java
17		17
18	USE_JAVA= yes	18	USE_JAVA= yes
19	JAVA_VERSION= 1.2+	19	JAVA_VERSION= 1.3+
20		20
21	USE_ZIP= yes	21	USE_ZIP= yes
22	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	22	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

Lines 23-29 Link Here

(-)math/jakarta-commons-math/Makefile (-1 / +1 lines)
23	${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery	23	${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery
24		24
25	USE_JAVA= yes	25	USE_JAVA= yes
26	JAVA_VERSION= 1.2+	26	JAVA_VERSION= 1.3+
27	USE_ANT= yes	27	USE_ANT= yes
28		28
29	ALL_TARGET= jar	29	ALL_TARGET= jar

Lines 19-25 Link Here

(-)net/apache-soap/Makefile (-1 / +1 lines)
19	RUN_DEPENDS= ${JAVALIBDIR}/mail.jar:${PORTSDIR}/java/javamail	19	RUN_DEPENDS= ${JAVALIBDIR}/mail.jar:${PORTSDIR}/java/javamail
20		20
21	USE_JAVA= yes	21	USE_JAVA= yes
22	JAVA_VERSION= 1.2+	22	JAVA_VERSION= 1.3+
23		23
24	WRKSRC= ${WRKDIR}/soap-2_3_1	24	WRKSRC= ${WRKDIR}/soap-2_3_1
25	NO_BUILD= yes	25	NO_BUILD= yes

Lines 19-25 Link Here

(-)net/spread-j/Makefile (-1 / +1 lines)
19	BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant	19	BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant
20		20
21	USE_JAVA= YES	21	USE_JAVA= YES
22	JAVA_VERSION= 1.2+	22	JAVA_VERSION= 1.3+
23	PKGMESSAGE= ${WRKSRC}/../license.txt	23	PKGMESSAGE= ${WRKSRC}/../license.txt
24		24
25	ANT?= ${LOCALBASE}/bin/ant	25	ANT?= ${LOCALBASE}/bin/ant

Lines 25-31 Link Here

(-)net-mgmt/airport/Makefile (-1 / +1 lines)
25		25
26	USE_ZIP= YES	26	USE_ZIP= YES
27	USE_JAVA= yes	27	USE_JAVA= yes
28	JAVA_VERSION= 1.2+	28	JAVA_VERSION= 1.3+
29		29
30	NO_WRKSUBDIR= YES	30	NO_WRKSUBDIR= YES
31	NO_BUILD= yes	31	NO_BUILD= yes

Lines 18-24 Link Here

(-)security/iaikpkcs11wrapper/Makefile (-1 / +1 lines)
18		18
19	USE_ZIP= yes	19	USE_ZIP= yes
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22	JAVA_OS= native	22	JAVA_OS= native
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	ALL_TARGET= release	24	ALL_TARGET= release

Lines 18-24 Link Here

(-)textproc/ant-xinclude-task/Makefile (-1 / +1 lines)
18	BUILD_DEPENDS= ${JAVAJARDIR}/xincluder.jar:${PORTSDIR}/textproc/xincluder	18	BUILD_DEPENDS= ${JAVAJARDIR}/xincluder.jar:${PORTSDIR}/textproc/xincluder
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.1+	21	JAVA_VERSION= 1.3+
22	USE_ANT= yes	22	USE_ANT= yes
23		23
24	ALL_TARGET= jar	24	ALL_TARGET= jar

Lines 24-30 Link Here

(-)textproc/denature/Makefile (-1 / +1 lines)
24		24
25	USE_PERL5= yes	25	USE_PERL5= yes
26	USE_JAVA= yes	26	USE_JAVA= yes
27	JAVA_VERSION= 1.2+	27	JAVA_VERSION= 1.3+
28	POD2MAN?= pod2man	28	POD2MAN?= pod2man
29	WRKSRC= ${WRKDIR}/${PORTNAME}	29	WRKSRC= ${WRKDIR}/${PORTNAME}
30		30

Lines 16-22 Link Here

(-)textproc/dom4j/Makefile (-1 / +1 lines)
16	COMMENT= Open Source XML framework for Java	16	COMMENT= Open Source XML framework for Java
17		17
18	USE_JAVA= yes	18	USE_JAVA= yes
19	JAVA_VERSION= 1.2+	19	JAVA_VERSION= 1.3+
20	NO_BUILD= yes	20	NO_BUILD= yes
21		21
22	PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar	22	PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar

Lines 25-31 Link Here

(-)textproc/fop/Makefile (-1 / +1 lines)
25	WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}	25	WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
26		26
27	USE_JAVA= yes	27	USE_JAVA= yes
28	JAVA_VERSION= 1.2+	28	JAVA_VERSION= 1.3+
29	USE_ANT= yes	29	USE_ANT= yes
30		30
31	post-extract:	31	post-extract:

Lines 19-25 Link Here

(-)textproc/galax/Makefile (-1 / +1 lines)
19	WRKSRC= ${WRKDIR}/galax	19	WRKSRC= ${WRKDIR}/galax
20		20
21	USE_JAVA= yes	21	USE_JAVA= yes
22	JAVA_VERSION= 1.2 1.3 1.4	22	JAVA_VERSION= 1.3 1.4
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	ALL_TARGET= world	24	ALL_TARGET= world
25	MAKE_ARGS= JAVAHOME=${JAVA_HOME} JAVAINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" \	25	MAKE_ARGS= JAVAHOME=${JAVA_HOME} JAVAINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" \

Lines 21-27 Link Here

(-)textproc/jakarta-commons-digester/Makefile (-1 / +1 lines)
21	RUN_DEPENDS= ${JAR_DEPENDS}	21	RUN_DEPENDS= ${JAR_DEPENDS}
22		22
23	USE_JAVA= yes	23	USE_JAVA= yes
24	JAVA_VERSION= 1.2+	24	JAVA_VERSION= 1.3+
25		25
26	USE_ANT= yes	26	USE_ANT= yes
27	MAKE_ARGS= -Dcommons-beanutils.api=${COMMONS_BEANUTILS_API} \	27	MAKE_ARGS= -Dcommons-beanutils.api=${COMMONS_BEANUTILS_API} \

Lines 20-26 Link Here

(-)textproc/saxon/Makefile (-1 / +1 lines)
20		20
21	USE_ZIP= yes	21	USE_ZIP= yes
22	USE_JAVA= yes	22	USE_JAVA= yes
23	JAVA_VERSION= 1.2+	23	JAVA_VERSION= 1.3+
24	NO_WRKSUBDIR= yes	24	NO_WRKSUBDIR= yes
25	NO_BUILD= yes	25	NO_BUILD= yes
26		26

Lines 24-30 Link Here

(-)textproc/smartdoc/Makefile (-1 / +1 lines)
24	NO_BUILD= yes	24	NO_BUILD= yes
25	USE_ZIP= yes	25	USE_ZIP= yes
26	USE_JAVA= yes	26	USE_JAVA= yes
27	JAVA_VERSION= 1.2+	27	JAVA_VERSION= 1.3+
28	JAVA_EXTRACT= jre	28	JAVA_EXTRACT= jre
29	JAVA_RUN= jre	29	JAVA_RUN= jre
30	EXTRACT_CMD= ${JAVA}	30	EXTRACT_CMD= ${JAVA}

Lines 19-25 Link Here

(-)textproc/xalan-j/Makefile (-1 / +1 lines)
19	RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper	19	RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
20		20
21	USE_JAVA= yes	21	USE_JAVA= yes
22	JAVA_VERSION= 1.2+	22	JAVA_VERSION= 1.3+
23	USE_ANT= yes	23	USE_ANT= yes
24		24
25	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}	25	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}

Lines 20-26 Link Here

(-)textproc/xincluder/Makefile (-1 / +1 lines)
20	java:${PORTSDIR}/java/javavmwrapper	20	java:${PORTSDIR}/java/javavmwrapper
21		21
22	USE_JAVA= yes	22	USE_JAVA= yes
23	JAVA_VERSION= 1.2+	23	JAVA_VERSION= 1.3+
24	NO_BUILD= yes	24	NO_BUILD= yes
25		25
26	WRKSRC= ${WRKDIR}/${PORTNAME}	26	WRKSRC= ${WRKDIR}/${PORTNAME}

Lines 19-25 Link Here

(-)textproc/xom/Makefile (-1 / +1 lines)
19	${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j	19	${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
20		20
21	USE_JAVA= yes	21	USE_JAVA= yes
22	JAVA_VERSION= 1.2+	22	JAVA_VERSION= 1.3+
23	NO_BUILD= yes	23	NO_BUILD= yes
24	WRKSRC= ${WRKDIR}/XOM	24	WRKSRC= ${WRKDIR}/XOM
25		25

Lines 16-22 Link Here

(-)textproc/xp/Makefile (-1 / +1 lines)
16	COMMENT= An XML parser written in Java	16	COMMENT= An XML parser written in Java
17		17
18	USE_JAVA= yes	18	USE_JAVA= yes
19	JAVA_VERSION= 1.1+	19	JAVA_VERSION= 1.3+
20		20
21	NO_WORKSUBDIR= yes	21	NO_WORKSUBDIR= yes
22	NO_BUILD= yes	22	NO_BUILD= yes

Lines 21-27 Link Here

(-)textproc/xt/Makefile (-1 / +1 lines)
21	${LOCALBASE}/bin/classpath:${PORTSDIR}/java/javavmwrapper	21	${LOCALBASE}/bin/classpath:${PORTSDIR}/java/javavmwrapper
22		22
23	USE_JAVA= YES	23	USE_JAVA= YES
24	JAVA_VERSION= 1.1+	24	JAVA_VERSION= 1.3+
25	NO_BUILD= YES	25	NO_BUILD= YES
26		26
27	.if !defined(NOPORTDOCS)	27	.if !defined(NOPORTDOCS)

Lines 18-24 Link Here

(-)www/jakarta-tomcat4/Makefile (-1 / +1 lines)
18	DEPRECATED= www/jakarta-tomcat5 is recommended instead for new installations	18	DEPRECATED= www/jakarta-tomcat5 is recommended instead for new installations
19		19
20	USE_JAVA= yes	20	USE_JAVA= yes
21	JAVA_VERSION= 1.2+	21	JAVA_VERSION= 1.3+
22	NO_BUILD= YES	22	NO_BUILD= YES
23	LATEST_LINK= ${APP_SHORTNAME}	23	LATEST_LINK= ${APP_SHORTNAME}
24		24

Lines 15-21 Link Here

(-)www/resin2/Makefile (-1 / +1 lines)
15	COMMENT= Resin, a Java-based Application Server, 2.x branch	15	COMMENT= Resin, a Java-based Application Server, 2.x branch
16		16
17	USE_JAVA= yes	17	USE_JAVA= yes
18	JAVA_VERSION= 1.2+	18	JAVA_VERSION= 1.3+
19	HAS_CONFIGURE= yes	19	HAS_CONFIGURE= yes
20	USE_PYTHON= yes	20	USE_PYTHON= yes
21	USE_OPENSSL= yes	21	USE_OPENSSL= yes

Lines 14-20 Link Here

(-)www/resin3/Makefile (-1 / +1 lines)
14	COMMENT= Resin, a Java-based Application Server, 3.x branch	14	COMMENT= Resin, a Java-based Application Server, 3.x branch
15		15
16	USE_JAVA= yes	16	USE_JAVA= yes
17	JAVA_VERSION= 1.2+	17	JAVA_VERSION= 1.3+
18	HAS_CONFIGURE= yes	18	HAS_CONFIGURE= yes
19	USE_PYTHON= yes	19	USE_PYTHON= yes
20	USE_OPENSSL= yes	20	USE_OPENSSL= yes

Lines 16-22 Link Here

(-)www/tomcat41/Makefile (-1 / +1 lines)
16	COMMENT= Open-source Java web server by Apache, stable 4.1.x branch	16	COMMENT= Open-source Java web server by Apache, stable 4.1.x branch
17		17
18	USE_JAVA= yes	18	USE_JAVA= yes
19	JAVA_VERSION= 1.2+	19	JAVA_VERSION= 1.3+
20	NO_BUILD= YES	20	NO_BUILD= YES
21	LATEST_LINK= ${APP_SHORTNAME}	21	LATEST_LINK= ${APP_SHORTNAME}
22		22

Lines 25-31 Link Here

(-)x11/libgnome-java/Makefile (-1 / +1 lines)
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	USE_JAVA= yes	27	USE_JAVA= yes
28	JAVA_VERSION= 1.2+	28	JAVA_VERSION= 1.3+
29	JAVA_OS= native	29	JAVA_OS= native
30	USE_GCC= 3.4+	30	USE_GCC= 3.4+
31	USE_GNOME= gnomehack libgnomeui	31	USE_GNOME= gnomehack libgnomeui

Lines 23-29 Link Here

(-)x11-toolkits/libgtk-java/Makefile (-1 / +1 lines)
23	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25	USE_JAVA= yes	25	USE_JAVA= yes
26	JAVA_VERSION= 1.2+	26	JAVA_VERSION= 1.3+
27	JAVA_OS= native	27	JAVA_OS= native
28	USE_GCC= 3.4+	28	USE_GCC= 3.4+
29	USE_GNOME= gnomehack gtk20	29	USE_GNOME= gnomehack gtk20




#
# JAVA_VERSION		List of space-separated suitable java versions for the
#					port. An optional "+" allows you to specify a range of
#					versions. (allowed values: 1.3[+] 1.4[+] 1.5[+] 1.6[+])
#
# JAVA_OS			List of space-separated suitable JDK port operating systems
#					for the port. (allowed values: native linux)

#					'/usr/local/jdk1.3.1')
#
# JAVAC				Path to the Java compiler to use. (e.g.
#					'/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/jikes')
#
# JAR				Path to the JAR tool to use. (e.g.
#					'/usr/local/jdk1.5.0/bin/jar' or '/usr/local/bin/fastjar')
#
# APPLETVIEWER		Path to the appletviewer utility. (e.g.
#					'/usr/local/linux-jdk1.3.1/bin/appletviewer')
#
# JAVA				Path to the java executable. Use this for executing Java
#					programs. (e.g. '/usr/local/jdk1.3.1/bin/java')

#
# JAVAP				Path to the javap program.
#
# JAVA_KEYTOOL		Path to the keytool utility program.
#					availble only if the JDK is Java 1.2 or higher.
#
# JAVA_N2A			Path to the native2ascii tool.
#
# JAVA_POLICYTOOL	Path to the policytool program.
#					only if the JDK is Java 1.2 or higher.
#
# JAVA_SERIALVER	Path to the serialver utility program.
#

#
# RMIREGISTRY		Path to the RMI registry program, rmiregistry.
#
# RMID				Path to the RMI daemon program.
#					available if the JDK is Java 1.2 or higher.
#
# JAVA_CLASSES		Path to the archive that contains the JDK class files. On
#					most JDKs, this is ${JAVA_HOME}/jre/lib/rt.jar.
#					Earlier JDK's use ${JAVA_HOME}/lib/classes.zip.
#
# JAVASHAREDIR		The base directory for all shared Java resources.
#

.		endif

# The complete list of Java versions, os and vendors supported.
__JAVA_VERSION_LIST=	1.3 1.4 1.5 1.6
_JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST=			native linux
_JAVA_VENDOR_LIST=		freebsd bsdjava sun blackdown

# port location, corresponding JAVA_HOME, JDK version, OS, vendor
_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO=		PORT=java/diablo-jdk15			HOME=${LOCALBASE}/diablo-jdk1.5.0 \
											VERSION=1.5.0	OS=native	VENDOR=freebsd
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO=		PORT=java/jdk11					HOME=${LOCALBASE}/jdk1.1.8 \
											VERSION=1.1.8	OS=native	VENDOR=bsdjava
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO=		PORT=java/jdk12					HOME=${LOCALBASE}/jdk1.2.2 \
											VERSION=1.2.2	OS=native	VENDOR=bsdjava
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO=		PORT=java/jdk13					HOME=${LOCALBASE}/jdk1.3.1 \
											VERSION=1.3.1	OS=native	VENDOR=bsdjava
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO=		PORT=java/jdk14					HOME=${LOCALBASE}/jdk1.4.2 \

											VERSION=1.5.0	OS=native	VENDOR=bsdjava
_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO=		PORT=java/jdk16					HOME=${LOCALBASE}/jdk1.6.0 \
											VERSION=1.6.0	OS=native	VENDOR=bsdjava
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO=	PORT=java/linux-blackdown-jdk12	HOME=${LOCALBASE}/linux-blackdown-jdk1.2.2 \
											VERSION=1.2.2	OS=linux	VENDOR=blackdown
_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO=	PORT=java/linux-blackdown-jdk14	HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \
											VERSION=1.4.2	OS=linux	VENDOR=blackdown
_JAVA_PORT_LINUX_SUN_JDK_1_2_INFO=			PORT=java/linux-sun-jdk12		HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \
											VERSION=1.2.2	OS=linux	VENDOR=sun
_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO=			PORT=java/linux-sun-jdk13		HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \
											VERSION=1.3.1	OS=linux	VENDOR=sun
_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO=			PORT=java/linux-sun-jdk14		HOME=${LOCALBASE}/linux-sun-jdk1.4.2 \

					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2 \
					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 \
					JAVA_PORT_LINUX_SUN_JDK_1_6 \
					JAVA_PORT_LINUX_SUN_JDK_1_5 \
					JAVA_PORT_LINUX_SUN_JDK_1_4 \
					JAVA_PORT_LINUX_SUN_JDK_1_3 \
					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4
					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \
					JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2
_JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
					${_JAVA_PREFERRED_PORTS} \
					${__JAVA_PORTS_ALL}

.		undef _JAVA_PORTS_INSTALLED
.		undef _JAVA_PORTS_POSSIBLE
.		if defined(JAVA_VERSION)
_JAVA_VERSION=	${JAVA_VERSION:S/1.3+/1.3 1.4+/:S/1.4+/1.4 1.5+/:S/1.5+/1.5 1.6+/:S/1.6+/1.6/}
.		else
_JAVA_VERSION=	${__JAVA_VERSION_LIST}
.		endif

JAVA_SERIALVER?=${JAVA_HOME}/bin/serialver
RMIC?=			${JAVA_HOME}/bin/rmic
RMIREGISTRY?=	${JAVA_HOME}/bin/rmiregistry

# Some executables only exists in JDK 1.2 and up
.		if ${_JAVA_PORT} != "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
JAVA_KEYTOOL?=		${JAVA_HOME}/bin/keytool
JAVA_POLICYTOOL?=	${JAVA_HOME}/bin/policytool
RMID?=				${JAVA_HOME}/bin/rmid
.		endif

# Set the location of the ZIP or JAR file with all standard Java classes.
.		if ${_JAVA_PORT} == "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
JAVA_CLASSES=	${JAVA_HOME}/lib/classes.zip
.		else
JAVA_CLASSES=	${JAVA_HOME}/jre/lib/rt.jar
.		endif


#-------------------------------------------------------------------------------

Return to bug 116724

Lines 25-31 Link Here

(-)Mk/bsd.java.mk (-35 / +11 lines)
25	#	25	#
26	# JAVA_VERSION List of space-separated suitable java versions for the	26	# JAVA_VERSION List of space-separated suitable java versions for the
27	# port. An optional "+" allows you to specify a range of	27	# port. An optional "+" allows you to specify a range of
28	# versions. (allowed values: 1.1[+] 1.2[+] 1.3[+] 1.4[+])	28	# versions. (allowed values: 1.3[+] 1.4[+] 1.5[+] 1.6[+])
29	#	29	#
30	# JAVA_OS List of space-separated suitable JDK port operating systems	30	# JAVA_OS List of space-separated suitable JDK port operating systems
31	# for the port. (allowed values: native linux)	31	# for the port. (allowed values: native linux)
Lines 70-82 Link Here
70	# '/usr/local/jdk1.3.1')	70	# '/usr/local/jdk1.3.1')
71	#	71	#
72	# JAVAC Path to the Java compiler to use. (e.g.	72	# JAVAC Path to the Java compiler to use. (e.g.
73	# '/usr/local/jdk1.1.8/bin/javac' or '/usr/local/bin/jikes')	73	# '/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/jikes')
74	#	74	#
75	# JAR Path to the JAR tool to use. (e.g.	75	# JAR Path to the JAR tool to use. (e.g.
76	# '/usr/local/jdk1.2.2/bin/jar' or '/usr/local/bin/fastjar')	76	# '/usr/local/jdk1.5.0/bin/jar' or '/usr/local/bin/fastjar')
77	#	77	#
78	# APPLETVIEWER Path to the appletviewer utility. (e.g.	78	# APPLETVIEWER Path to the appletviewer utility. (e.g.
79	# '/usr/local/linux-jdk1.2.2/bin/appletviewer')	79	# '/usr/local/linux-jdk1.3.1/bin/appletviewer')
80	#	80	#
81	# JAVA Path to the java executable. Use this for executing Java	81	# JAVA Path to the java executable. Use this for executing Java
82	# programs. (e.g. '/usr/local/jdk1.3.1/bin/java')	82	# programs. (e.g. '/usr/local/jdk1.3.1/bin/java')
Lines 87-99 Link Here
87	#	87	#
88	# JAVAP Path to the javap program.	88	# JAVAP Path to the javap program.
89	#	89	#
90	# JAVA_KEYTOOL Path to the keytool utility program. This settings is	90	# JAVA_KEYTOOL Path to the keytool utility program.
91	# availble only if the JDK is Java 1.2 or higher.
92	#	91	#
93	# JAVA_N2A Path to the native2ascii tool.	92	# JAVA_N2A Path to the native2ascii tool.
94	#	93	#
95	# JAVA_POLICYTOOL Path to the policytool program. This variable is available	94	# JAVA_POLICYTOOL Path to the policytool program.
96	# only if the JDK is Java 1.2 or higher.
97	#	95	#
98	# JAVA_SERIALVER Path to the serialver utility program.	96	# JAVA_SERIALVER Path to the serialver utility program.
99	#	97	#
Lines 101-112 Link Here
101	#	99	#
102	# RMIREGISTRY Path to the RMI registry program, rmiregistry.	100	# RMIREGISTRY Path to the RMI registry program, rmiregistry.
103	#	101	#
104	# RMID Path to the RMI daemon program. This settings is only	102	# RMID Path to the RMI daemon program.
105	# available if the JDK is Java 1.2 or higher.
106	#	103	#
107	# JAVA_CLASSES Path to the archive that contains the JDK class files. On	104	# JAVA_CLASSES Path to the archive that contains the JDK class files. On
108	# JDK 1.2 or later, this is ${JAVA_HOME}/jre/lib/rt.jar.	105	# most JDKs, this is ${JAVA_HOME}/jre/lib/rt.jar.
109	# Earlier JDK's use ${JAVA_HOME}/lib/classes.zip.
110	#	106	#
111	# JAVASHAREDIR The base directory for all shared Java resources.	107	# JAVASHAREDIR The base directory for all shared Java resources.
112	#	108	#
Lines 166-172 Link Here
166	. endif	162	. endif
167		163
168	# The complete list of Java versions, os and vendors supported.	164	# The complete list of Java versions, os and vendors supported.
169	__JAVA_VERSION_LIST= 1.1 1.2 1.3 1.4 1.5 1.6	165	__JAVA_VERSION_LIST= 1.3 1.4 1.5 1.6
170	_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}	166	_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
171	_JAVA_OS_LIST= native linux	167	_JAVA_OS_LIST= native linux
172	_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown	168	_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown
Lines 175-184 Link Here
175	# port location, corresponding JAVA_HOME, JDK version, OS, vendor	171	# port location, corresponding JAVA_HOME, JDK version, OS, vendor
176	_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO= PORT=java/diablo-jdk15 HOME=${LOCALBASE}/diablo-jdk1.5.0 \	172	_JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO= PORT=java/diablo-jdk15 HOME=${LOCALBASE}/diablo-jdk1.5.0 \
177	VERSION=1.5.0 OS=native VENDOR=freebsd	173	VERSION=1.5.0 OS=native VENDOR=freebsd
178	_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1_INFO= PORT=java/jdk11 HOME=${LOCALBASE}/jdk1.1.8 \
179	VERSION=1.1.8 OS=native VENDOR=bsdjava
180	_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO= PORT=java/jdk12 HOME=${LOCALBASE}/jdk1.2.2 \
181	VERSION=1.2.2 OS=native VENDOR=bsdjava
182	_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO= PORT=java/jdk13 HOME=${LOCALBASE}/jdk1.3.1 \	174	_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO= PORT=java/jdk13 HOME=${LOCALBASE}/jdk1.3.1 \
183	VERSION=1.3.1 OS=native VENDOR=bsdjava	175	VERSION=1.3.1 OS=native VENDOR=bsdjava
184	_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO= PORT=java/jdk14 HOME=${LOCALBASE}/jdk1.4.2 \	176	_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4_INFO= PORT=java/jdk14 HOME=${LOCALBASE}/jdk1.4.2 \
Lines 187-198 Link Here
187	VERSION=1.5.0 OS=native VENDOR=bsdjava	179	VERSION=1.5.0 OS=native VENDOR=bsdjava
188	_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO= PORT=java/jdk16 HOME=${LOCALBASE}/jdk1.6.0 \	180	_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO= PORT=java/jdk16 HOME=${LOCALBASE}/jdk1.6.0 \
189	VERSION=1.6.0 OS=native VENDOR=bsdjava	181	VERSION=1.6.0 OS=native VENDOR=bsdjava
190	_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO= PORT=java/linux-blackdown-jdk12 HOME=${LOCALBASE}/linux-blackdown-jdk1.2.2 \
191	VERSION=1.2.2 OS=linux VENDOR=blackdown
192	_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO= PORT=java/linux-blackdown-jdk14 HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \	182	_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO= PORT=java/linux-blackdown-jdk14 HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \
193	VERSION=1.4.2 OS=linux VENDOR=blackdown	183	VERSION=1.4.2 OS=linux VENDOR=blackdown
194	_JAVA_PORT_LINUX_SUN_JDK_1_2_INFO= PORT=java/linux-sun-jdk12 HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \
195	VERSION=1.2.2 OS=linux VENDOR=sun
196	_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO= PORT=java/linux-sun-jdk13 HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \	184	_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO= PORT=java/linux-sun-jdk13 HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \
197	VERSION=1.3.1 OS=linux VENDOR=sun	185	VERSION=1.3.1 OS=linux VENDOR=sun
198	_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO= PORT=java/linux-sun-jdk14 HOME=${LOCALBASE}/linux-sun-jdk1.4.2 \	186	_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO= PORT=java/linux-sun-jdk14 HOME=${LOCALBASE}/linux-sun-jdk1.4.2 \
Lines 226-240 Link Here
226	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \	214	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
227	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \	215	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \
228	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \	216	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \
229	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2 \
230	JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 \
231	JAVA_PORT_LINUX_SUN_JDK_1_6 \	217	JAVA_PORT_LINUX_SUN_JDK_1_6 \
232	JAVA_PORT_LINUX_SUN_JDK_1_5 \	218	JAVA_PORT_LINUX_SUN_JDK_1_5 \
233	JAVA_PORT_LINUX_SUN_JDK_1_4 \	219	JAVA_PORT_LINUX_SUN_JDK_1_4 \
234	JAVA_PORT_LINUX_SUN_JDK_1_3 \	220	JAVA_PORT_LINUX_SUN_JDK_1_3 \
235	JAVA_PORT_LINUX_SUN_JDK_1_2 \	221	JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4
236	JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \
237	JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2
238	_JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \	222	_JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \
239	${_JAVA_PREFERRED_PORTS} \	223	${_JAVA_PREFERRED_PORTS} \
240	${__JAVA_PORTS_ALL}	224	${__JAVA_PORTS_ALL}
Lines 308-314 Link Here
308	. undef _JAVA_PORTS_INSTALLED	292	. undef _JAVA_PORTS_INSTALLED
309	. undef _JAVA_PORTS_POSSIBLE	293	. undef _JAVA_PORTS_POSSIBLE
310	. if defined(JAVA_VERSION)	294	. if defined(JAVA_VERSION)
311	_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4 1.5 1.6/:S/1.2+/1.2 1.3 1.4 1.5 1.6/:S/1.3+/1.3 1.4 1.5 1.6/:S/1.4+/1.4 1.5 1.6/:S/1.5+/1.5 1.6/:S/1.6+/1.6/}	295	_JAVA_VERSION= ${JAVA_VERSION:S/1.3+/1.3 1.4+/:S/1.4+/1.4 1.5+/:S/1.5+/1.5 1.6+/:S/1.6+/1.6/}
312	. else	296	. else
313	_JAVA_VERSION= ${__JAVA_VERSION_LIST}	297	_JAVA_VERSION= ${__JAVA_VERSION_LIST}
314	. endif	298	. endif
Lines 490-509 Link Here
490	JAVA_SERIALVER?=${JAVA_HOME}/bin/serialver	474	JAVA_SERIALVER?=${JAVA_HOME}/bin/serialver
491	RMIC?= ${JAVA_HOME}/bin/rmic	475	RMIC?= ${JAVA_HOME}/bin/rmic
492	RMIREGISTRY?= ${JAVA_HOME}/bin/rmiregistry	476	RMIREGISTRY?= ${JAVA_HOME}/bin/rmiregistry
493
494	# Some executables only exists in JDK 1.2 and up
495	. if ${_JAVA_PORT} != "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
496	JAVA_KEYTOOL?= ${JAVA_HOME}/bin/keytool	477	JAVA_KEYTOOL?= ${JAVA_HOME}/bin/keytool
497	JAVA_POLICYTOOL?= ${JAVA_HOME}/bin/policytool	478	JAVA_POLICYTOOL?= ${JAVA_HOME}/bin/policytool
498	RMID?= ${JAVA_HOME}/bin/rmid	479	RMID?= ${JAVA_HOME}/bin/rmid
499	. endif
500		480
501	# Set the location of the ZIP or JAR file with all standard Java classes.	481	# Set the location of the ZIP or JAR file with all standard Java classes.
502	. if ${_JAVA_PORT} == "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
503	JAVA_CLASSES= ${JAVA_HOME}/lib/classes.zip
504	. else
505	JAVA_CLASSES= ${JAVA_HOME}/jre/lib/rt.jar	482	JAVA_CLASSES= ${JAVA_HOME}/jre/lib/rt.jar
506	. endif
507		483
508		484
509	#-------------------------------------------------------------------------------	485	#-------------------------------------------------------------------------------