devel/gprbuild-aux: Update version GPL 2012 to GPL 2013

GPRBuild needs to be built with GNAT sources, so it now depends on
the new library lang/gnat_util.  It installs two new programs:
gprinstall and gprslave.  This is the latest version published by
Adacore.

12 files changed, 155 insertions, 100 deletions

diff --git a/devel/gprbuild-aux/Makefile b/devel/gprbuild-aux/Makefile
index cd9bf49b72e..1b595a8b905 100644
--- a/devel/gprbuild-aux/Makefile
+++ b/devel/gprbuild-aux/Makefile
@@ -1,24 +1,27 @@
-# $NetBSD: Makefile,v 1.3 2012/10/31 11:17:03 asau Exp $
+# $NetBSD: Makefile,v 1.4 2014/04/30 16:28:09 marino Exp $
 #
 
 DISTNAME=	gprbuild-aux-${SNAPSHOT}
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/ \
 		http://dragonlace.mirrors.ada.cx/src/
-DISTFILES=	gprbuild-gpl-2012-src.tgz
+DISTFILES=	gprbuild-gpl-${YEAR}-src.tgz
 
 MAINTAINER=	draco@marino.st
 HOMEPAGE=	http://www.adacore.com/home/products/gnatpro/toolsuite/gprbuild/
 COMMENT=	Adacore multi-language software build tool
 LICENSE=	gnu-gpl-v3
 
-SNAPSHOT=		20120510
+SNAPSHOT=		20130416
+YEAR=			2013
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c ada
 USE_TOOLS=		gmake
+MAKE_ARGS+=		BUILD=production
+MAKE_ARGS+=		PROCESSORS=${MAKE_JOBS:U1:Q}
 MAKE_ENV+=		ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 CONFIGURE_ENV+=		ADA_PROJECT_PATH=${PREFIX}/lib/gnat
-WRKSRC=			${WRKDIR}/gprbuild-2012-src
+WRKSRC=			${WRKDIR}/gprbuild-${YEAR}-src
 
 SUBST_CLASSES+= 	xml
 SUBST_STAGE.xml=	pre-configure
@@ -26,5 +29,15 @@ SUBST_MESSAGE.xml=	Edit compilers.xml to support lang/gcc-aux runtime
 SUBST_FILES.xml=	share/gprconfig/compilers.xml
 SUBST_SED.xml=		-e "s,@AUXPREFIX@,${PREFIX}/gcc-aux,"
 
+do-build:
+	# Recreate the do-build target without the -J parameter
+	# It interferes with the PROCESSORS configure argument
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gmake ${MAKE_ARGS} all
+
+post-install:
+	cd ${DESTDIR}${PREFIX}; ${FIND} share/examples -type d -empty | \
+		${SORT} -dr | ${XARGS} ${RMDIR}
+
 .include "../../textproc/xmlada/buildlink3.mk"
+.include "../../lang/gnat_util/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gprbuild-aux/PLIST b/devel/gprbuild-aux/PLIST
index daafc3f0015..6179738ed42 100644
--- a/devel/gprbuild-aux/PLIST
+++ b/devel/gprbuild-aux/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2012/07/08 20:08:42 marino Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/04/30 16:28:09 marino Exp $
 bin/gprbuild
 bin/gprclean
 bin/gprconfig
+bin/gprinstall
+bin/gprslave
 libexec/gprbuild/gprbind
 libexec/gprbuild/gprlib
 share/doc/gprbuild/html/gnat_style.css
@@ -120,6 +122,7 @@ share/examples/gprbuild/subsystems/util_src/ada_lib.ads
 share/examples/gprbuild/subsystems/util_src/c_lib.ads
 share/examples/gprbuild/subsystems/util_src/lib.c
 share/examples/gprbuild/subsystems/util_src/lib.h
+share/gpr/_default.gpr
 share/gprconfig/asm.xml
 share/gprconfig/c.xml
 share/gprconfig/compilers.xml
@@ -131,29 +134,4 @@ share/gprconfig/gprconfig.xsd
 share/gprconfig/linker.xml
 share/gprconfig/nocompiler.xml
 share/gprconfig/targetset.xml
