11 files changed, 120 insertions, 221 deletions

diff --git a/devel/gprbuild/Makefile b/devel/gprbuild/Makefile
index 9a8cbd8de965..cf292349de6f 100644
--- a/devel/gprbuild/Makefile
+++ b/devel/gprbuild/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	gprbuild
 PORTVERSION=	${SNAPSHOT}
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
-DISTNAME=	gprbuild-gpl-2012-src
+DISTNAME=	gprbuild-gpl-${YEAR}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	marino@FreeBSD.org
@@ -13,27 +13,41 @@ COMMENT=	Adacore multi-language software build tool
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS+=	xmlada>=3.2:${PORTSDIR}/textproc/xmlada
+BUILD_DEPENDS+=	xmlada>=3.2:${PORTSDIR}/textproc/xmlada \
+		gnat_util>=2013:${PORTSDIR}/lang/gnat_util
 
-EXAMPLESDIR=	share/examples/gprbuild
-DOCSDIR=	share/doc/gprbuild
-WRKSRC=		${WRKDIR}/gprbuild-2012-src
-SNAPSHOT=	20120510
+WRKSRC=		${WRKDIR}/gprbuild-${YEAR}-src
+YEAR=		2013
+SNAPSHOT=	20130416
 GNU_CONFIGURE=	yes
 USES=		ada gmake
+CONFIGURE_ARGS+=BUILD=production
+CONFIGURE_ARGS+=PROCESSORS=${MAKE_JOBS_NUMBER}
+PORTDOCS=	html txt pdf info
+PORTEXAMPLES=	.
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.if ${OPSYS} == "FreeBSD"
-CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:L}${OSREL}
-.endif
+.include <bsd.port.options.mk>
+
+do-build:
+#	Recreate the do-build target without -j parameter
+#	It interferes with PROCESSORS configure argument
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET})
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,@AUXPREFIX@,${PREFIX}/gcc-aux," \
 	  ${WRKSRC}/share/gprconfig/compilers.xml
 
 post-install:
-	cd ${STAGEDIR}${PREFIX}; ${FIND} share -type d -empty | \
+.if !${PORT_OPTIONS:MDOCS}
+	${RM} -rf ${STAGEDIR}${DOCSDIR}
+.endif
+.if !${PORT_OPTIONS:MEXAMPLES}
+	${RM} -rf ${STAGEDIR}${EXAMPLESDIR}
+.endif
+	cd ${STAGEDIR}${PREFIX}; ${FIND} share/examples -type d -empty | \
 	  ${SORT} -dr | ${XARGS} ${RMDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gprbuild/distinfo b/devel/gprbuild/distinfo
index 01ea22cbd556..0458b89c6921 100644
--- a/devel/gprbuild/distinfo
+++ b/devel/gprbuild/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gprbuild-gpl-2012-src.tgz) = 6884def18abae463ffcc31a958f3aba804e5445ebdaef7d6b27c3c8efc912eb4
-SIZE (gprbuild-gpl-2012-src.tgz) = 2159669
+SHA256 (gprbuild-gpl-2013-src.tgz) = 7492347462d0a11a3672397a991ce3741347def3a468f850a91a54dfd4349144
+SIZE (gprbuild-gpl-2013-src.tgz) = 2291685
diff --git a/devel/gprbuild/files/patch-Makefile.in b/devel/gprbuild/files/patch-Makefile.in
index f9c90222a1d9..1ed0dc172e9e 100644
--- a/devel/gprbuild/files/patch-Makefile.in
+++ b/devel/gprbuild/files/patch-Makefile.in
@@ -1,17 +1,15 @@
-$NetBSD: patch-Makefile.in,v 1.1 2012/07/08 20:08:42 marino Exp $
-
---- Makefile.in.orig	2012-01-04 15:36:14.000000000 +0000
+--- Makefile.in.orig	2013-03-04 17:43:09.000000000 +0000
 +++ Makefile.in
-@@ -19,7 +19,7 @@ EXEXT=
- endif
- CP=cp -p
- MKDIR=mkdir -p
--BUILD=debug
-+BUILD=production
+@@ -64,7 +64,7 @@ ADA_GEN_SUBDIR=gnat
  
