10 files changed, 94 insertions, 70 deletions

diff --git a/devel/asis-gpl/Makefile b/devel/asis-gpl/Makefile
index 926eb55e990f..0736c583305c 100644
--- a/devel/asis-gpl/Makefile
+++ b/devel/asis-gpl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asis
-PORTVERSION=	3.12p
+PORTVERSION=	3.13p
 CATEGORIES=	devel
 MASTER_SITES=	\
 	ftp://ftp.lip6.fr/pub/gnat/${PORTVERSION}/asis/ \
@@ -37,10 +37,10 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${PREFIX}/share/doc/asis || true
 	@ ${INSTALL_DATA} ${WRKSRC}/documentation/* ${PREFIX}/share/doc/asis
-	@ ${INSTALL_DATA} ${WRKSRC}/asistant/asistant.ug ${PREFIX}/share/doc/asis/README.asistant
 	@ ${INSTALL_DATA} ${WRKSRC}/examples/ds/README ${PREFIX}/share/doc/asis/README.ds
-	@ ${INSTALL_DATA} ${WRKSRC}/examples/gnatelim/README ${PREFIX}/share/doc/asis/README.gnatelim
-	@ ${INSTALL_DATA} ${WRKSRC}/examples/gnatstub/README ${PREFIX}/share/doc/asis/README.gnatstub
+	@ ${INSTALL_DATA} ${WRKSRC}/tools/asistant/asistant.ug ${PREFIX}/share/doc/asis/README.asistant
+	@ ${INSTALL_DATA} ${WRKSRC}/tools/gnatelim/README ${PREFIX}/share/doc/asis/README.gnatelim
+	@ ${INSTALL_DATA} ${WRKSRC}/tools/gnatstub/README ${PREFIX}/share/doc/asis/README.gnatstub
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/asis-gpl/distinfo b/devel/asis-gpl/distinfo
index 79e760814dab..19355fd36fb5 100644
--- a/devel/asis-gpl/distinfo
+++ b/devel/asis-gpl/distinfo
@@ -1 +1 @@
-MD5 (asis-3.12p-src.tar.gz) = c5ab95b720c6ab6e923a6904b6d2e183
+MD5 (asis-3.13p-src.tar.gz) = 1686a3846ea09e7d14a72684732de839
diff --git a/devel/asis-gpl/files/Makefile.bsd b/devel/asis-gpl/files/Makefile.bsd
index 0bd162f77ff4..eff73055df4b 100644
--- a/devel/asis-gpl/files/Makefile.bsd
+++ b/devel/asis-gpl/files/Makefile.bsd
@@ -7,13 +7,13 @@ all:
 	${LN} -sf libasis-${PORTVERSION}.so.1 libasis-${PORTVERSION}.so
 	${GMAKE} -C obj clean libasis.a CFLAGS="${CFLAGS}" CC=adagcc
 	chmod a-w obj/*.ali
-	cd asistant && \
-	gnatmake ${CFLAGS} -o ../asistant.prg asistant-driver -I../asis -I../gnat -I../obj -largs -L.. -lasis-${PORTVERSION}
 	cd examples/ds && \
 	gnatmake ${CFLAGS} -o ../../display_source display_source ${ASISPROGFLAGS}
-	cd examples/gnatelim && \
+	cd tools/asistant && \
+	gnatmake ${CFLAGS} -o ../../asistant.prg asistant-driver ${ASISPROGFLAGS}
+	cd tools/gnatelim && \
 	gnatmake ${CFLAGS} -o ../../gnatelim gnatelim-driver ${ASISPROGFLAGS}
-	cd examples/gnatstub && \
+	cd tools/gnatstub && \
 	gnatmake ${CFLAGS} -o ../../gnatstub gnatstub-driver ${ASISPROGFLAGS}
 
 clean:
diff --git a/devel/asis-gpl/files/patch-ab b/devel/asis-gpl/files/patch-ab
index 294bc08c8226..66233250fa0e 100644
--- a/devel/asis-gpl/files/patch-ab
+++ b/devel/asis-gpl/files/patch-ab
@@ -1,27 +1,30 @@
-#PATCHOPTIONS: -p0
---- examples/ds/display_source.adb.dist	Wed Sep  1 17:16:01 1999
-+++ examples/ds/display_source.adb	Fri May 26 19:02:05 2000
-@@ -311,7 +311,7 @@
-    Asis.Ada_Environments.Dissociate ( The_DS_Context );
-    Asis.Implementation.Finalize ("");
+--- obj/Makefile.dist	Wed Jul 19 21:09:05 2000
++++ obj/Makefile	Tue Dec 19 18:16:57 2000
+@@ -18,11 +18,11 @@
+ endif
  
--   -- let's delete the *.at? and *.ali files
-+   -- let's delete the *.adt and *.ali files
-    declare
-       To_Erase : String := Ada.Command_Line.Argument (Command_File) ;
-       File : File_Type ;
-@@ -320,12 +320,12 @@
-          To_Erase (To_Erase'Last - 3 .. To_Erase'Last - 1 ) = ".AD"
-       then
-          --  tree file
--         To_Erase ( To_Erase'Last - 1 ) := 't' ;
-+         To_Erase ( To_Erase'Last ) := 't' ;
-          Open ( File , Out_File , To_Erase ) ;
-          Delete ( File ) ;
+ bld-objs:
+-	gcc -c $(GNATMAKE_FLAGS) -I$(GNAT_DIR) -I$(ASIS_DIR) install_asis.adb
++	$(CC) -c $(GNATMAKE_FLAGS) -I$(GNAT_DIR) -I$(ASIS_DIR) install_asis.adb
+ #	install_asis.adb is not '-gnatg-compilable'
+ ifeq "$(findstring hppa, $(host))" "hppa"
+ # this file has problems when compiled with optimization see 7418-013
+-	gcc -c  -I$(GNAT_DIR)  $(CFLAGS) -O0 $(ASIS_DIR)/a4g-a_sinput.adb
++	$(CC) -c  -I$(GNAT_DIR)  $(CFLAGS) -O0 $(ASIS_DIR)/a4g-a_sinput.adb
+ endif
+ 	gnatmake -c $(GNATMAKE_FLAGS) -aI$(GNAT_DIR) -aI$(ASIS_DIR) $(CFLAGS)\
+ 	         install_asis.adb \
+@@ -31,11 +31,11 @@
  
-          --  ali file
--         To_Erase (To_Erase'Last -2 .. To_Erase'Last) := "ali";
-+         To_Erase (To_Erase'Last - 2 .. To_Erase'Last) := "ali";
-          Open ( File , Out_File , To_Erase ) ;
-          Delete ( File ) ;
+ libasis$(soext): clean
+ 	$(MAKE) -e bld-objs CFLAGS="$(CFLAGS) -fPIC"
+-	gcc -shared -o libasis$(soext) *$(objext)
++	$(CC) -shared -o libasis$(soext) *$(objext)
  
+ clean:
+ 	$(RM) *$(objext)
+ 	$(RM) *.ali
+ 	$(RM) *$(arext)
+ 	$(RM) *$(soext)
+-	$(RM) *~
++	$(RM) *~
diff --git a/devel/asis-gpl/pkg-plist b/devel/asis-gpl/pkg-plist
index 6792491c8469..5097c5f661fe 100644
--- a/devel/asis-gpl/pkg-plist
+++ b/devel/asis-gpl/pkg-plist
@@ -19,6 +19,8 @@ lib/asis/a4g-a_sinput.adb
 lib/asis/a4g-a_sinput.ads
 lib/asis/a4g-a_types.adb
 lib/asis/a4g-a_types.ads
+lib/asis/a4g-asis_tables.adb
+lib/asis/a4g-asis_tables.ads
 lib/asis/a4g-c_u_info.adb
 lib/asis/a4g-c_u_info.ads
 lib/asis/a4g-contt-dp.adb
@@ -72,6 +74,8 @@ lib/asis/a4g-span_beginning.adb
 lib/asis/a4g-span_beginning.ads
 lib/asis/a4g-span_end.adb
 lib/asis/a4g-span_end.ads
+lib/asis/a4g-stand.adb
+lib/asis/a4g-stand.ads
 lib/asis/a4g-tree_rec.ads
 lib/asis/a4g-u_conv.adb
 lib/asis/a4g-u_conv.ads
@@ -95,6 +99,8 @@ lib/asis/asis-elements.adb
 lib/asis/asis-compilation_units.ads
 lib/asis/asis-data_decomposition-aux.adb
 lib/asis/asis-data_decomposition-aux.ads
+lib/asis/asis-data_decomposition-extensions.adb
+lib/asis/asis-data_decomposition-extensions.ads
 lib/asis/asis-data_decomposition-debug.adb
 lib/asis/asis-data_decomposition-debug.ads
 lib/asis/asis-data_decomposition-set_get.adb
@@ -203,6 +209,7 @@ lib/asis/a4g-a_output.ali
 lib/asis/a4g-a_sem.ali
 lib/asis/a4g-a_sinput.ali
 lib/asis/a4g-a_types.ali
+lib/asis/a4g-asis_tables.ali
 lib/asis/a4g-c_u_info.ali
 lib/asis/a4g-contt-dp.ali
 lib/asis/a4g-contt-sd.ali
@@ -231,6 +238,7 @@ lib/asis/a4g-s_u_info.ali
 lib/asis/a4g-skip_tb.ali
 lib/asis/a4g-span_beginning.ali
 lib/asis/a4g-span_end.ali
+lib/asis/a4g-stand.ali
 lib/asis/a4g-tree_rec.ali
 lib/asis/a4g-u_conv.ali
 lib/asis/a4g-unit_rec.ali
@@ -243,6 +251,7 @@ lib/asis/asis-compilation_units-relations.ali
 lib/asis/asis-compilation_units-times.ali
 lib/asis/asis-compilation_units.ali
 lib/asis/asis-data_decomposition-aux.ali
+lib/asis/asis-data_decomposition-extensions.ali
 lib/asis/asis-data_decomposition-set_get.ali
 lib/asis/asis-data_decomposition-vcheck.ali
 lib/asis/asis.ali
@@ -294,8 +303,8 @@ lib/asis/urealp.ali
 lib/asis/widechar.ali
 lib/libasis.a
 
-lib/libasis-3.12p.so
-lib/libasis-3.12p.so.1
+lib/libasis-3.13p.so
+lib/libasis-3.13p.so.1
 @exec /sbin/ldconfig -m %D/lib
 @unexec /sbin/ldconfig -R
 
diff --git a/devel/asis/Makefile b/devel/asis/Makefile
index 926eb55e990f..0736c583305c 100644
--- a/devel/asis/Makefile
+++ b/devel/asis/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asis
-PORTVERSION=	3.12p
+PORTVERSION=	3.13p
 CATEGORIES=	devel
 MASTER_SITES=	\
 	ftp://ftp.lip6.fr/pub/gnat/${PORTVERSION}/asis/ \
@@ -37,10 +37,10 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${PREFIX}/share/doc/asis || true
 	@ ${INSTALL_DATA} ${WRKSRC}/documentation/* ${PREFIX}/share/doc/asis
-	@ ${INSTALL_DATA} ${WRKSRC}/asistant/asistant.ug ${PREFIX}/share/doc/asis/README.asistant
 	@ ${INSTALL_DATA} ${WRKSRC}/examples/ds/README ${PREFIX}/share/doc/asis/README.ds
-	@ ${INSTALL_DATA} ${WRKSRC}/examples/gnatelim/README ${PREFIX}/share/doc/asis/README.gnatelim
-	@ ${INSTALL_DATA} ${WRKSRC}/examples/gnatstub/README ${PREFIX}/share/doc/asis/README.gnatstub
+	@ ${INSTALL_DATA} ${WRKSRC}/tools/asistant/asistant.ug ${PREFIX}/share/doc/asis/README.asistant
+	@ ${INSTALL_DATA} ${WRKSRC}/tools/gnatelim/README ${PREFIX}/share/doc/asis/README.gnatelim
+	@ ${INSTALL_DATA} ${WRKSRC}/tools/gnatstub/README ${PREFIX}/share/doc/asis/README.gnatstub
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/asis/distinfo b/devel/asis/distinfo
index 79e760814dab..19355fd36fb5 100644
--- a/devel/asis/distinfo
+++ b/devel/asis/distinfo
@@ -1 +1 @@
-MD5 (asis-3.12p-src.tar.gz) = c5ab95b720c6ab6e923a6904b6d2e183
+MD5 (asis-3.13p-src.tar.gz) = 1686a3846ea09e7d14a72684732de839
diff --git a/devel/asis/files/Makefile.bsd b/devel/asis/files/Makefile.bsd
index 0bd162f77ff4..eff73055df4b 100644
--- a/devel/asis/files/Makefile.bsd
+++ b/devel/asis/files/Makefile.bsd
@@ -7,13 +7,13 @@ all:
 	${LN} -sf libasis-${PORTVERSION}.so.1 libasis-${PORTVERSION}.so
 	${GMAKE} -C obj clean libasis.a CFLAGS="${CFLAGS}" CC=adagcc
 	chmod a-w obj/*.ali
-	cd asistant && \
-	gnatmake ${CFLAGS} -o ../asistant.prg asistant-driver -I../asis -I../gnat -I../obj -largs -L.. -lasis-${PORTVERSION}
 	cd examples/ds && \
 	gnatmake ${CFLAGS} -o ../../display_source display_source ${ASISPROGFLAGS}
-	cd examples/gnatelim && \
+	cd tools/asistant && \
+	gnatmake ${CFLAGS} -o ../../asistant.prg asistant-driver ${ASISPROGFLAGS}
+	cd tools/gnatelim && \
 	gnatmake ${CFLAGS} -o ../../gnatelim gnatelim-driver ${ASISPROGFLAGS}
-	cd examples/gnatstub && \
+	cd tools/gnatstub && \
 	gnatmake ${CFLAGS} -o ../../gnatstub gnatstub-driver ${ASISPROGFLAGS}
 
 clean:
diff --git a/devel/asis/files/patch-ab b/devel/asis/files/patch-ab
index 294bc08c8226..66233250fa0e 100644
--- a/devel/asis/files/patch-ab
+++ b/devel/asis/files/patch-ab
@@ -1,27 +1,30 @@
-#PATCHOPTIONS: -p0
---- examples/ds/display_source.adb.dist	Wed Sep  1 17:16:01 1999
-+++ examples/ds/display_source.adb	Fri May 26 19:02:05 2000
-@@ -311,7 +311,7 @@
-    Asis.Ada_Environments.Dissociate ( The_DS_Context );
-    Asis.Implementation.Finalize ("");
+--- obj/Makefile.dist	Wed Jul 19 21:09:05 2000
++++ obj/Makefile	Tue Dec 19 18:16:57 2000
+@@ -18,11 +18,11 @@
+ endif
  
--   -- let's delete the *.at? and *.ali files
-+   -- let's delete the *.adt and *.ali files
-    declare
-       To_Erase : String := Ada.Command_Line.Argument (Command_File) ;
-       File : File_Type ;
-@@ -320,12 +320,12 @@
-          To_Erase (To_Erase'Last - 3 .. To_Erase'Last - 1 ) = ".AD"
-       then
-          --  tree file
--         To_Erase ( To_Erase'Last - 1 ) := 't' ;
-+         To_Erase ( To_Erase'Last ) := 't' ;
-          Open ( File , Out_File , To_Erase ) ;
-          Delete ( File ) ;
+ bld-objs:
+-	gcc -c $(GNATMAKE_FLAGS) -I$(GNAT_DIR) -I$(ASIS_DIR) install_asis.adb
++	$(CC) -c $(GNATMAKE_FLAGS) -I$(GNAT_DIR) -I$(ASIS_DIR) install_asis.adb
+ #	install_asis.adb is not '-gnatg-compilable'
+ ifeq "$(findstring hppa, $(host))" "hppa"
+ # this file has problems when compiled with optimization see 7418-013
+-	gcc -c  -I$(GNAT_DIR)  $(CFLAGS) -O0 $(ASIS_DIR)/a4g-a_sinput.adb
++	$(CC) -c  -I$(GNAT_DIR)  $(CFLAGS) -O0 $(ASIS_DIR)/a4g-a_sinput.adb
+ endif
+ 	gnatmake -c $(GNATMAKE_FLAGS) -aI$(GNAT_DIR) -aI$(ASIS_DIR) $(CFLAGS)\
+ 	         install_asis.adb \
+@@ -31,11 +31,11 @@
  
-          --  ali file
--         To_Erase (To_Erase'Last -2 .. To_Erase'Last) := "ali";
-+         To_Erase (To_Erase'Last - 2 .. To_Erase'Last) := "ali";
-          Open ( File , Out_File , To_Erase ) ;
-          Delete ( File ) ;
+ libasis$(soext): clean
+ 	$(MAKE) -e bld-objs CFLAGS="$(CFLAGS) -fPIC"
+-	gcc -shared -o libasis$(soext) *$(objext)
++	$(CC) -shared -o libasis$(soext) *$(objext)
  
+ clean:
+ 	$(RM) *$(objext)
+ 	$(RM) *.ali
+ 	$(RM) *$(arext)
+ 	$(RM) *$(soext)
+-	$(RM) *~
++	$(RM) *~
diff --git a/devel/asis/pkg-plist b/devel/asis/pkg-plist
index 6792491c8469..5097c5f661fe 100644
--- a/devel/asis/pkg-plist
+++ b/devel/asis/pkg-plist
@@ -19,6 +19,8 @@ lib/asis/a4g-a_sinput.adb
 lib/asis/a4g-a_sinput.ads
 lib/asis/a4g-a_types.adb
 lib/asis/a4g-a_types.ads
+lib/asis/a4g-asis_tables.adb
+lib/asis/a4g-asis_tables.ads
 lib/asis/a4g-c_u_info.adb
 lib/asis/a4g-c_u_info.ads
 lib/asis/a4g-contt-dp.adb
@@ -72,6 +74,8 @@ lib/asis/a4g-span_beginning.adb
 lib/asis/a4g-span_beginning.ads
 lib/asis/a4g-span_end.adb
 lib/asis/a4g-span_end.ads
+lib/asis/a4g-stand.adb
+lib/asis/a4g-stand.ads
 lib/asis/a4g-tree_rec.ads
 lib/asis/a4g-u_conv.adb
 lib/asis/a4g-u_conv.ads
@@ -95,6 +99,8 @@ lib/asis/asis-elements.adb
 lib/asis/asis-compilation_units.ads
 lib/asis/asis-data_decomposition-aux.adb
 lib/asis/asis-data_decomposition-aux.ads
+lib/asis/asis-data_decomposition-extensions.adb
+lib/asis/asis-data_decomposition-extensions.ads
 lib/asis/asis-data_decomposition-debug.adb
 lib/asis/asis-data_decomposition-debug.ads
 lib/asis/asis-data_decomposition-set_get.adb
@@ -203,6 +209,7 @@ lib/asis/a4g-a_output.ali
 lib/asis/a4g-a_sem.ali
 lib/asis/a4g-a_sinput.ali
 lib/asis/a4g-a_types.ali
+lib/asis/a4g-asis_tables.ali
 lib/asis/a4g-c_u_info.ali
 lib/asis/a4g-contt-dp.ali
 lib/asis/a4g-contt-sd.ali
@@ -231,6 +238,7 @@ lib/asis/a4g-s_u_info.ali
 lib/asis/a4g-skip_tb.ali
 lib/asis/a4g-span_beginning.ali
 lib/asis/a4g-span_end.ali
+lib/asis/a4g-stand.ali
 lib/asis/a4g-tree_rec.ali
 lib/asis/a4g-u_conv.ali
 lib/asis/a4g-unit_rec.ali
@@ -243,6 +251,7 @@ lib/asis/asis-compilation_units-relations.ali
 lib/asis/asis-compilation_units-times.ali
 lib/asis/asis-compilation_units.ali
 lib/asis/asis-data_decomposition-aux.ali
+lib/asis/asis-data_decomposition-extensions.ali
 lib/asis/asis-data_decomposition-set_get.ali
 lib/asis/asis-data_decomposition-vcheck.ali
 lib/asis/asis.ali
@@ -294,8 +303,8 @@ lib/asis/urealp.ali
 lib/asis/widechar.ali
 lib/libasis.a
 
-lib/libasis-3.12p.so
-lib/libasis-3.12p.so.1
+lib/libasis-3.13p.so
+lib/libasis-3.13p.so.1
 @exec /sbin/ldconfig -m %D/lib
 @unexec /sbin/ldconfig -R