diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2002-11-11 18:04:54 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2002-11-11 18:04:54 +0000 |
| commit | 1a9af0dea3895cd8a7a84c2c06e3872271eb40bf (patch) | |
| tree | 0845c87a5223640dcad2b8424994f08532bd2392 /lang | |
| parent | 64bbc9220983b46ec5bdf5242cfdc61b3e9e79fd (diff) | |
| download | ports-1a9af0dea3895cd8a7a84c2c06e3872271eb40bf.tar.gz ports-1a9af0dea3895cd8a7a84c2c06e3872271eb40bf.zip | |
Implement USE_JAVA
PR: 41986
Submitted by: John Merryweather Cooper <coop9211@uidaho.edu>
Notes
Notes:
svn path=/head/; revision=69913
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/jgnat/Makefile | 9 | ||||
| -rw-r--r-- | lang/jgnat/files/patch-aa | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lang/jgnat/Makefile b/lang/jgnat/Makefile index 4fa172d05093..b4825630ec81 100644 --- a/lang/jgnat/Makefile +++ b/lang/jgnat/Makefile @@ -7,7 +7,7 @@ PORTNAME= jgnat PORTVERSION= 1.1.p -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang java MASTER_SITES= ftp://cs.nyu.edu/pub/gnat/jgnat/jgnat-1.1p/split-1.1p/ \ ftp://ftp.cdrom.com/pub/languages/ada/compiler/gnat/jgnat/jgnat-1.1p/split-1.1p/ \ @@ -21,12 +21,12 @@ MASTER_SITES= ftp://cs.nyu.edu/pub/gnat/jgnat/jgnat-1.1p/split-1.1p/ \ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/\1/}-src EXTRACT_SUFX= .tgz -MAINTAINER= jmcoopr@webmail.bmi.net +MAINTAINER= coop9211@uidaho.edu -BUILD_DEPENDS= ${LOCALBASE}/bin/adagcc:${PORTSDIR}/lang/gnat \ - ${LOCALBASE}/jdk1.2.2/bin/javac:${PORTSDIR}/java/jdk12 +BUILD_DEPENDS= ${LOCALBASE}/bin/adagcc:${PORTSDIR}/lang/gnat USE_GMAKE= yes +USE_JAVA= 1.2+ WRKSRC= ${WRKDIR}/${DISTNAME:C@-([^\-]+)$@/\1@} @@ -36,6 +36,7 @@ LIBDIR= ${PREFIX}/lib/jgnat ADAINCDIR= ${LIBDIR}/adainclude ADALIBDIR= ${LIBDIR}/adalib JARDIR= ${PREFIX}/share/java/classes +MAKE_ENV+= JAVA_HOME=${JAVA_HOME} do-install: .for dir in ${LIBDIR} ${ADAINCDIR} ${ADALIBDIR} ${JARDIR} diff --git a/lang/jgnat/files/patch-aa b/lang/jgnat/files/patch-aa index 269a6695c390..3b1b20ccc669 100644 --- a/lang/jgnat/files/patch-aa +++ b/lang/jgnat/files/patch-aa @@ -22,14 +22,14 @@ LIB_FLAGS = -O -gnatgp -gnata STRIP = -s - JAR = jar c0f -+ JAR = $(LOCALBASE)/jdk1.2.2/bin/jar c0f ++ JAR = $(JAVA_HOME)/bin/jar c0f else C_FLAGS = -O TOOL_FLAGS = -g -O -gnatgpa LIB_FLAGS = -g -O -gnatgpa STRIP = - JAR = jar c0f -+ JAR = $(LOCALBASE)/jdk1.2.2/bin/jar c0f ++ JAR = $(JAVA_HOME)/bin/jar c0f endif ################################# @@ -45,7 +45,7 @@ # JGNAT compiler to build the Ada part of the JGNAT library -JAVAC = javac -deprecation -classpath $(LIB)$(JDK11_LIB) -+JAVAC = $(LOCALBASE)/jdk1.2.2/bin/javac -deprecation -classpath $(LIB)$(JDK11_LIB) ++JAVAC = $(JAVA_HOME)/bin/javac -deprecation -classpath $(LIB)$(JDK11_LIB) # The Java compiler to build the Java part of the JGNAT library ########################################### |