- Update to 2005;

- Take maintainership.

PR:		ports/95055
Submitted by:	Max E. Kuznecov <mek (at) mek.uz.ua>

18 files changed, 270 insertions, 326 deletions

diff --git a/lang/glade-gpl/Makefile b/lang/glade-gpl/Makefile
index 38e3e9b..7346a35 100644
--- a/lang/glade-gpl/Makefile
+++ b/lang/glade-gpl/Makefile
@@ -6,36 +6,35 @@
 #
 
 PORTNAME=	gnat-glade
-PORTVERSION=	3.15p
-PORTREVISION=	1
+PORTVERSION=	2005
 CATEGORIES=	lang
-MASTER_SITES=	ftp://cs.nyu.edu/pub/gnat/${PORTVERSION}/glade/
-DISTNAME=	glade-${PORTVERSION}-src
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+DISTNAME=	glade-gpl-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mek@mek.uz.ua
 COMMENT=	GNU Ada distributed systems annex
 
-BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
+BUILD_DEPENDS=	gnatgcc:${PORTSDIR}/lang/gnat
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500039
-WITHOUT_CPU_CFLAGS=	yes
-.endif
-USE_AUTOTOOLS=	automake:14 autoconf:213
-CONFIGURE_ENV=	ADA=adagcc
+USE_AUTOTOOLS=	automake:14 autoconf:259
 USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --program-transform-name=''
 
-ADACFLAGS?=
-CFLAGS=${ADACFLAGS}
-
-pre-configure:
-	${PERL} -pi -e "s@aclocal\)@${ACLOCAL})@g;\
-			s@automake\)@${AUTOMAKE})@g" ${WRKSRC}/aclocal.m4
+.include <bsd.port.pre.mk>
 