-@pkgdir share/gpr
-@pkgdir share/examples/gprbuild/subsystems/obj_util
-@pkgdir share/examples/gprbuild/subsystems/obj1
-@pkgdir share/examples/gprbuild/subsystems/obj
-@pkgdir share/examples/gprbuild/scenarios/obj1
-@pkgdir share/examples/gprbuild/scenarios/obj
-@pkgdir share/examples/gprbuild/ppc-elf/objs
-@pkgdir share/examples/gprbuild/namings/obj-case3
-@pkgdir share/examples/gprbuild/namings/obj-case2
-@pkgdir share/examples/gprbuild/namings/obj-case1
-@pkgdir share/examples/gprbuild/matrix/obj
-@pkgdir share/examples/gprbuild/libraries/obj2
-@pkgdir share/examples/gprbuild/libraries/obj1
-@pkgdir share/examples/gprbuild/libraries/obj
-@pkgdir share/examples/gprbuild/libraries/lib3
-@pkgdir share/examples/gprbuild/libraries/lib2
-@pkgdir share/examples/gprbuild/libraries/lib
-@pkgdir share/examples/gprbuild/first_steps/obj1
-@pkgdir share/examples/gprbuild/first_steps/obj
-@pkgdir share/examples/gprbuild/extended_projects/new_obj_util
-@pkgdir share/examples/gprbuild/extended_projects/new_obj
-@pkgdir share/examples/gprbuild/ada_f77/obj
-@pkgdir share/examples/gprbuild/ada_f77/lib
-@pkgdir share/examples/gprbuild/ada_f77/fobj
-@pkgdir share/examples/gprbuild/ada_f77/dobj
-@pkgdir share/examples/gprbuild/ada_f77/dlib
+share/gprconfig/windres.xml
diff --git a/devel/gprbuild-aux/buildlink3.mk b/devel/gprbuild-aux/buildlink3.mk
index 523e7666f05..58341c6ef55 100644
--- a/devel/gprbuild-aux/buildlink3.mk
+++ b/devel/gprbuild-aux/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/07/08 20:08:42 marino Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2014/04/30 16:28:09 marino Exp $
 
 BUILDLINK_TREE+=	gprbuild-aux
 
 .if !defined(GPRBUILD_AUX_BUILDLINK3_MK)
 GPRBUILD_AUX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gprbuild-aux+=	gprbuild-aux>=20120510
+BUILDLINK_API_DEPENDS.gprbuild-aux+=	gprbuild-aux>=20130416
 BUILDLINK_PKGSRCDIR.gprbuild-aux?=	../../devel/gprbuild-aux
 
 .include "../../textproc/xmlada/buildlink3.mk"
diff --git a/devel/gprbuild-aux/distinfo b/devel/gprbuild-aux/distinfo
index 3d2d8e26fee..6cb7837daab 100644
--- a/devel/gprbuild-aux/distinfo
+++ b/devel/gprbuild-aux/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.3 2012/07/08 20:08:42 marino Exp $
+$NetBSD: distinfo,v 1.4 2014/04/30 16:28:09 marino Exp $
 
