6 files changed, 35 insertions, 69 deletions

diff --git a/lang/gnat-glade/Makefile b/lang/gnat-glade/Makefile
index 69d323d85714..3051ca764017 100644
--- a/lang/gnat-glade/Makefile
+++ b/lang/gnat-glade/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    gnat-glade
-# Date created:         3 Mai 2000
+# Date created:         3 May 2000
 # Whom:                 sam@inf.enst.fr
 #
 # $FreeBSD$
 #
 
 PORTNAME= 	gnat-glade
-PORTVERSION= 	3.12p
+PORTVERSION= 	3.13p
 CATEGORIES=	lang
-MASTER_SITES=	ftp://cs.nyu.edu/pub/gnat/glade/
+MASTER_SITES=	ftp://cs.nyu.edu/pub/gnat/${PORTVERSION}/glade/
 DISTNAME=	glade-${PORTVERSION}-src
 
 MAINTAINER=	sam@inf.enst.fr
diff --git a/lang/gnat-glade/distinfo b/lang/gnat-glade/distinfo
index b400f45d560f..331a295e6a4e 100644
--- a/lang/gnat-glade/distinfo
+++ b/lang/gnat-glade/distinfo
@@ -1 +1 @@
-MD5 (glade-3.12p-src.tar.gz) = ce1682956893c2f5037f76dccc554fd4
+MD5 (glade-3.13p-src.tar.gz) = 7b39a9f53f637698db6d5df4a184f996
diff --git a/lang/gnat-glade/files/patch-ab b/lang/gnat-glade/files/patch-ab
deleted file mode 100644
index ae7ab74a257e..000000000000
--- a/lang/gnat-glade/files/patch-ab
+++ /dev/null
@@ -1,46 +0,0 @@
---- Garlic/split.adb.orig	Wed May  3 19:43:33 2000
-+++ Garlic/split.adb	Wed May  3 19:45:24 2000
-@@ -38,8 +38,20 @@
- 
- procedure Split is
- 
--   Column     : Natural  := 0;
--   Max_Column : constant := 50;
-+   Column          : Natural  := 0;
-+   Max_Column      : constant := 65;
-+   Hard_Max_Column : constant := 78;
-+   Was_Space       : Boolean  := False;
-+
-+   procedure Print_Space_Maybe;
-+
-+   procedure Print_Space_Maybe is
-+   begin
-+      if Was_Space and then Column /= 0 then
-+         Put (' ');
-+         Was_Space := False;
-+      end if;
-+   end Print_Space_Maybe;
- 
- begin
-    if Argument_Count /= 1 then
-@@ -50,9 +62,20 @@
-          if Argument (1) (I) = ' ' and then Column >= Max_Column then
-             New_Line;
-             Column := 0;
-+         elsif Argument (1) (I) = ' ' and then Column = 0 then
-+            null;
-+         elsif Column >= Hard_Max_Column then
-+            New_Line;
-+            Put ("--  " & Argument (1) (I));
-+            Column := 5;
-+         elsif Argument (1) (I) = ' ' then
-+            Was_Space := True;
-          else
-             if Column = 0 then
-                Put ("--  ");
-+               Column := 4;
-+            else
-+               Print_Space_Maybe;
-             end if;
-             Put (Argument (1) (I));
-             Column := Column + 1;
diff --git a/lang/gnat-glade/files/patch-ac b/lang/gnat-glade/files/patch-ac
index 2452aa6d984c..646677f32f61 100644
--- a/lang/gnat-glade/files/patch-ac
+++ b/lang/gnat-glade/files/patch-ac
@@ -1,11 +1,11 @@
---- Dist/xe_utils.adb.orig	Wed May  3 20:07:33 2000
-+++ Dist/xe_utils.adb	Wed May  3 20:07:44 2000
-@@ -629,7 +629,7 @@
+--- Dist/xe_utils.adb.orig	Mon Nov 13 11:33:17 2000
++++ Dist/xe_utils.adb	Mon Nov 13 11:33:22 2000
+@@ -630,7 +630,7 @@
        Obj_Suffix           := Str_To_Id (Get_Object_Suffix.all);
        Exe_Suffix           := Str_To_Id (Get_Executable_Suffix.all);
  
 -      Gcc             := Locate ("gcc");
 +      Gcc             := Locate ("adagcc");
-       Mkdir           := Locate ("mkdir");
-       Copy            := Locate ("cp");
        Link            := Locate ("ln", False);
+       Gnatbind        := Locate ("gnatbind");
+       Gnatlink        := Locate ("gnatlink");
diff --git a/lang/gnat-glade/files/patch-ag b/lang/gnat-glade/files/patch-ag
new file mode 100644
index 000000000000..612088e57654
--- /dev/null
+++ b/lang/gnat-glade/files/patch-ag
@@ -0,0 +1,11 @@
+--- Garlic/constants.sh.orig	Fri May 26 11:56:25 2000
++++ Garlic/constants.sh	Sun Oct 22 17:24:43 2000
+@@ -48,7 +48,7 @@
+    cat > ${fname} << EOF
+ --  This package has been generated automatically on:
+ EOF
+-   ./split "`uname -a`" >> ${fname}
++   ./split "`uname -s -r`" >> ${fname}
+ echo "--  Generation date: `date`" >> ${fname}
+ cat >> ${fname} << EOF
+ --  Any change you make here is likely to be lost !
diff --git a/lang/gnat-glade/pkg-plist b/lang/gnat-glade/pkg-plist
index 4a99af2b13fd..6ab0935e406a 100644
--- a/lang/gnat-glade/pkg-plist
+++ b/lang/gnat-glade/pkg-plist
@@ -1,5 +1,6 @@
 bin/gnatdist
 lib/garlic/libgnat.a