- prefix=@prefix@
- srcdir=@srcdir@
-@@ -124,37 +124,35 @@ bootstrap-clean:
+ .PHONY: all distall gprbuild gprconfig gprclean gprinstall \
+ 	copy_gnat_src complete bootstrap
+-all: $(xmlada_build_target) $(ADA_GEN_SUBDIR)/stamp-snames
++all: $(xmlada_build_target)
+ 	${GNATMAKE} $(xmlada_prj_flags) -Pgprbuild -XBUILD=${BUILD}
+ 
+ distall:
+@@ -124,45 +124,35 @@ bootstrap-clean:
  	  -XBUILD_TOOL=gprbuild
  
  install: install.data install.bin
@@ -21,10 +19,10 @@ $NetBSD: patch-Makefile.in,v 1.1 2012/07/08 20:08:42 marino Exp $
 -	${CP} -r examples/* ${datadir}/examples/gprbuild
 -	${RM} -r ${datadir}/doc/gprbuild
 -	-${MKDIR} ${datadir}/doc/gprbuild
-+	-${MKDIR} ${DESTDIR}${datadir}/gpr
-+	-${MKDIR} ${DESTDIR}${datadir}/examples/gprbuild
++	-${MKDIR} ${DESTDIR}${datadir}/gpr \
++		${DESTDIR}${datadir}/examples/gprbuild \
++		${DESTDIR}${datadir}/doc/gprbuild
 +	${CP} -r examples/* ${DESTDIR}${datadir}/examples/gprbuild
-+	-${MKDIR} ${DESTDIR}${datadir}/doc/gprbuild
  	for format in html txt pdf info; do \
  	  if [ -d doc/$$format ] ; then \
 -	     ${MKDIR} ${datadir}/doc/gprbuild/$$format; \
@@ -45,25 +43,33 @@ $NetBSD: patch-Makefile.in,v 1.1 2012/07/08 20:08:42 marino Exp $
 -	-${MKDIR} ${datadir}/gprconfig
 -	${CP} share/gprconfig/*.xml ${datadir}/gprconfig
 -	${CP} share/gprconfig/gprconfig.xsd ${datadir}/gprconfig
-+	-${MKDIR} ${DESTDIR}${datadir}/gprconfig
-+	${INSTALL_DATA} share/gprconfig/*.xml ${DESTDIR}${datadir}/gprconfig
-+	${INSTALL_DATA} share/gprconfig/gprconfig.xsd ${DESTDIR}${datadir}/gprconfig
+-	-${MKDIR} ${datadir}/gpr
+-	${CP} share/_default.gpr ${datadir}/gpr
++	-${MKDIR} ${DESTDIR}${datadir}/gprconfig ${DESTDIR}${datadir}/gpr
++	${BSD_INSTALL_DATA} share/gprconfig/*.xml \
++		share/gprconfig/gprconfig.xsd ${DESTDIR}${datadir}/gprconfig
++	${BSD_INSTALL_DATA} share/_default.gpr ${DESTDIR}${datadir}/gpr
  
  install.bin: force
 -	-${MKDIR} ${bindir}
 -	${INSTALL_PROGRAM} gprconfig${EXEXT} ${bindir}
 -	${INSTALL_PROGRAM} gprbuild${EXEXT} ${bindir}
 -	${INSTALL_PROGRAM} gprclean${EXEXT} ${bindir}
+-	${INSTALL_PROGRAM} gprinstall${EXEXT} ${bindir}
+-ifeq ($(IS_WINDOWS),true)
+-	${CP} src/gprinstall.exe.manifest ${bindir}
+-	chmod +x ${bindir}/gprinstall.exe.manifest
+-endif
+-	${INSTALL_PROGRAM} gprslave${EXEXT} ${bindir}
 -	-${MKDIR} ${libexecdir}/gprbuild
 -	${INSTALL_PROGRAM} gprbind${EXEXT} ${libexecdir}/gprbuild/
 -	${INSTALL_PROGRAM} gprlib${EXEXT} ${libexecdir}/gprbuild/
-+	-${MKDIR} ${DESTDIR}${bindir}
-+	${INSTALL_PROGRAM} gprconfig${EXEXT} ${DESTDIR}${bindir}
-+	${INSTALL_PROGRAM} gprbuild${EXEXT} ${DESTDIR}${bindir}
-+	${INSTALL_PROGRAM} gprclean${EXEXT} ${DESTDIR}${bindir}
-+	-${MKDIR} ${DESTDIR}${libexecdir}/gprbuild
-+	${INSTALL_PROGRAM} gprbind${EXEXT} ${DESTDIR}${libexecdir}/gprbuild/
-+	${INSTALL_PROGRAM} gprlib${EXEXT} ${DESTDIR}${libexecdir}/gprbuild/
++	${MKDIR} ${DESTDIR}${libexecdir}/gprbuild
++	${BSD_INSTALL_PROGRAM} gprconfig${EXEXT} gprbuild${EXEXT} \
++		gprclean${EXEXT} gprinstall${EXEXT} gprslave${EXEXT} \
++		${DESTDIR}${bindir}
++	${BSD_INSTALL_PROGRAM} gprbind${EXEXT} gprlib${EXEXT} \
++		${DESTDIR}${libexecdir}/gprbuild
  
  $(objdir)/gprbuild_dummies.o: src/gprbuild_dummies.c
  	gcc -c -o $@ $<
diff --git a/devel/gprbuild/files/patch-gprbuild.gpr b/devel/gprbuild/files/patch-gprbuild.gpr
index 1cc6ed206bb7..1b25ec3d5231 100644
--- a/devel/gprbuild/files/patch-gprbuild.gpr
+++ b/devel/gprbuild/files/patch-gprbuild.gpr
@@ -1,13 +1,26 @@
-$NetBSD: patch-gprbuild.gpr,v 1.1 2012/07/08 20:08:42 marino Exp $
-
---- gprbuild.gpr.orig	2012-05-10 13:59:06.000000000 +0000
+--- gprbuild.gpr.orig	2013-04-16 14:36:04.000000000 +0000
 +++ gprbuild.gpr
-@@ -80,7 +80,7 @@ project Gprbuild is
-               ("-pg", "-g");
-          when "production" =>
-             for Default_Switches ("Ada") use common_switches &
--              ("-O2", "-gnatpn", "-gnatws");
-+              ("-g", "-O2", "-gnatpn", "-gnatws");
-       end case;
-    end Compiler;
+@@ -1,4 +1,5 @@
+ with "xmlada";
++with "gnat_util";
  
+ project Gprbuild is
+    type OS_Type is ("unix", "avms", "ivms", "Windows_NT");
+@@ -24,7 +25,7 @@ project Gprbuild is
+         "gprinstall-main.adb",
+         "gprslave.adb");
+ 
+-   for Source_Dirs use ("src", "gnat");
++   for Source_Dirs use ("src");
+ 
+    case Build_Tool is
+       when "gprbuild" =>
+@@ -173,8 +174,6 @@ project Gprbuild is
+          when "unix" | "Windows_NT" =>
+             for Body ("gprlib.build_shared_lib")
+               use "gprlib-build_shared_lib-nosymbols.adb";
+-            for Body ("mlib.tgt.specific")
+-              use "mlib-tgt-specific.adb";
+          when "avms" =>
+             for Body ("gprlib.build_shared_lib")
+               use "gprlib-build_shared_lib-vms.adb";
diff --git a/devel/gprbuild/files/patch-share_gprconfig_compilers.xml b/devel/gprbuild/files/patch-share_gprconfig_compilers.xml
index c7fa71c06be0..2e492859d1b1 100644
--- a/devel/gprbuild/files/patch-share_gprconfig_compilers.xml
+++ b/devel/gprbuild/files/patch-share_gprconfig_compilers.xml
@@ -1,14 +1,12 @@
-$NetBSD: patch-share_gprconfig_compilers.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
-
---- share/gprconfig/compilers.xml.orig	2012-03-28 13:32:23.000000000 +0000
+--- share/gprconfig/compilers.xml.orig	2013-01-09 18:09:30.000000000 +0000
 +++ share/gprconfig/compilers.xml
-@@ -418,16 +418,15 @@
+@@ -456,16 +456,15 @@
      </version>
      <languages>Ada</languages>
      <variable name="gcc_version">
 -      <external>${PREFIX}gcc -v</external>
 +      <external>${PREFIX}ada -v</external>
-       <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
+       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
      </variable>
      <runtimes default="default,kernel,native">
 -       <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
diff --git a/devel/gprbuild/files/patch-share_gprconfig_gnat.xml b/devel/gprbuild/files/patch-share_gprconfig_gnat.xml
index b6fd155ad2d2..5f58e8d284aa 100644
--- a/devel/gprbuild/files/patch-share_gprconfig_gnat.xml
+++ b/devel/gprbuild/files/patch-share_gprconfig_gnat.xml
@@ -1,6 +1,4 @@
-$NetBSD: patch-share_gprconfig_gnat.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
-
---- share/gprconfig/gnat.xml.orig	2012-03-30 17:17:06.000000000 +0000
+--- share/gprconfig/gnat.xml.orig	2013-01-16 21:07:55.000000000 +0000
 +++ share/gprconfig/gnat.xml
 @@ -63,7 +63,7 @@
     </config>
diff --git a/devel/gprbuild/files/patch-share_gprconfig_linker.xml b/devel/gprbuild/files/patch-share_gprconfig_linker.xml
index e06042648d5d..679b8d83a9d4 100644
--- a/devel/gprbuild/files/patch-share_gprconfig_linker.xml
+++ b/devel/gprbuild/files/patch-share_gprconfig_linker.xml
@@ -1,8 +1,6 @@
-$NetBSD: patch-share_gprconfig_linker.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
-
---- share/gprconfig/linker.xml.orig	2012-04-11 21:09:08.000000000 +0000
+--- share/gprconfig/linker.xml.orig	2013-01-25 17:01:24.000000000 +0000
 +++ share/gprconfig/linker.xml
-@@ -437,11 +437,14 @@
+@@ -519,11 +519,14 @@
      </config>
    </configuration>
  
@@ -18,7 +16,7 @@ $NetBSD: patch-share_gprconfig_linker.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
         <target name="^.*irix.*$" />
      </targets>
      <config>
-@@ -487,10 +490,13 @@
+@@ -557,10 +560,13 @@
      </config>
    </configuration>
  
@@ -33,7 +31,7 @@ $NetBSD: patch-share_gprconfig_linker.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
      </targets>
      <config>
     for Run_Path_Option  use ("-Wl,-rpath,");
-@@ -781,6 +787,9 @@
+@@ -888,6 +894,9 @@
         <target name="^.*mingw.*$" />
         <target name="^.*linux.*$" />
         <target name="^.*freebsd.*$" />
@@ -43,7 +41,7 @@ $NetBSD: patch-share_gprconfig_linker.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
       </targets>
      <compilers negate="true">
         <compiler language="C++" />
-@@ -820,6 +829,9 @@
+@@ -929,6 +938,9 @@
         <target name="^.*mingw.*$" />
         <target name="^.*linux.*$" />
         <target name="^.*freebsd.*$" />
@@ -53,7 +51,7 @@ $NetBSD: patch-share_gprconfig_linker.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
       </targets>
      <compilers negate="true">
         <compiler language="C++" />
-@@ -859,6 +871,9 @@
+@@ -970,6 +982,9 @@
         <target name="^.*mingw.*$" />
         <target name="^.*linux.*$" />
         <target name="^.*freebsd.*$" />
diff --git a/devel/gprbuild/files/patch-share_gprconfig_targetset.xml b/devel/gprbuild/files/patch-share_gprconfig_targetset.xml
index 72b848404109..1cd47b7ede46 100644
--- a/devel/gprbuild/files/patch-share_gprconfig_targetset.xml
+++ b/devel/gprbuild/files/patch-share_gprconfig_targetset.xml
@@ -1,6 +1,4 @@
-$NetBSD: patch-share_gprconfig_targetset.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
-
---- share/gprconfig/targetset.xml.orig	2011-10-20 17:41:48.000000000 +0000
+--- share/gprconfig/targetset.xml.orig	2012-12-19 17:55:05.000000000 +0000
 +++ share/gprconfig/targetset.xml
 @@ -52,8 +52,8 @@
  
@@ -15,7 +13,7 @@ $NetBSD: patch-share_gprconfig_targetset.xml,v 1.1 2012/07/08 20:08:42 marino Ex
    <!-- x86-windows (mingw) -->
 @@ -144,10 +144,29 @@
  
-  <!-- Freebsd -->
+   <!-- Freebsd -->
    <targetset>
 -    <target>x86-freebsd</target>
      <target>i.86-.*freebsd.*</target>
diff --git a/devel/gprbuild/files/patch-src_gpr__version.adb b/devel/gprbuild/files/patch-src_gpr__version.adb
new file mode 100644
index 000000000000..12c40eca665d
--- /dev/null
+++ b/devel/gprbuild/files/patch-src_gpr__version.adb
@@ -0,0 +1,18 @@
+--- src/gpr_version.adb.orig	2013-04-16 14:36:02.000000000 +0000
++++ src/gpr_version.adb
+@@ -65,14 +65,7 @@ package body GPR_Version is
+          end if;
+       end loop Last_Loop;
+ 
+-      case Build_Type is
+-         when Gnatpro =>
+-            return "Pro " & Gpr_Version & " " & Date & Host;
+-         when GPL =>
+-            return "GPL " & Gpr_Version & " " & Date & Host;
+-         when FSF =>
+-            return Gpr_Version & " " & Date & Host;
+-      end case;
++      return Gpr_Version & " " & Date & Host;
+    end Gpr_Version_String;
+ 
+ end GPR_Version;
diff --git a/devel/gprbuild/files/patch-src_gprlib.adb b/devel/gprbuild/files/patch-src_gprlib.adb
index 9aa7ce011ce1..b2a2fe87d126 100644
--- a/devel/gprbuild/files/patch-src_gprlib.adb
+++ b/devel/gprbuild/files/patch-src_gprlib.adb
@@ -1,6 +1,4 @@
-$NetBSD: patch-src_gprlib.adb,v 1.1 2012/07/08 20:08:42 marino Exp $
-
---- src/gprlib.adb.orig	2012-05-10 13:59:05.000000000 +0000
+--- src/gprlib.adb.orig	2013-04-16 14:36:02.000000000 +0000
 +++ src/gprlib.adb
 @@ -390,6 +390,11 @@ procedure Gprlib is
  
diff --git a/devel/gprbuild/pkg-plist b/devel/gprbuild/pkg-plist
index f4db3c00584a..60415c18bb85 100644
--- a/devel/gprbuild/pkg-plist
+++ b/devel/gprbuild/pkg-plist
@@ -1,124 +1,11 @@
 bin/gprbuild
 bin/gprclean
 bin/gprconfig
+bin/gprinstall
+bin/gprslave
 libexec/gprbuild/gprbind
 libexec/gprbuild/gprlib
-%%DOCSDIR%%/html/gnat_style.css
-%%DOCSDIR%%/html/gprbuild.css
-%%DOCSDIR%%/html/gprbuild_ug.html
-%%DOCSDIR%%/html/gps_index.xml
-%%DOCSDIR%%/html/important.png
-%%DOCSDIR%%/html/note.png
-%%DOCSDIR%%/html/tip.png
-%%DOCSDIR%%/info/gprbuild_ug.info
-%%DOCSDIR%%/pdf/gprbuild_ug.pdf
-%%DOCSDIR%%/txt/gprbuild_ug.txt
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/ada_cpp/Makefile
-%%EXAMPLESDIR%%/ada_cpp/animals.gpr
-%%EXAMPLESDIR%%/ada_cpp/except.gpr
-%%EXAMPLESDIR%%/ada_cpp/src1/ada_main.adb
-%%EXAMPLESDIR%%/ada_cpp/src1/call_cpp.adb
-%%EXAMPLESDIR%%/ada_cpp/src1/call_cpp.ads
-%%EXAMPLESDIR%%/ada_cpp/src1/cpp_main.cpp
-%%EXAMPLESDIR%%/ada_cpp/src1/cpp_routine.cpp
-%%EXAMPLESDIR%%/ada_cpp/src1/cpp_routine.h
-%%EXAMPLESDIR%%/ada_cpp/src2/animals.adb
-%%EXAMPLESDIR%%/ada_cpp/src2/animals.ads
-%%EXAMPLESDIR%%/ada_cpp/src2/animals.h
-%%EXAMPLESDIR%%/ada_cpp/src2/animals_c.cc
-%%EXAMPLESDIR%%/ada_cpp/src2/animals_interfaces.ads
-%%EXAMPLESDIR%%/ada_cpp/src2/main.adb
-%%EXAMPLESDIR%%/ada_f77/Makefile
-%%EXAMPLESDIR%%/ada_f77/ess.f
-%%EXAMPLESDIR%%/ada_f77/fm.gpr
-%%EXAMPLESDIR%%/ada_f77/ft.gpr
-%%EXAMPLESDIR%%/ada_f77/src/fm-interfac.adb
-%%EXAMPLESDIR%%/ada_f77/src/fm-interfac.ads
-%%EXAMPLESDIR%%/ada_f77/src/fm-locks.adb
-%%EXAMPLESDIR%%/ada_f77/src/fm-locks.ads
-%%EXAMPLESDIR%%/ada_f77/src/fm-protected_queue.adb
-%%EXAMPLESDIR%%/ada_f77/src/fm-protected_queue.ads
-%%EXAMPLESDIR%%/ada_f77/src/fm-system_dependant.adb
-%%EXAMPLESDIR%%/ada_f77/src/fm-system_dependant.ads
-%%EXAMPLESDIR%%/ada_f77/src/fm-tuple_manager.adb
-%%EXAMPLESDIR%%/ada_f77/src/fm-tuple_manager.ads
-%%EXAMPLESDIR%%/ada_f77/src/fm-types.ads
-%%EXAMPLESDIR%%/ada_f77/src/fm.adb
-%%EXAMPLESDIR%%/ada_f77/src/fm.ads
-%%EXAMPLESDIR%%/extended_projects/Makefile
-%%EXAMPLESDIR%%/extended_projects/new_ada_main.gpr
-%%EXAMPLESDIR%%/extended_projects/new_ada_src/ada_main.adb
-%%EXAMPLESDIR%%/extended_projects/new_common_subsystem.gpr
-%%EXAMPLESDIR%%/extended_projects/new_util_src/c_lib.ads
-%%EXAMPLESDIR%%/extended_projects/new_util_src/lib2.c
-%%EXAMPLESDIR%%/first_steps/Makefile
-%%EXAMPLESDIR%%/first_steps/ada_main.gpr
-%%EXAMPLESDIR%%/first_steps/ada_src/ada_main.adb
-%%EXAMPLESDIR%%/first_steps/c_main.gpr
-%%EXAMPLESDIR%%/first_steps/c_src/c_main.c
-%%EXAMPLESDIR%%/first_steps/util_src/ada_lib.adb
-%%EXAMPLESDIR%%/first_steps/util_src/ada_lib.ads
-%%EXAMPLESDIR%%/first_steps/util_src/c_lib.ads
-%%EXAMPLESDIR%%/first_steps/util_src/lib.c
-%%EXAMPLESDIR%%/first_steps/util_src/lib.h
-%%EXAMPLESDIR%%/libraries/Makefile
-%%EXAMPLESDIR%%/libraries/Makefile2
-%%EXAMPLESDIR%%/libraries/ada_main.adb
-%%EXAMPLESDIR%%/libraries/c_main.c
-%%EXAMPLESDIR%%/libraries/dynamic_lib.gpr
-%%EXAMPLESDIR%%/libraries/extern_lib.gpr
-%%EXAMPLESDIR%%/libraries/lib_src/ada_lib.adb
-%%EXAMPLESDIR%%/libraries/lib_src/ada_lib.ads
-%%EXAMPLESDIR%%/libraries/lib_src/c_lib.ads
-%%EXAMPLESDIR%%/libraries/lib_src/lib.c
-%%EXAMPLESDIR%%/libraries/lib_src/lib.h
-%%EXAMPLESDIR%%/libraries/main0.gpr
-%%EXAMPLESDIR%%/libraries/main1.gpr
-%%EXAMPLESDIR%%/libraries/main2.gpr
-%%EXAMPLESDIR%%/libraries/main3.gpr
-%%EXAMPLESDIR%%/libraries/main4.gpr
-%%EXAMPLESDIR%%/libraries/sa_lib.gpr
-%%EXAMPLESDIR%%/libraries/static_lib.gpr
-%%EXAMPLESDIR%%/matrix/Makefile
-%%EXAMPLESDIR%%/matrix/matrix.gpr
-%%EXAMPLESDIR%%/matrix/src/initmat.c
-%%EXAMPLESDIR%%/matrix/src/main.adb
-%%EXAMPLESDIR%%/matrix/src/multmat.f
-%%EXAMPLESDIR%%/namings/Makefile
-%%EXAMPLESDIR%%/namings/_print2.ada
-%%EXAMPLESDIR%%/namings/_print3.adb
-%%EXAMPLESDIR%%/namings/main.adb
-%%EXAMPLESDIR%%/namings/my_routine.c1
-%%EXAMPLESDIR%%/namings/my_routine2.c1
-%%EXAMPLESDIR%%/namings/namings.gpr
-%%EXAMPLESDIR%%/namings/src1/main.adb
-%%EXAMPLESDIR%%/namings/util-case1.ada
-%%EXAMPLESDIR%%/namings/util-case2.ada
-%%EXAMPLESDIR%%/namings/util.ads
-%%EXAMPLESDIR%%/ppc-elf/Makefile
-%%EXAMPLESDIR%%/ppc-elf/gdb.run
-%%EXAMPLESDIR%%/ppc-elf/hello.gpr
-%%EXAMPLESDIR%%/ppc-elf/srcs/c_io.c
-%%EXAMPLESDIR%%/ppc-elf/srcs/hello.adb
-%%EXAMPLESDIR%%/ppc-elf/srcs/ppc_start.s
-%%EXAMPLESDIR%%/ppc-elf/srcs/textio.adb
-%%EXAMPLESDIR%%/ppc-elf/srcs/textio.ads
-%%EXAMPLESDIR%%/scenarios/Makefile
-%%EXAMPLESDIR%%/scenarios/general_lib.gpr
-%%EXAMPLESDIR%%/scenarios/main.gpr
-%%EXAMPLESDIR%%/subsystems/Makefile
-%%EXAMPLESDIR%%/subsystems/ada_main.gpr
-%%EXAMPLESDIR%%/subsystems/ada_src/ada_main.adb
-%%EXAMPLESDIR%%/subsystems/attribute_sharing.gpr
-%%EXAMPLESDIR%%/subsystems/c_main.gpr
-%%EXAMPLESDIR%%/subsystems/c_src/c_main.c
-%%EXAMPLESDIR%%/subsystems/common_subsystem.gpr
-%%EXAMPLESDIR%%/subsystems/util_src/ada_lib.adb
-%%EXAMPLESDIR%%/subsystems/util_src/ada_lib.ads
-%%EXAMPLESDIR%%/subsystems/util_src/c_lib.ads
-%%EXAMPLESDIR%%/subsystems/util_src/lib.c
-%%EXAMPLESDIR%%/subsystems/util_src/lib.h
+share/gpr/_default.gpr
 share/gprconfig/asm.xml
 share/gprconfig/c.xml
 share/gprconfig/compilers.xml
@@ -130,36 +17,7 @@ share/gprconfig/gprconfig.xsd
 share/gprconfig/linker.xml
 share/gprconfig/nocompiler.xml
 share/gprconfig/targetset.xml
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%/info
-@dirrm %%DOCSDIR%%/pdf
-@dirrm %%DOCSDIR%%/txt
-@dirrm %%DOCSDIR%%
-@dirrmtry %%EXAMPLESDIR%%/ada_cpp/src1
-@dirrmtry %%EXAMPLESDIR%%/ada_cpp/src2
-@dirrmtry %%EXAMPLESDIR%%/ada_cpp
-@dirrmtry %%EXAMPLESDIR%%/ada_f77/src
-@dirrmtry %%EXAMPLESDIR%%/ada_f77
-@dirrmtry %%EXAMPLESDIR%%/extended_projects/new_ada_src
-@dirrmtry %%EXAMPLESDIR%%/extended_projects/new_util_src
-@dirrmtry %%EXAMPLESDIR%%/extended_projects
-@dirrmtry %%EXAMPLESDIR%%/first_steps/ada_src
-@dirrmtry %%EXAMPLESDIR%%/first_steps/c_src
-@dirrmtry %%EXAMPLESDIR%%/first_steps/util_src
-@dirrmtry %%EXAMPLESDIR%%/first_steps
-@dirrmtry %%EXAMPLESDIR%%/libraries/lib_src
-@dirrmtry %%EXAMPLESDIR%%/libraries
-@dirrmtry %%EXAMPLESDIR%%/matrix/src
-@dirrmtry %%EXAMPLESDIR%%/matrix
-@dirrmtry %%EXAMPLESDIR%%/namings/src1
-@dirrmtry %%EXAMPLESDIR%%/namings
-@dirrmtry %%EXAMPLESDIR%%/ppc-elf/srcs
-@dirrmtry %%EXAMPLESDIR%%/ppc-elf
-@dirrmtry %%EXAMPLESDIR%%/scenarios
-@dirrmtry %%EXAMPLESDIR%%/subsystems/ada_src
-@dirrmtry %%EXAMPLESDIR%%/subsystems/c_src
-@dirrmtry %%EXAMPLESDIR%%/subsystems/util_src
-@dirrmtry %%EXAMPLESDIR%%/subsystems
-@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry libexec/gprbuild
+share/gprconfig/windres.xml
+@dirrm libexec/gprbuild
+@dirrmtry share/gpr
 @dirrmtry share/gprconfig