-SHA1 (gprbuild-gpl-2012-src.tgz) = 08fabf7ee1d49c00ef20c271239df1d64f56da11
-RMD160 (gprbuild-gpl-2012-src.tgz) = f1f1ef5e6de2faff5765eeeee4ddb382a00c911e
-Size (gprbuild-gpl-2012-src.tgz) = 2159669 bytes
-SHA1 (patch-Makefile.in) = 730c4b7a0a6b7f89b6f0639dbd91417c9d02789e
-SHA1 (patch-gprbuild.gpr) = abb482bc9dc2de967ad4a2e0bfa6fc562490bd0a
-SHA1 (patch-share_gprconfig_compilers.xml) = d64a8e27372bbc1abbbf1b5d44a6b2bb4671036b
-SHA1 (patch-share_gprconfig_gnat.xml) = 5e0ddcec2d46cbf0486556889845e10fab441ad8
-SHA1 (patch-share_gprconfig_linker.xml) = ad99b1d6f0d9199ca202f1dea2f7d0c8ffa5c3d3
-SHA1 (patch-share_gprconfig_targetset.xml) = 2bc382633eec715381fdfb5ac8e82edf026af5ad
-SHA1 (patch-src_gprlib.adb) = 9c3cf8116800ea6bd2741fa0da522e9886b7bcf1
+SHA1 (gprbuild-gpl-2013-src.tgz) = 71c6278fd19f80ba4574de2696bfb3cbb9be4b70
+RMD160 (gprbuild-gpl-2013-src.tgz) = 8a7b78a84e1d52afc4009dad64ea89e773f1f585
+Size (gprbuild-gpl-2013-src.tgz) = 2291685 bytes
+SHA1 (patch-Makefile.in) = adf984726ac1c9cfed3fd57ec969b25d7c059b18
+SHA1 (patch-gprbuild.gpr) = 5ed5b2079c1a5a16595753d9559259ab182dbaa6
+SHA1 (patch-share_gprconfig_compilers.xml) = a4ce52f729ef16c1d3fef94a386fb378b9e67d47
+SHA1 (patch-share_gprconfig_gnat.xml) = b9d25f257f937f6cc2bfca1a260425f6f590a88c
+SHA1 (patch-share_gprconfig_linker.xml) = 86d52185faaf863c9f54ecccd6ec657c46c0a44a
+SHA1 (patch-share_gprconfig_targetset.xml) = 53cdc66ec377de67ca997eaef866eacb8e04b962
+SHA1 (patch-src_gpr__version.adb) = c26bd88dac3672f0701980cf8975d67a305d5a31
+SHA1 (patch-src_gprlib.adb) = 6c5f24664c4dd9d8ee56c8df5cb05155053fa116
diff --git a/devel/gprbuild-aux/patches/patch-Makefile.in b/devel/gprbuild-aux/patches/patch-Makefile.in
index f9c90222a1d..ccb1d623140 100644
--- a/devel/gprbuild-aux/patches/patch-Makefile.in
+++ b/devel/gprbuild-aux/patches/patch-Makefile.in
@@ -1,17 +1,19 @@
-$NetBSD: patch-Makefile.in,v 1.1 2012/07/08 20:08:42 marino Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2014/04/30 16:28:09 marino Exp $
 
---- Makefile.in.orig	2012-01-04 15:36:14.000000000 +0000
+Support DESTDIR
+
+--- 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
+ 
+ .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}
  
- prefix=@prefix@
- srcdir=@srcdir@
-@@ -124,37 +124,35 @@ bootstrap-clean:
+ distall:
+@@ -124,45 +124,35 @@ bootstrap-clean:
  	  -XBUILD_TOOL=gprbuild
  
  install: install.data install.bin