+lib/garlic/libgnarl.a
 lib/garlic/s-gtplsp.ads
 lib/garlic/s-gartcp.ads
 lib/garlic/s-gartcp.adb
@@ -15,10 +16,16 @@ lib/garlic/s-gafizi.adb
 lib/garlic/s-galiop.ads
 lib/garlic/s-galite.ads
 lib/garlic/s-galite.adb
+lib/garlic/s-ganata.ads
+lib/garlic/s-ganata.adb
 lib/garlic/s-ganeut.ads
 lib/garlic/s-ganeut.adb
 lib/garlic/s-gaphlo.ads
 lib/garlic/s-gaphlo.adb
+lib/garlic/s-gaprco.ads
+lib/garlic/s-gaprco.adb
+lib/garlic/s-gaprob.ads
+lib/garlic/s-gaprob.adb
 lib/garlic/s-garcon.ads
 lib/garlic/s-gardeb.ads
 lib/garlic/s-gardeb.adb
@@ -29,16 +36,12 @@ lib/garlic/s-gargro.adb
 lib/garlic/s-garhea.ads
 lib/garlic/s-garhea.adb
 lib/garlic/s-garlic.ads
-lib/garlic/s-garloc.ads
-lib/garlic/s-garloc.adb
 lib/garlic/s-garopt.ads
 lib/garlic/s-garopt.adb
 lib/garlic/s-garpar.ads
 lib/garlic/s-garpar.adb
 lib/garlic/s-garpro.ads
 lib/garlic/s-garpri.ads
-lib/garlic/s-ganata.ads
-lib/garlic/s-ganata.adb
 lib/garlic/s-garpro.adb
 lib/garlic/s-garexc.ads
 lib/garlic/s-garexc.adb
@@ -51,27 +54,25 @@ lib/garlic/s-garsta.adb
 lib/garlic/s-garstr.ads
 lib/garlic/s-garstr.adb
 lib/garlic/s-garthi.ads
+lib/garlic/s-garthi.adb
 lib/garlic/s-gartra.ads
 lib/garlic/s-gartra.adb
-lib/garlic/s-gaprco.ads
-lib/garlic/s-gaprco.adb
 lib/garlic/s-garela.ads
 lib/garlic/s-garela.adb
-lib/garlic/s-garter.ads
-lib/garlic/s-garter.adb
 lib/garlic/s-gartab.ads
 lib/garlic/s-gartab.adb
+lib/garlic/s-garter.ads
+lib/garlic/s-garter.adb
 lib/garlic/s-gartyp.ads
-lib/garlic/s-gartyp.adb
 lib/garlic/s-garuni.ads
 lib/garlic/s-garuni.adb
 lib/garlic/s-garuti.ads
 lib/garlic/s-garuti.adb
 lib/garlic/s-gasoli.ads
 lib/garlic/s-gasoli.adb
-lib/garlic/s-gatcop.ads
 lib/garlic/s-gastha.ads
 lib/garlic/s-gastha.adb
+lib/garlic/s-gatcop.ads
 lib/garlic/s-parint.ads
 lib/garlic/s-parint.adb
 lib/garlic/s-rpc.ads
@@ -93,26 +94,26 @@ lib/garlic/s-galite.ali
 lib/garlic/s-ganata.ali
 lib/garlic/s-ganeut.ali
 lib/garlic/s-gaphlo.ali
+lib/garlic/s-gaprco.ali
+lib/garlic/s-gaprob.ali
 lib/garlic/s-garcon.ali
 lib/garlic/s-gardeb.ali
+lib/garlic/s-garela.ali
 lib/garlic/s-garexc.ali
 lib/garlic/s-garfil.ali
 lib/garlic/s-gargro.ali
 lib/garlic/s-garhea.ali
 lib/garlic/s-garlic.ali
-lib/garlic/s-garloc.ali
 lib/garlic/s-garopt.ali
-lib/garlic/s-garela.ali
 lib/garlic/s-garpar.ali
 lib/garlic/s-garpri.ali
 lib/garlic/s-garpro.ali
 lib/garlic/s-garrep.ali
 lib/garlic/s-garser.ali
 lib/garlic/s-garsta.ali
-lib/garlic/s-gartra.ali
-lib/garlic/s-gaprco.ali
 lib/garlic/s-garstr.ali
 lib/garlic/s-gartab.ali
+lib/garlic/s-gartra.ali
 lib/garlic/s-garthi.ali
 lib/garlic/s-garter.ali
 lib/garlic/s-gartyp.ali