-post-install:
-	${STRIP_CMD} ${PREFIX}/bin/gnatdist
+# Check for GLADE sources.
+GLADE_SRC=${DISTNAME}${EXTRACT_SUFX}
+
+.if !exists(${DISTDIR}/${GLADE_SRC}) && !defined(PACKAGE_BUILDING)
+ECHO_MSG=/usr/bin/printf
+IGNORE=: Because of licensing and registration restrictions,\n\
+you must fetch the source distribution manually.\n\
+Please access http://libre.adacore.com/\n\
+with a web browser, register (it's free), and log in.  Download the source\n\
+file:\n\
+\t${DISTFILES}\n\
+and place it in ${DISTDIR}.\n
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/glade-gpl/distinfo b/lang/glade-gpl/distinfo
index f266e10..6252692 100644
--- a/lang/glade-gpl/distinfo
+++ b/lang/glade-gpl/distinfo
@@ -1,3 +1,3 @@
-MD5 (glade-3.15p-src.tgz) = 44e478a03eef8d65d597558f826b3128
-SHA256 (glade-3.15p-src.tgz) = 14f7e07e9e2ce042e66180f52651a2b92cace79e92af502bb0f16b13211df040
-SIZE (glade-3.15p-src.tgz) = 1061859
+MD5 (glade-gpl-2005-src.tgz) = b874e42e754bcd0b02925ff083d40092
+SHA256 (glade-gpl-2005-src.tgz) = ef1764e451a1027e2e177db75c77871982c50f8ce42edb577727f6d643520308
+SIZE (glade-gpl-2005-src.tgz) = 517331
diff --git a/lang/glade-gpl/files/patch-Garlic-Makefile.am b/lang/glade-gpl/files/patch-Garlic-Makefile.am
new file mode 100644
index 0000000..1ef6315
--- /dev/null
+++ b/lang/glade-gpl/files/patch-Garlic-Makefile.am
@@ -0,0 +1,16 @@
+--- Garlic/Makefile.am.orig	Tue Mar 28 02:43:13 2006
++++ Garlic/Makefile.am	Tue Mar 28 02:43:23 2006
+@@ -164,13 +164,11 @@
+ 
+ s-galiop.ads:
+ 	@echo "private package System.Garlic.Linker_Options is" >s-galiop.ads
+-	@echo "" >>s-galiop.ads
+ 	@if [ "x$(EXTRA_LIBS)" != "x" ] ; then\
+ 	 for option in `echo $(EXTRA_LIBS)`; do\
+ 	  echo "   pragma Linker_Options (\"$$option\");" >>s-galiop.ads;\
+ 	 done;\
+ 	fi
+-	@echo "" >>s-galiop.ads
+ 	@echo "end System.Garlic.Linker_Options;" >>s-galiop.ads
+ 
+ used:
diff --git a/lang/glade-gpl/files/patch-ac b/lang/glade-gpl/files/patch-ac
deleted file mode 100644
index 646677f..0000000
--- a/lang/glade-gpl/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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");
-       Link            := Locate ("ln", False);
-       Gnatbind        := Locate ("gnatbind");
-       Gnatlink        := Locate ("gnatlink");
diff --git a/lang/glade-gpl/files/patch-ad b/lang/glade-gpl/files/patch-ad
deleted file mode 100644
index 0ba7673..0000000
--- a/lang/glade-gpl/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- Dist/xe_usage.adb.orig	Wed May  3 20:07:54 2000
-+++ Dist/xe_usage.adb	Wed May  3 20:08:07 2000
-@@ -70,7 +70,7 @@
-    Write_Eol;
- 
-    Write_Str ("Gcc switches such as -g, -O, etc.");
--   Write_Str (" are directly passed to gcc");
-+   Write_Str (" are directly passed to adagcc");
-    Write_Eol;
-    Write_Eol;
- 
diff --git a/lang/glade-gpl/files/patch-ae b/lang/glade-gpl/files/patch-ae
deleted file mode 100644
index 4caa6e5..0000000
--- a/lang/glade-gpl/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- ada/ali.adb.orig	Wed May  3 20:09:02 2000
-+++ ada/ali.adb	Wed May  3 20:09:13 2000
-@@ -220,7 +220,7 @@
-          Write_Str (" is incorrectly formatted");
-          Write_Eol;
-          Write_Str
--           ("make sure you are using consistent versions of gcc/gnatbind");
-+           ("make sure you are using consistent versions of adagcc/gnatbind");
-          Write_Eol;
- 
-          --  Find start of line
diff --git a/lang/glade-gpl/files/patch-af b/lang/glade-gpl/files/patch-af
deleted file mode 100644
index 27378b0..0000000
--- a/lang/glade-gpl/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- ada/make.adb.orig	Wed May  3 20:09:55 2000
-+++ ada/make.adb	Wed May  3 20:10:20 2000
-@@ -238,7 +238,7 @@
-    -- Compiler, Binder & Linker Data and Subprograms --
-    ----------------------------------------------------
- 
--   Gcc             : String_Access := Program_Name ("gcc");
-+   Gcc             : String_Access := Program_Name ("adagcc");
-    Gnatbind        : String_Access := Program_Name ("gnatbind");
-    Gnatlink        : String_Access := Program_Name ("gnatlink");
-    --  Default compiler, binder, linker programs
diff --git a/lang/glade-gpl/pkg-descr b/lang/glade-gpl/pkg-descr
index 790d076..a410c53 100644
--- a/lang/glade-gpl/pkg-descr
+++ b/lang/glade-gpl/pkg-descr
@@ -1,7 +1,7 @@
 GLADE is GNAT's companion package for building distributed systems in Ada.
 GNAT+GLADE is a complete implementation of the Ada 95 programming language.
 
-WWW: http://www.gnat.com/
+WWW: http://libre.act-europe.com/
 
 Note: because of the existence of GLADE, the GTK GUI builder, this package
       has been renamed gnat-glade, as is done in Linux distributions such
diff --git a/lang/glade-gpl/pkg-plist b/lang/glade-gpl/pkg-plist
index d91a8b0..0f6deb5 100644
--- a/lang/glade-gpl/pkg-plist
+++ b/lang/glade-gpl/pkg-plist
@@ -1,137 +1,138 @@
 bin/gnatdist
-lib/garlic/libgnat.a
+lib/garlic/libgarlic.a
 lib/garlic/libgnarl.a
-lib/garlic/s-gaprtc.ads
-lib/garlic/s-gaprtc.adb
-lib/garlic/s-gptcse.ads
-lib/garlic/s-gptcse.adb
-lib/garlic/s-gafizi.ads
+lib/garlic/libgnat.a
 lib/garlic/s-gafizi.adb
+lib/garlic/s-gafizi.ads
+lib/garlic/s-gafizi.ali
 lib/garlic/s-galiop.ads
-lib/garlic/s-ganata.ads
+lib/garlic/s-galiop.ali
 lib/garlic/s-ganata.adb
-lib/garlic/s-ganeut.ads
+lib/garlic/s-ganata.ads
+lib/garlic/s-ganata.ali
 lib/garlic/s-ganeut.adb
-lib/garlic/s-ganota.ads
+lib/garlic/s-ganeut.ads
+lib/garlic/s-ganeut.ali
 lib/garlic/s-ganota.adb
-lib/garlic/s-gaphlo.ads
+lib/garlic/s-ganota.ads
+lib/garlic/s-ganota.ali
 lib/garlic/s-gaphlo.adb
+lib/garlic/s-gaphlo.ads
+lib/garlic/s-gaphlo.ali
 lib/garlic/s-gaplsp.ads
-lib/garlic/s-gaprco.ads
+lib/garlic/s-gaplsp.ali
 lib/garlic/s-gaprco.adb
-lib/garlic/s-gaprre.ads
+lib/garlic/s-gaprco.ads
+lib/garlic/s-gaprco.ali
+lib/garlic/s-gaprma.adb
+lib/garlic/s-gaprma.ads
+lib/garlic/s-gaprma.ali
 lib/garlic/s-gaprre.adb
-lib/garlic/s-gardeb.ads
-lib/garlic/s-gardeb.adb
-lib/garlic/s-garexc.ads
-lib/garlic/s-garexc.adb
-lib/garlic/s-garfil.ads
-lib/garlic/s-garfil.adb
-lib/garlic/s-gargro.ads
-lib/garlic/s-gargro.adb
-lib/garlic/s-garhea.ads
-lib/garlic/s-garhea.adb
-lib/garlic/s-garlic.ads
-lib/garlic/s-garopt.ads
-lib/garlic/s-garopt.adb
-lib/garlic/s-garpar.ads
-lib/garlic/s-garpar.adb
-lib/garlic/s-garpri.ads
-lib/garlic/s-garpro.ads
-lib/garlic/s-garpro.adb
-lib/garlic/s-garrem.ads
-lib/garlic/s-garrem.adb
-lib/garlic/s-garsta.ads
-lib/garlic/s-garsta.adb
-lib/garlic/s-garstr.ads
-lib/garlic/s-garstr.adb
-lib/garlic/s-gartas.ads
-lib/garlic/s-gartas.adb
-lib/garlic/s-gartra.ads
-lib/garlic/s-gartra.adb
-lib/garlic/s-garela.ads
-lib/garlic/s-garela.adb
-lib/garlic/s-garsto.ads
-lib/garlic/s-garsto.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-gastco.ads
-lib/garlic/s-gastco.adb
-lib/garlic/s-gastdf.ads
-lib/garlic/s-gastdf.adb
-lib/garlic/s-gastds.ads
-lib/garlic/s-gastds.adb
-lib/garlic/s-gastha.ads
-lib/garlic/s-gastha.adb
-lib/garlic/s-gprese.ads
-lib/garlic/s-parint.ads
-lib/garlic/s-parint.adb
-lib/garlic/s-rpc.ads
-lib/garlic/s-rpc.adb
-lib/garlic/s-rpcser.ads
-lib/garlic/s-rpcser.adb
-lib/garlic/s-rpstio.ads
-lib/garlic/s-rpstio.adb
-lib/garlic/s-shasto.ads
-lib/garlic/s-shasto.adb
-lib/garlic/s-stratt.adb
-lib/garlic/s-gptcse.ali
+lib/garlic/s-gaprre.ads
+lib/garlic/s-gaprre.ali
+lib/garlic/s-gaprtc.adb
+lib/garlic/s-gaprtc.ads
 lib/garlic/s-gaprtc.ali
-lib/garlic/s-gafizi.ali
-lib/garlic/s-galiop.ali
-lib/garlic/s-ganata.ali
-lib/garlic/s-ganeut.ali
-lib/garlic/s-gaplsp.ali
-lib/garlic/s-gaphlo.ali
-lib/garlic/s-gaprco.ali
+lib/garlic/s-gardeb.adb
+lib/garlic/s-gardeb.ads
 lib/garlic/s-gardeb.ali
+lib/garlic/s-garela.adb
+lib/garlic/s-garela.ads
 lib/garlic/s-garela.ali
+lib/garlic/s-garexc.adb
+lib/garlic/s-garexc.ads
 lib/garlic/s-garexc.ali
+lib/garlic/s-garfil.adb
+lib/garlic/s-garfil.ads
 lib/garlic/s-garfil.ali
+lib/garlic/s-gargro.adb
+lib/garlic/s-gargro.ads
 lib/garlic/s-gargro.ali
+lib/garlic/s-garhea.adb
+lib/garlic/s-garhea.ads
 lib/garlic/s-garhea.ali
+lib/garlic/s-garlic.ads
 lib/garlic/s-garlic.ali
-lib/garlic/s-gaprma.adb
-lib/garlic/s-gaprma.ads
-lib/garlic/s-gaprma.ali
-lib/garlic/s-gaprre.ali
+lib/garlic/s-garopt.adb
+lib/garlic/s-garopt.ads
 lib/garlic/s-garopt.ali
+lib/garlic/s-garpar.adb
+lib/garlic/s-garpar.ads
 lib/garlic/s-garpar.ali
 lib/garlic/s-garpri.adb
+lib/garlic/s-garpri.ads
 lib/garlic/s-garpri.ali
+lib/garlic/s-garpro.adb
+lib/garlic/s-garpro.ads
 lib/garlic/s-garpro.ali
+lib/garlic/s-garrem.adb
+lib/garlic/s-garrem.ads
 lib/garlic/s-garrem.ali
+lib/garlic/s-garsta.adb
+lib/garlic/s-garsta.ads
 lib/garlic/s-garsta.ali
+lib/garlic/s-garsto.adb
+lib/garlic/s-garsto.ads
+lib/garlic/s-garsto.ali
+lib/garlic/s-garstr.adb
+lib/garlic/s-garstr.ads
 lib/garlic/s-garstr.ali
+lib/garlic/s-gartab.adb
+lib/garlic/s-gartab.ads
 lib/garlic/s-gartab.ali
+lib/garlic/s-gartas.adb
+lib/garlic/s-gartas.ads
 lib/garlic/s-gartas.ali
-lib/garlic/s-gartra.ali
+lib/garlic/s-garter.adb
+lib/garlic/s-garter.ads
 lib/garlic/s-garter.ali
+lib/garlic/s-gartra.adb
+lib/garlic/s-gartra.ads
+lib/garlic/s-gartra.ali
+lib/garlic/s-gartyp.adb
+lib/garlic/s-gartyp.ads
 lib/garlic/s-gartyp.ali
+lib/garlic/s-garuni.adb
+lib/garlic/s-garuni.ads
 lib/garlic/s-garuni.ali
+lib/garlic/s-garuti.adb
+lib/garlic/s-garuti.ads
 lib/garlic/s-garuti.ali
-lib/garlic/s-garsto.ali
+lib/garlic/s-gasoli.adb
+lib/garlic/s-gasoli.ads
+lib/garlic/s-gasoli.ali
+lib/garlic/s-gastco.adb
+lib/garlic/s-gastco.ads
 lib/garlic/s-gastco.ali
+lib/garlic/s-gastdf.adb
+lib/garlic/s-gastdf.ads
 lib/garlic/s-gastdf.ali
-lib/garlic/s-gasoli.ali
+lib/garlic/s-gastds.adb
+lib/garlic/s-gastds.ads
 lib/garlic/s-gastds.ali
-lib/garlic/s-ganota.ali
+lib/garlic/s-gastha.adb
+lib/garlic/s-gastha.ads
+lib/garlic/s-gastha.ali
+lib/garlic/s-gprese.ads
 lib/garlic/s-gprese.ali
+lib/garlic/s-gptcse.adb
+lib/garlic/s-gptcse.ads
+lib/garlic/s-gptcse.ali
+lib/garlic/s-parint.adb
+lib/garlic/s-parint.ads
 lib/garlic/s-parint.ali
+lib/garlic/s-rpc.adb
+lib/garlic/s-rpc.ads
 lib/garlic/s-rpc.ali
+lib/garlic/s-rpcser.adb
+lib/garlic/s-rpcser.ads
 lib/garlic/s-rpcser.ali
+lib/garlic/s-rpstio.adb
+lib/garlic/s-rpstio.ads
 lib/garlic/s-rpstio.ali
+lib/garlic/s-shasto.adb
+lib/garlic/s-shasto.ads
 lib/garlic/s-shasto.ali
+lib/garlic/s-stratt.adb
 lib/garlic/s-stratt.ali
-lib/garlic/libgarlic.a
 @dirrm lib/garlic
diff --git a/lang/gnat-glade/Makefile b/lang/gnat-glade/Makefile
index 38e3e9b..7346a35 100644
--- a/lang/gnat-glade/Makefile
+++ b/lang/gnat-glade/Makefile
@@ -6,36 +6,35 @@
 #
 
 PORTNAME=	gnat-glade
-PORTVERSION=	3.15p
-PORTREVISION=	1
+PORTVERSION=	2005
 CATEGORIES=	lang
-MASTER_SITES=	ftp://cs.nyu.edu/pub/gnat/${PORTVERSION}/glade/
-DISTNAME=	glade-${PORTVERSION}-src
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+DISTNAME=	glade-gpl-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mek@mek.uz.ua
 COMMENT=	GNU Ada distributed systems annex
 
-BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
+BUILD_DEPENDS=	gnatgcc:${PORTSDIR}/lang/gnat
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500039
-WITHOUT_CPU_CFLAGS=	yes
-.endif
-USE_AUTOTOOLS=	automake:14 autoconf:213
-CONFIGURE_ENV=	ADA=adagcc
+USE_AUTOTOOLS=	automake:14 autoconf:259
 USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --program-transform-name=''
 
-ADACFLAGS?=
-CFLAGS=${ADACFLAGS}
-
-pre-configure:
-	${PERL} -pi -e "s@aclocal\)@${ACLOCAL})@g;\
-			s@automake\)@${AUTOMAKE})@g" ${WRKSRC}/aclocal.m4
+.include <bsd.port.pre.mk>
 
-post-install:
-	${STRIP_CMD} ${PREFIX}/bin/gnatdist
+# Check for GLADE sources.
+GLADE_SRC=${DISTNAME}${EXTRACT_SUFX}
+
+.if !exists(${DISTDIR}/${GLADE_SRC}) && !defined(PACKAGE_BUILDING)
+ECHO_MSG=/usr/bin/printf
+IGNORE=: Because of licensing and registration restrictions,\n\
+you must fetch the source distribution manually.\n\
+Please access http://libre.adacore.com/\n\
+with a web browser, register (it's free), and log in.  Download the source\n\
+file:\n\
+\t${DISTFILES}\n\
+and place it in ${DISTDIR}.\n
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/gnat-glade/distinfo b/lang/gnat-glade/distinfo
index f266e10..6252692 100644
--- a/lang/gnat-glade/distinfo
+++ b/lang/gnat-glade/distinfo
@@ -1,3 +1,3 @@
-MD5 (glade-3.15p-src.tgz) = 44e478a03eef8d65d597558f826b3128
-SHA256 (glade-3.15p-src.tgz) = 14f7e07e9e2ce042e66180f52651a2b92cace79e92af502bb0f16b13211df040
-SIZE (glade-3.15p-src.tgz) = 1061859
+MD5 (glade-gpl-2005-src.tgz) = b874e42e754bcd0b02925ff083d40092
+SHA256 (glade-gpl-2005-src.tgz) = ef1764e451a1027e2e177db75c77871982c50f8ce42edb577727f6d643520308
+SIZE (glade-gpl-2005-src.tgz) = 517331
diff --git a/lang/gnat-glade/files/patch-Garlic-Makefile.am b/lang/gnat-glade/files/patch-Garlic-Makefile.am
new file mode 100644
index 0000000..1ef6315
--- /dev/null
+++ b/lang/gnat-glade/files/patch-Garlic-Makefile.am
@@ -0,0 +1,16 @@
+--- Garlic/Makefile.am.orig	Tue Mar 28 02:43:13 2006
++++ Garlic/Makefile.am	Tue Mar 28 02:43:23 2006
+@@ -164,13 +164,11 @@
+ 
+ s-galiop.ads:
+ 	@echo "private package System.Garlic.Linker_Options is" >s-galiop.ads
+-	@echo "" >>s-galiop.ads
+ 	@if [ "x$(EXTRA_LIBS)" != "x" ] ; then\
+ 	 for option in `echo $(EXTRA_LIBS)`; do\
+ 	  echo "   pragma Linker_Options (\"$$option\");" >>s-galiop.ads;\
+ 	 done;\
+ 	fi
+-	@echo "" >>s-galiop.ads
+ 	@echo "end System.Garlic.Linker_Options;" >>s-galiop.ads
+ 
+ used:
diff --git a/lang/gnat-glade/files/patch-ac b/lang/gnat-glade/files/patch-ac
deleted file mode 100644
index 646677f..0000000
--- a/lang/gnat-glade/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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");
-       Link            := Locate ("ln", False);
-       Gnatbind        := Locate ("gnatbind");
-       Gnatlink        := Locate ("gnatlink");
diff --git a/lang/gnat-glade/files/patch-ad b/lang/gnat-glade/files/patch-ad
deleted file mode 100644
index 0ba7673..0000000
--- a/lang/gnat-glade/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- Dist/xe_usage.adb.orig	Wed May  3 20:07:54 2000
-+++ Dist/xe_usage.adb	Wed May  3 20:08:07 2000
-@@ -70,7 +70,7 @@
-    Write_Eol;
- 
-    Write_Str ("Gcc switches such as -g, -O, etc.");
--   Write_Str (" are directly passed to gcc");
-+   Write_Str (" are directly passed to adagcc");
-    Write_Eol;
-    Write_Eol;
- 
diff --git a/lang/gnat-glade/files/patch-ae b/lang/gnat-glade/files/patch-ae
deleted file mode 100644
index 4caa6e5..0000000
--- a/lang/gnat-glade/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- ada/ali.adb.orig	Wed May  3 20:09:02 2000
-+++ ada/ali.adb	Wed May  3 20:09:13 2000
-@@ -220,7 +220,7 @@
-          Write_Str (" is incorrectly formatted");
-          Write_Eol;
-          Write_Str
--           ("make sure you are using consistent versions of gcc/gnatbind");
-+           ("make sure you are using consistent versions of adagcc/gnatbind");
-          Write_Eol;
- 
-          --  Find start of line
diff --git a/lang/gnat-glade/files/patch-af b/lang/gnat-glade/files/patch-af
deleted file mode 100644
index 27378b0..0000000
--- a/lang/gnat-glade/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- ada/make.adb.orig	Wed May  3 20:09:55 2000
-+++ ada/make.adb	Wed May  3 20:10:20 2000
-@@ -238,7 +238,7 @@
-    -- Compiler, Binder & Linker Data and Subprograms --
-    ----------------------------------------------------
- 
--   Gcc             : String_Access := Program_Name ("gcc");
-+   Gcc             : String_Access := Program_Name ("adagcc");
-    Gnatbind        : String_Access := Program_Name ("gnatbind");
-    Gnatlink        : String_Access := Program_Name ("gnatlink");
-    --  Default compiler, binder, linker programs
diff --git a/lang/gnat-glade/pkg-descr b/lang/gnat-glade/pkg-descr
index 790d076..a410c53 100644
--- a/lang/gnat-glade/pkg-descr
+++ b/lang/gnat-glade/pkg-descr
@@ -1,7 +1,7 @@
 GLADE is GNAT's companion package for building distributed systems in Ada.
 GNAT+GLADE is a complete implementation of the Ada 95 programming language.
 
-WWW: http://www.gnat.com/
+WWW: http://libre.act-europe.com/
 
 Note: because of the existence of GLADE, the GTK GUI builder, this package
       has been renamed gnat-glade, as is done in Linux distributions such
diff --git a/lang/gnat-glade/pkg-plist b/lang/gnat-glade/pkg-plist
index d91a8b0..0f6deb5 100644
--- a/lang/gnat-glade/pkg-plist
+++ b/lang/gnat-glade/pkg-plist
@@ -1,137 +1,138 @@
 bin/gnatdist
-lib/garlic/libgnat.a
+lib/garlic/libgarlic.a
 lib/garlic/libgnarl.a
-lib/garlic/s-gaprtc.ads
-lib/garlic/s-gaprtc.adb
-lib/garlic/s-gptcse.ads
-lib/garlic/s-gptcse.adb
-lib/garlic/s-gafizi.ads
+lib/garlic/libgnat.a
 lib/garlic/s-gafizi.adb
+lib/garlic/s-gafizi.ads
+lib/garlic/s-gafizi.ali
 lib/garlic/s-galiop.ads
-lib/garlic/s-ganata.ads
+lib/garlic/s-galiop.ali
 lib/garlic/s-ganata.adb
-lib/garlic/s-ganeut.ads
+lib/garlic/s-ganata.ads
+lib/garlic/s-ganata.ali
 lib/garlic/s-ganeut.adb
-lib/garlic/s-ganota.ads
+lib/garlic/s-ganeut.ads
+lib/garlic/s-ganeut.ali
 lib/garlic/s-ganota.adb
-lib/garlic/s-gaphlo.ads
+lib/garlic/s-ganota.ads
+lib/garlic/s-ganota.ali
 lib/garlic/s-gaphlo.adb
+lib/garlic/s-gaphlo.ads
+lib/garlic/s-gaphlo.ali
 lib/garlic/s-gaplsp.ads
-lib/garlic/s-gaprco.ads
+lib/garlic/s-gaplsp.ali
 lib/garlic/s-gaprco.adb
-lib/garlic/s-gaprre.ads
+lib/garlic/s-gaprco.ads
+lib/garlic/s-gaprco.ali
+lib/garlic/s-gaprma.adb
+lib/garlic/s-gaprma.ads
+lib/garlic/s-gaprma.ali
 lib/garlic/s-gaprre.adb
-lib/garlic/s-gardeb.ads
-lib/garlic/s-gardeb.adb
-lib/garlic/s-garexc.ads
-lib/garlic/s-garexc.adb
-lib/garlic/s-garfil.ads
-lib/garlic/s-garfil.adb
-lib/garlic/s-gargro.ads
-lib/garlic/s-gargro.adb
-lib/garlic/s-garhea.ads
-lib/garlic/s-garhea.adb
-lib/garlic/s-garlic.ads
-lib/garlic/s-garopt.ads
-lib/garlic/s-garopt.adb
-lib/garlic/s-garpar.ads
-lib/garlic/s-garpar.adb
-lib/garlic/s-garpri.ads
-lib/garlic/s-garpro.ads
-lib/garlic/s-garpro.adb
-lib/garlic/s-garrem.ads
-lib/garlic/s-garrem.adb
-lib/garlic/s-garsta.ads
-lib/garlic/s-garsta.adb
-lib/garlic/s-garstr.ads
-lib/garlic/s-garstr.adb
-lib/garlic/s-gartas.ads
-lib/garlic/s-gartas.adb
-lib/garlic/s-gartra.ads
-lib/garlic/s-gartra.adb
-lib/garlic/s-garela.ads
-lib/garlic/s-garela.adb
-lib/garlic/s-garsto.ads
-lib/garlic/s-garsto.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-gastco.ads
-lib/garlic/s-gastco.adb
-lib/garlic/s-gastdf.ads
-lib/garlic/s-gastdf.adb
-lib/garlic/s-gastds.ads
-lib/garlic/s-gastds.adb
-lib/garlic/s-gastha.ads
-lib/garlic/s-gastha.adb
-lib/garlic/s-gprese.ads
-lib/garlic/s-parint.ads
-lib/garlic/s-parint.adb
-lib/garlic/s-rpc.ads
-lib/garlic/s-rpc.adb
-lib/garlic/s-rpcser.ads
-lib/garlic/s-rpcser.adb
-lib/garlic/s-rpstio.ads
-lib/garlic/s-rpstio.adb
-lib/garlic/s-shasto.ads
-lib/garlic/s-shasto.adb
-lib/garlic/s-stratt.adb
-lib/garlic/s-gptcse.ali
+lib/garlic/s-gaprre.ads
+lib/garlic/s-gaprre.ali
+lib/garlic/s-gaprtc.adb
+lib/garlic/s-gaprtc.ads
 lib/garlic/s-gaprtc.ali
-lib/garlic/s-gafizi.ali
-lib/garlic/s-galiop.ali
-lib/garlic/s-ganata.ali
-lib/garlic/s-ganeut.ali
-lib/garlic/s-gaplsp.ali
-lib/garlic/s-gaphlo.ali
-lib/garlic/s-gaprco.ali
+lib/garlic/s-gardeb.adb
+lib/garlic/s-gardeb.ads
 lib/garlic/s-gardeb.ali
+lib/garlic/s-garela.adb
+lib/garlic/s-garela.ads
 lib/garlic/s-garela.ali
+lib/garlic/s-garexc.adb
+lib/garlic/s-garexc.ads
 lib/garlic/s-garexc.ali
+lib/garlic/s-garfil.adb
+lib/garlic/s-garfil.ads
 lib/garlic/s-garfil.ali
+lib/garlic/s-gargro.adb
+lib/garlic/s-gargro.ads
 lib/garlic/s-gargro.ali
+lib/garlic/s-garhea.adb
+lib/garlic/s-garhea.ads
 lib/garlic/s-garhea.ali
+lib/garlic/s-garlic.ads
 lib/garlic/s-garlic.ali
-lib/garlic/s-gaprma.adb
-lib/garlic/s-gaprma.ads
-lib/garlic/s-gaprma.ali
-lib/garlic/s-gaprre.ali
+lib/garlic/s-garopt.adb
+lib/garlic/s-garopt.ads
 lib/garlic/s-garopt.ali
+lib/garlic/s-garpar.adb
+lib/garlic/s-garpar.ads
 lib/garlic/s-garpar.ali
 lib/garlic/s-garpri.adb
+lib/garlic/s-garpri.ads
 lib/garlic/s-garpri.ali
+lib/garlic/s-garpro.adb
+lib/garlic/s-garpro.ads
 lib/garlic/s-garpro.ali
+lib/garlic/s-garrem.adb
+lib/garlic/s-garrem.ads
 lib/garlic/s-garrem.ali
+lib/garlic/s-garsta.adb
+lib/garlic/s-garsta.ads
 lib/garlic/s-garsta.ali
+lib/garlic/s-garsto.adb
+lib/garlic/s-garsto.ads
+lib/garlic/s-garsto.ali
+lib/garlic/s-garstr.adb
+lib/garlic/s-garstr.ads
 lib/garlic/s-garstr.ali
+lib/garlic/s-gartab.adb
+lib/garlic/s-gartab.ads
 lib/garlic/s-gartab.ali
+lib/garlic/s-gartas.adb
+lib/garlic/s-gartas.ads
 lib/garlic/s-gartas.ali
-lib/garlic/s-gartra.ali
+lib/garlic/s-garter.adb
+lib/garlic/s-garter.ads
 lib/garlic/s-garter.ali
+lib/garlic/s-gartra.adb
+lib/garlic/s-gartra.ads
+lib/garlic/s-gartra.ali
+lib/garlic/s-gartyp.adb
+lib/garlic/s-gartyp.ads
 lib/garlic/s-gartyp.ali
+lib/garlic/s-garuni.adb
+lib/garlic/s-garuni.ads
 lib/garlic/s-garuni.ali
+lib/garlic/s-garuti.adb
+lib/garlic/s-garuti.ads
 lib/garlic/s-garuti.ali
-lib/garlic/s-garsto.ali
+lib/garlic/s-gasoli.adb
+lib/garlic/s-gasoli.ads
+lib/garlic/s-gasoli.ali
+lib/garlic/s-gastco.adb
+lib/garlic/s-gastco.ads
 lib/garlic/s-gastco.ali
+lib/garlic/s-gastdf.adb
+lib/garlic/s-gastdf.ads
 lib/garlic/s-gastdf.ali
-lib/garlic/s-gasoli.ali
+lib/garlic/s-gastds.adb
+lib/garlic/s-gastds.ads
 lib/garlic/s-gastds.ali
-lib/garlic/s-ganota.ali
+lib/garlic/s-gastha.adb
+lib/garlic/s-gastha.ads
+lib/garlic/s-gastha.ali
+lib/garlic/s-gprese.ads
 lib/garlic/s-gprese.ali
+lib/garlic/s-gptcse.adb
+lib/garlic/s-gptcse.ads
+lib/garlic/s-gptcse.ali
+lib/garlic/s-parint.adb
+lib/garlic/s-parint.ads
 lib/garlic/s-parint.ali
+lib/garlic/s-rpc.adb
+lib/garlic/s-rpc.ads
 lib/garlic/s-rpc.ali
+lib/garlic/s-rpcser.adb
+lib/garlic/s-rpcser.ads
 lib/garlic/s-rpcser.ali
+lib/garlic/s-rpstio.adb
+lib/garlic/s-rpstio.ads
 lib/garlic/s-rpstio.ali
+lib/garlic/s-shasto.adb
+lib/garlic/s-shasto.ads
 lib/garlic/s-shasto.ali
+lib/garlic/s-stratt.adb
 lib/garlic/s-stratt.ali
-lib/garlic/libgarlic.a
 @dirrm lib/garlic