@@ -21,10 +23,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 +47,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}${bindir} ${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-aux/patches/patch-gprbuild.gpr b/devel/gprbuild-aux/patches/patch-gprbuild.gpr
index 1cc6ed206bb..08b3c79d73a 100644
--- a/devel/gprbuild-aux/patches/patch-gprbuild.gpr
+++ b/devel/gprbuild-aux/patches/patch-gprbuild.gpr
@@ -1,13 +1,30 @@
-$NetBSD: patch-gprbuild.gpr,v 1.1 2012/07/08 20:08:42 marino Exp $
+$NetBSD: patch-gprbuild.gpr,v 1.2 2014/04/30 16:28:09 marino Exp $
 
---- gprbuild.gpr.orig	2012-05-10 13:59:06.000000000 +0000
+Use gnat_util library, not embedded GNAT sources
+
+--- 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-aux/patches/patch-share_gprconfig_compilers.xml b/devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml
index c7fa71c06be..70986efc95d 100644
--- a/devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml
+++ b/devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml
@@ -1,14 +1,16 @@
-$NetBSD: patch-share_gprconfig_compilers.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
+$NetBSD: patch-share_gprconfig_compilers.xml,v 1.2 2014/04/30 16:28:09 marino Exp $
 
---- share/gprconfig/compilers.xml.orig	2012-03-28 13:32:23.000000000 +0000
+Tailor standard gprbuild to recognize gcc-aux / Ada framework
+
+--- 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-aux/patches/patch-share_gprconfig_gnat.xml b/devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml
index b6fd155ad2d..7beaa197a55 100644
--- a/devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml
+++ b/devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml
@@ -1,6 +1,8 @@
-$NetBSD: patch-share_gprconfig_gnat.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
+$NetBSD: patch-share_gprconfig_gnat.xml,v 1.2 2014/04/30 16:28:09 marino Exp $
 
---- share/gprconfig/gnat.xml.orig	2012-03-30 17:17:06.000000000 +0000
+Tailor standard gprbuild to recognize gcc-aux / Ada framework
+
+--- 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-aux/patches/patch-share_gprconfig_linker.xml b/devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml
index e06042648d5..00252cce7cf 100644
--- a/devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml
+++ b/devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml
@@ -1,8 +1,10 @@
-$NetBSD: patch-share_gprconfig_linker.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
+$NetBSD: patch-share_gprconfig_linker.xml,v 1.2 2014/04/30 16:28:09 marino Exp $
 
---- share/gprconfig/linker.xml.orig	2012-04-11 21:09:08.000000000 +0000
+Tailor standard gprbuild to recognize gcc-aux / Ada framework
+
+--- 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 +20,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 +35,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 +45,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 +55,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-aux/patches/patch-share_gprconfig_targetset.xml b/devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml
index 72b84840410..31cfe14c687 100644
--- a/devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml
+++ b/devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml
@@ -1,6 +1,8 @@
-$NetBSD: patch-share_gprconfig_targetset.xml,v 1.1 2012/07/08 20:08:42 marino Exp $
+$NetBSD: patch-share_gprconfig_targetset.xml,v 1.2 2014/04/30 16:28:09 marino Exp $
 
---- share/gprconfig/targetset.xml.orig	2011-10-20 17:41:48.000000000 +0000
+Add / correct BSD targets
+
+--- share/gprconfig/targetset.xml.orig	2012-12-19 17:55:05.000000000 +0000
 +++ share/gprconfig/targetset.xml
 @@ -52,8 +52,8 @@
  
@@ -13,30 +15,33 @@ $NetBSD: patch-share_gprconfig_targetset.xml,v 1.1 2012/07/08 20:08:42 marino Ex
    </targetset>
  
    <!-- x86-windows (mingw) -->
-@@ -144,10 +144,29 @@
+@@ -144,10 +144,32 @@
  
-  <!-- Freebsd -->
+   <!-- Freebsd -->
    <targetset>
 -    <target>x86-freebsd</target>
      <target>i.86-.*freebsd.*</target>
++    <target>amd64-.*-freebsd.*</target>
 +    <target>x86_64-.*-freebsd.*</target>
    </targetset>
  
-+ <!-- DragonFlyBSD -->
++  <!-- DragonFlyBSD -->
 +  <targetset>
 +    <target>i.86-.*-dragonfly.*</target>
 +    <target>x86_64-.*-dragonfly.*</target>
 +  </targetset>
 +
-+ <!-- NetBSD -->
++  <!-- NetBSD -->
 +  <targetset>
 +    <target>i.86-.*-netbsd.*</target>
++    <target>amd64-.*-netbsd.*</target>
 +    <target>x86_64-.*-netbsd.*</target>
 +  </targetset>
 +
-+ <!-- OpenBSD -->
++  <!-- OpenBSD -->
 +  <targetset>
 +    <target>i.86-.*-openbsd.*</target>
++    <target>amd64-.*-openbsd.*</target>
 +    <target>x86_64-.*-openbsd.*</target>
 +  </targetset>
 +
diff --git a/devel/gprbuild-aux/patches/patch-src_gpr__version.adb b/devel/gprbuild-aux/patches/patch-src_gpr__version.adb
new file mode 100644
index 00000000000..99195b6ed67
--- /dev/null
+++ b/devel/gprbuild-aux/patches/patch-src_gpr__version.adb
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_gpr__version.adb,v 1.1 2014/04/30 16:28:09 marino Exp $
+
+Always use the FSF version (Not sure why Build_Type is not modified instead)
+
+--- 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-aux/patches/patch-src_gprlib.adb b/devel/gprbuild-aux/patches/patch-src_gprlib.adb
index 9aa7ce011ce..5bd521c3fe5 100644
--- a/devel/gprbuild-aux/patches/patch-src_gprlib.adb
+++ b/devel/gprbuild-aux/patches/patch-src_gprlib.adb
@@ -1,6 +1,9 @@
-$NetBSD: patch-src_gprlib.adb,v 1.1 2012/07/08 20:08:42 marino Exp $
+$NetBSD: patch-src_gprlib.adb,v 1.2 2014/04/30 16:28:09 marino Exp $
 
---- src/gprlib.adb.orig	2012-05-10 13:59:05.000000000 +0000
+Marino's modification to give Ada programs build with GPRBUILD proper
+-rpath support
+
+--- src/gprlib.adb.orig	2013-04-16 14:36:02.000000000 +0000
 +++ src/gprlib.adb
 @@ -390,6 +390,11 @@ procedure Gprlib is