5 files changed, 89 insertions, 40 deletions

diff --git a/lang/jgnat/Makefile b/lang/jgnat/Makefile
index d0346b10afb2..a7352434f0a9 100644
--- a/lang/jgnat/Makefile
+++ b/lang/jgnat/Makefile
@@ -6,34 +6,44 @@
 #
 
 PORTNAME=	jgnat
-PORTVERSION=	1.0.p
-DISTNAME=	${PORTNAME}-1.0p-src
-CATEGORIES=	lang
-MASTER_SITES=	ftp://cs.nyu.edu/pub/gnat/jgnat/jgnat-1.0p/split-1.0p/ \
-		ftp://ftp.lip6.fr/pub/gnat/jgnat/jgnat-1.0p/split-1.0p/
+PORTVERSION=	1.1.p
+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/ \
+		ftp://wuarchive.wustl.edu/languages/ada/compiler/gnat/jgnat/jgnat-1.1p/split-1.1p/ \
+		ftp://ftp.cs.kuleuven.ac.be/pub/Ada-Belgium/mirrors/cs.nyu.edu/pub/gnat/jgnat/jgnat-1.1p/split-1.1p/ \
+		ftp://ftp.cs.tu-berlin.de/pub/gnat/jgnat/jgnat-1.1p/split-1.1p/ \
+		ftp://ftp.informatik.rwth-aachen.de/pub/mirror/cs.nyu.edu/pub/gnat/jgnat/jgnat-1.1p/split-1.1p/ \
+		ftp://ftp.lip6.fr/pub/gnat/jgnat/jgnat-1.1p/split-1.1p/ \
+		ftp://ftp.cnam.fr/pub/Ada/PAL/compiler/gnat/jgnat/jgnat-1.1p/split-1.1p/ \
+		ftp://ftp.fsz.bme.hu/pub/ada/gnat/jgnat/jgnat-1.1p/split-1.1p/
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([^\.]+)$/\1/}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jmcoopr@webmail.bmi.net
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/adagcc:${PORTSDIR}/lang/gnat \
-		${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk
+		${LOCALBASE}/jdk1.2.2/bin/javac:${PORTSDIR}/java/jdk12-beta
 
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/jgnat-1.0p/src
+WRKSRC=		${WRKDIR}/${DISTNAME:C@-([^\-]+)$@/\1@}
 
 LIBDIR=		${PREFIX}/lib/jgnat
 ADAINCDIR=	${LIBDIR}/adainclude
 ADALIBDIR=	${LIBDIR}/adalib
 
 do-install:
-	-${MKDIR} ${LIBDIR}
-	-${MKDIR} ${ADAINCDIR}
-	-${MKDIR} ${ADALIBDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/* ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/../lib/jgnat.jar ${LIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/../lib/jgnat/adainclude/* ${ADAINCDIR}
-	${INSTALL_DATA} ${WRKSRC}/../lib/jgnat/adalib/* ${ADALIBDIR}
-	${CHMOD} a-r ${ADALIBDIR}/*.ali
+.for dir in ${LIBDIR} ${ADAINCDIR} ${ADALIBDIR}
+	@${MKDIR} ${dir}
+.endfor
+	@${INSTALL_PROGRAM} ${WRKSRC}/../bin/* ${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/../lib/jgnat.jar ${LIBDIR}
+	@${INSTALL_DATA} ${WRKSRC}/../lib/jgnat/adainclude/* ${ADAINCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/../lib/jgnat/adalib/* ${ADALIBDIR}
+	@${CHMOD} a-r ${ADALIBDIR}/*.ali
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/lang/jgnat/distinfo b/lang/jgnat/distinfo
index 16c672983757..6513c3c3cf78 100644
--- a/lang/jgnat/distinfo
+++ b/lang/jgnat/distinfo
@@ -1 +1 @@
-MD5 (jgnat-1.0p-src.tgz) = 9b42bb0bf94695cc3b7495ced4609144
+MD5 (jgnat-1.1p-src.tgz) = 189045fee82e1a8f8d49af0543cc4e00
diff --git a/lang/jgnat/files/patch-aa b/lang/jgnat/files/patch-aa
index 7dee6b7877a8..269a6695c390 100644
--- a/lang/jgnat/files/patch-aa
+++ b/lang/jgnat/files/patch-aa
@@ -1,24 +1,15 @@
---- Makefile.orig	Mon Mar 27 18:56:24 2000
-+++ Makefile	Tue Apr  4 21:00:47 2000
-@@ -66,7 +66,7 @@
- DEBUG_JGNAT =
- # Set this variable if you want to be able to debug the JGNAT toolchain
- 
--JDK11_LIB =
-+JDK11_LIB =	:/usr/local/jdk1.1.8/lib/classes.zip
- # Needed only if you are using Sun's JDK 1.1.*. Leave this blank for JDK 1.2.*.
- # Path separator followed by the zip file containing the JDK 1.1 lib
- # installed on the machine on which you are doing the build.  For instance, on
+--- Makefile	Fri Sep  1 10:15:37 2000
++++ Makefile.new	Thu Jul 19 16:20:54 2001
 @@ -82,7 +82,7 @@
- VERSION = 1.0p
+ VERSION = 1.1p
  # The current version number of JGNAT
  
 -HOST = ${shell gcc -dumpmachine}
 +HOST = ${shell adagcc -dumpmachine}
- # Name of the host computer on which the JGNAT executables were built
+ # Name of the host computer on which the JGNAT executables were built. When the
+ # HOST is Windows NT this variable is set to "nt" and it is overriden below.
  
- TGZ = tgz
-@@ -236,6 +236,7 @@
+@@ -238,6 +238,7 @@
  CD    = cd
  CP    = cp -p -f
  ECHO  = echo
@@ -26,16 +17,23 @@
  MKDIR = mkdir -p
  MV    = mv -f
  PWD   = pwd
-@@ -277,7 +278,7 @@
+@@ -279,13 +280,13 @@
     TOOL_FLAGS = -O2 -gnatgp -gnata
     LIB_FLAGS  = -O  -gnatgp -gnata
     STRIP      = -s
 -   JAR        = jar c0f
-+   JAR        = /usr/local/jdk1.1.8/bin/jar c0f
++   JAR        = $(LOCALBASE)/jdk1.2.2/bin/jar c0f
  else
     C_FLAGS    = -O
     TOOL_FLAGS = -g -O -gnatgpa
-@@ -325,13 +326,13 @@
+    LIB_FLAGS  = -g -O -gnatgpa
+    STRIP      =
+-   JAR        = jar c0f
++   JAR        = $(LOCALBASE)/jdk1.2.2/bin/jar c0f
+ endif
+ 
+ #################################
+@@ -327,13 +328,13 @@
                            $(EXTRA_LINK_FLAGS)
  # Linker flags used to build the $(GNATMAKE_CUR_LIB) executables
  
@@ -47,11 +45,11 @@
  # JGNAT compiler to build the Ada part of the JGNAT library
  
 -JAVAC = javac -deprecation -classpath $(LIB)$(JDK11_LIB)
-+JAVAC = /usr/local/jdk1.1.8/bin/javac -deprecation -classpath $(LIB)$(JDK11_LIB)
++JAVAC = $(LOCALBASE)/jdk1.2.2/bin/javac -deprecation -classpath $(LIB)$(JDK11_LIB)
  # The Java compiler to build the Java part of the JGNAT library
  
  ###########################################
-@@ -410,12 +411,12 @@
+@@ -412,12 +413,12 @@
  
  clean_bin : check_vars
  	$(CD) $(BIN); $(RM) $(HOST_TOOLS_EXE)
@@ -68,7 +66,7 @@
  	$(RM) $(LIB)/*.jar
  
  ########
-@@ -1316,7 +1317,7 @@
+@@ -1425,7 +1426,7 @@
  else
  	$(CD) $(LIB); $(JAR) $(JGNAT_JAR) jgnat/adalib/*.class
  endif
diff --git a/lang/jgnat/pkg-message b/lang/jgnat/pkg-message
new file mode 100644
index 000000000000..54e0fe8ebf69
--- /dev/null
+++ b/lang/jgnat/pkg-message
@@ -0,0 +1,17 @@
+
+-----------------------------------------------------------------------
+
+In any session you wish to use jgnat, you MUST set the PATH and
+CLASSPATH environment variables correctly.
+
+For example, if your PREFIX is /usr/local (the default) and you are
+using /bin/sh, you should:
+
+--Do nothing to the PATH as /usr/local/bin is already in the path;
+
+--Set your CLASSPATH as follows:
+
+	$CLASSPATH=.:/usr/local/lib/gnat/jgnat.jar:$CLASSPATH
+	$export CLASSPATH
+
+-----------------------------------------------------------------------
diff --git a/lang/jgnat/pkg-plist b/lang/jgnat/pkg-plist
index de391e160eeb..eafc5ca3fff1 100644
--- a/lang/jgnat/pkg-plist
+++ b/lang/jgnat/pkg-plist
@@ -25,6 +25,8 @@ lib/jgnat/adainclude/a-comlin.ads
 lib/jgnat/adainclude/a-cwila1.ads
 lib/jgnat/adainclude/a-decima.adb
 lib/jgnat/adainclude/a-decima.ads
+lib/jgnat/adainclude/a-direio.adb
+lib/jgnat/adainclude/a-direio.ads
 lib/jgnat/adainclude/a-dynpri.adb
 lib/jgnat/adainclude/a-dynpri.ads
 lib/jgnat/adainclude/a-except.adb
@@ -75,6 +77,8 @@ lib/jgnat/adainclude/a-reatim.adb
 lib/jgnat/adainclude/a-reatim.ads
 lib/jgnat/adainclude/a-retide.adb
 lib/jgnat/adainclude/a-retide.ads
+lib/jgnat/adainclude/a-sequio.adb
+lib/jgnat/adainclude/a-sequio.ads
 lib/jgnat/adainclude/a-sfteio.ads
 lib/jgnat/adainclude/a-sfwtio.ads
 lib/jgnat/adainclude/a-siteio.ads
@@ -193,6 +197,7 @@ lib/jgnat/adainclude/a-wtmoio.ads
 lib/jgnat/adainclude/a-wttest.adb
 lib/jgnat/adainclude/a-wttest.ads
 lib/jgnat/adainclude/calendar.ads
+lib/jgnat/adainclude/directio.ads
 lib/jgnat/adainclude/g-busora.adb
 lib/jgnat/adainclude/g-busora.ads
 lib/jgnat/adainclude/g-busorg.adb
@@ -229,6 +234,8 @@ lib/jgnat/adainclude/i-javlan.ads
 lib/jgnat/adainclude/interfac.ads
 lib/jgnat/adainclude/ioexcept.ads
 lib/jgnat/adainclude/java.ads
+lib/jgnat/adainclude/s-addima.adb
+lib/jgnat/adainclude/s-addima.ads
 lib/jgnat/adainclude/s-arit64.adb
 lib/jgnat/adainclude/s-arit64.ads
 lib/jgnat/adainclude/s-assert.adb
@@ -238,6 +245,8 @@ lib/jgnat/adainclude/s-atacco.ads
 lib/jgnat/adainclude/s-bitops.adb
 lib/jgnat/adainclude/s-bitops.ads
 lib/jgnat/adainclude/s-chepoo.ads
+lib/jgnat/adainclude/s-direio.adb
+lib/jgnat/adainclude/s-direio.ads
 lib/jgnat/adainclude/s-exnflt.ads
 lib/jgnat/adainclude/s-exngen.adb
 lib/jgnat/adainclude/s-exngen.ads
@@ -309,6 +318,8 @@ lib/jgnat/adainclude/s-imgwch.adb
 lib/jgnat/adainclude/s-imgwch.ads
 lib/jgnat/adainclude/s-imgwiu.adb
 lib/jgnat/adainclude/s-imgwiu.ads
+lib/jgnat/adainclude/s-io.adb
+lib/jgnat/adainclude/s-io.ads
 lib/jgnat/adainclude/s-mantis.adb
 lib/jgnat/adainclude/s-mantis.ads
 lib/jgnat/adainclude/s-osinte.ads
@@ -316,6 +327,12 @@ lib/jgnat/adainclude/s-osprim.adb
 lib/jgnat/adainclude/s-osprim.ads
 lib/jgnat/adainclude/s-parame.adb
 lib/jgnat/adainclude/s-parame.ads
+lib/jgnat/adainclude/s-pooglo.adb
+lib/jgnat/adainclude/s-pooglo.ads
+lib/jgnat/adainclude/s-pooloc.adb
+lib/jgnat/adainclude/s-pooloc.ads
+lib/jgnat/adainclude/s-poosiz.adb
+lib/jgnat/adainclude/s-poosiz.ads
 lib/jgnat/adainclude/s-powtab.ads
 lib/jgnat/adainclude/s-proinf.adb
 lib/jgnat/adainclude/s-proinf.ads
@@ -323,6 +340,8 @@ lib/jgnat/adainclude/s-rpc.adb
 lib/jgnat/adainclude/s-rpc.ads
 lib/jgnat/adainclude/s-secsta.adb
 lib/jgnat/adainclude/s-secsta.ads
+lib/jgnat/adainclude/s-sequio.adb
+lib/jgnat/adainclude/s-sequio.ads
 lib/jgnat/adainclude/s-soflin.adb
 lib/jgnat/adainclude/s-soflin.ads
 lib/jgnat/adainclude/s-sopco3.adb
@@ -335,8 +354,6 @@ lib/jgnat/adainclude/s-stache.adb
 lib/jgnat/adainclude/s-stache.ads
 lib/jgnat/adainclude/s-stalib.adb
 lib/jgnat/adainclude/s-stalib.ads
-lib/jgnat/adainclude/s-std.adb
-lib/jgnat/adainclude/s-std.ads
 lib/jgnat/adainclude/s-stoele.adb
 lib/jgnat/adainclude/s-stoele.ads
 lib/jgnat/adainclude/s-stopoo.ads
@@ -438,6 +455,7 @@ lib/jgnat/adainclude/s-wwdenu.adb
 lib/jgnat/adainclude/s-wwdenu.ads
 lib/jgnat/adainclude/s-wwdwch.adb
 lib/jgnat/adainclude/s-wwdwch.ads
+lib/jgnat/adainclude/sequenio.ads
 lib/jgnat/adainclude/system.ads
 lib/jgnat/adainclude/text_io.ads
 lib/jgnat/adainclude/unchconv.ads
@@ -556,10 +574,12 @@ lib/jgnat/adalib/i-javlan.ali
 lib/jgnat/adalib/interfac.ali
 lib/jgnat/adalib/ioexcept.ali
 lib/jgnat/adalib/java.ali
+lib/jgnat/adalib/s-addima.ali
 lib/jgnat/adalib/s-arit64.ali
 lib/jgnat/adalib/s-assert.ali
 lib/jgnat/adalib/s-bitops.ali
 lib/jgnat/adalib/s-chepoo.ali
+lib/jgnat/adalib/s-direio.ali
 lib/jgnat/adalib/s-exnflt.ali
 lib/jgnat/adalib/s-exngen.ali
 lib/jgnat/adalib/s-exnint.ali
@@ -606,21 +626,25 @@ lib/jgnat/adalib/s-imgrea.ali
 lib/jgnat/adalib/s-imguns.ali
 lib/jgnat/adalib/s-imgwch.ali
 lib/jgnat/adalib/s-imgwiu.ali
+lib/jgnat/adalib/s-io.ali
 lib/jgnat/adalib/s-mantis.ali
 lib/jgnat/adalib/s-osinte.ali
 lib/jgnat/adalib/s-osprim.ali
 lib/jgnat/adalib/s-parame.ali
+lib/jgnat/adalib/s-pooglo.ali
+lib/jgnat/adalib/s-pooloc.ali
+lib/jgnat/adalib/s-poosiz.ali
 lib/jgnat/adalib/s-powtab.ali
 lib/jgnat/adalib/s-proinf.ali
 lib/jgnat/adalib/s-rpc.ali
 lib/jgnat/adalib/s-secsta.ali
+lib/jgnat/adalib/s-sequio.ali
 lib/jgnat/adalib/s-soflin.ali
 lib/jgnat/adalib/s-sopco3.ali
 lib/jgnat/adalib/s-sopco4.ali
 lib/jgnat/adalib/s-sopco5.ali
 lib/jgnat/adalib/s-stache.ali
 lib/jgnat/adalib/s-stalib.ali
-lib/jgnat/adalib/s-std.ali
 lib/jgnat/adalib/s-stoele.ali
 lib/jgnat/adalib/s-stopoo.ali
 lib/jgnat/adalib/s-stratt.ali