pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   marino
Date:           Fri Nov 25 20:36:50 UTC 2016

Modified Files:
        pkgsrc/cad/ghdl: Makefile
        pkgsrc/devel/florist: Makefile
        pkgsrc/devel/gprbuild-aux: Makefile PLIST distinfo
        pkgsrc/devel/gprbuild-aux/patches: patch-share_gprconfig_compilers.xml
            patch-share_gprconfig_gnat.xml patch-share_gprconfig_linker.xml
            patch-share_gprconfig_targetset.xml patch-src_gprlib.adb
        pkgsrc/devel/gps: Makefile
        pkgsrc/lang/gnat_util: Makefile Makefile.sources distinfo
        pkgsrc/mk/compiler: gcc.mk
        pkgsrc/textproc/xmlada: Makefile
        pkgsrc/www/aws: Makefile
        pkgsrc/www/aws-demos: Makefile
        pkgsrc/x11/gtkada: Makefile
Removed Files:
        pkgsrc/devel/gprbuild-aux/patches: patch-Makefile.in patch-gprbuild.gpr
            patch-src_gpr__version.adb

Log Message:
Upgrade USE_LANGUAGES=ada to use lang/gcc5-aux instead of lang/gcc-aux

This large commit accomplishes the following:

1) Switch USE_LANGUAGES=ada to require lang/gcc5-aux (gcc 5.4) instead
   of lang/gcc-aux (gcc 4.9.2) on gcc.mk
2) Bump affected ports and fix paths as necessary
3) Upgrade devel/gprbuild to the latest release
   - No longer requires lang/gnat_util
   - gprslave requires gcc6-aux, so it was disabled for now
4) Fix lang/gnat_util but set PKG_SKIP_REASON
   - It has no further purpose in the pkgsrc tree
   - It has no practical purpose outside of the pkgsrc tree
   - Indicate intent to remove from tree in Jan. 2017
5) Set devel/GPS as failed with PKG_FAIL_REASON
   - This version of GPS is several years old and at the time they were
     strongly tied to compiler.
   - Latest release of GPS require gcc6-aux (not available) and several
     new and complex dependencies
   - maintainer (me) has no interest to continue supporting it
   - Leaving GPS in place until Jan 2017 to give another person chance to
     upgrade and take over support
   - Latest version in FreeBSD Ports Collection as a reference point


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cad/ghdl/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/florist/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/gprbuild-aux/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gprbuild-aux/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/gprbuild-aux/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/gprbuild-aux/patches/patch-Makefile.in \
    pkgsrc/devel/gprbuild-aux/patches/patch-gprbuild.gpr
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml \
    pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml \
    pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml \
    pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml \
    pkgsrc/devel/gprbuild-aux/patches/patch-src_gprlib.adb
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/gprbuild-aux/patches/patch-src_gpr__version.adb
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/gps/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gnat_util/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gnat_util/Makefile.sources
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gnat_util/distinfo
cvs rdiff -u -r1.170 -r1.171 pkgsrc/mk/compiler/gcc.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/xmlada/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/aws/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/aws-demos/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/gtkada/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/ghdl/Makefile
diff -u pkgsrc/cad/ghdl/Makefile:1.4 pkgsrc/cad/ghdl/Makefile:1.5
--- pkgsrc/cad/ghdl/Makefile:1.4        Thu Dec 11 20:12:36 2014
+++ pkgsrc/cad/ghdl/Makefile    Fri Nov 25 20:36:50 2016
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2014/12/11 20:12:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/11/25 20:36:50 marino Exp $
 
 GCCVER=                4.9.2
 DISTNAME=      ghdl-0.32rc1
 CATEGORIES=    cad
+PKGREVISION=   1
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tar.bz2
 GCCDISTNAME=   gcc-${GCCVER}.tar.bz2

Index: pkgsrc/devel/florist/Makefile
diff -u pkgsrc/devel/florist/Makefile:1.18 pkgsrc/devel/florist/Makefile:1.19
--- pkgsrc/devel/florist/Makefile:1.18  Thu Nov 24 00:27:03 2016
+++ pkgsrc/devel/florist/Makefile       Fri Nov 25 20:36:49 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2016/11/24 00:27:03 marino Exp $
+# $NetBSD: Makefile,v 1.19 2016/11/25 20:36:49 marino Exp $
 #
 
 DISTNAME=              florist-gpl-2012-src
 PKGNAME=               florist-gpl-2012
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            devel
 MASTER_SITES=          http://downloads.dragonlace.net/src/
 EXTRACT_SUFX=          .tgz

Index: pkgsrc/devel/gprbuild-aux/Makefile
diff -u pkgsrc/devel/gprbuild-aux/Makefile:1.6 pkgsrc/devel/gprbuild-aux/Makefile:1.7
--- pkgsrc/devel/gprbuild-aux/Makefile:1.6      Fri Nov 25 01:05:47 2016
+++ pkgsrc/devel/gprbuild-aux/Makefile  Fri Nov 25 20:36:49 2016
@@ -1,38 +1,29 @@
-# $NetBSD: Makefile,v 1.6 2016/11/25 01:05:47 marino Exp $
+# $NetBSD: Makefile,v 1.7 2016/11/25 20:36:49 marino Exp $
 #
 
 DISTNAME=      gprbuild-aux-${SNAPSHOT}
 CATEGORIES=    devel
-MASTER_SITES=  http://downloads.dragonlace.net/src/
-DISTFILES=     gprbuild-gpl-${YEAR}-src.tgz
+MASTER_SITES=  https://codeload.github.com/AdaCore/gprbuild/tar.gz/${TAGNAME}?dummy=/
+DISTFILES=     gprbuild-${TAGNAME}.tar.gz
 
 MAINTAINER=    draco%marino.st@localhost
 HOMEPAGE=      http://www.adacore.com/home/products/gnatpro/toolsuite/gprbuild/
 COMMENT=       Adacore multi-language software build tool
 LICENSE=       gnu-gpl-v3
 
-SNAPSHOT=              20130416
-YEAR=                  2013
-GNU_CONFIGURE=         yes
+SNAPSHOT=              20160609
+TAGNAME=               376670f
 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-${YEAR}-src
-
-SUBST_CLASSES+=        xml
-SUBST_STAGE.xml=       pre-configure
-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
+BUILD_MAKE_FLAGS=      BUILD=production \
+                       PROCESSORS=${MAKE_JOBS:U1:Q}
+MAKE_ENV=              ADA_PROJECT_PATH=${PREFIX}/lib/gnat
+WRKSRC=                        ${WRKDIR}/gprbuild-${TAGNAME}
+BUILD_DIRS=            ${WRKSRC}/construction
+
+post-patch:
+       ${MKDIR} ${WRKDIR}/trash ${BUILD_DIRS}
+       ${CP} ${FILESDIR}/Makefile.BSD ${BUILD_DIRS}/Makefile
+       ${MV} ${WRKSRC}/share/gprconfig/*.orig ${WRKDIR}/trash
 
 .include "../../textproc/xmlada/buildlink3.mk"
-.include "../../lang/gnat_util/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gprbuild-aux/PLIST
diff -u pkgsrc/devel/gprbuild-aux/PLIST:1.3 pkgsrc/devel/gprbuild-aux/PLIST:1.4
--- pkgsrc/devel/gprbuild-aux/PLIST:1.3 Wed Apr 30 16:28:09 2014
+++ pkgsrc/devel/gprbuild-aux/PLIST     Fri Nov 25 20:36:49 2016
@@ -1,130 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2014/04/30 16:28:09 marino Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/11/25 20:36:49 marino Exp $
 bin/gprbuild
 bin/gprclean
 bin/gprconfig
 bin/gprinstall
-bin/gprslave
+bin/gprls
+bin/gprname
 libexec/gprbuild/gprbind
 libexec/gprbuild/gprlib
-share/doc/gprbuild/html/gnat_style.css
-share/doc/gprbuild/html/gprbuild.css
-share/doc/gprbuild/html/gprbuild_ug.html
-share/doc/gprbuild/html/gps_index.xml
-share/doc/gprbuild/html/important.png
-share/doc/gprbuild/html/note.png
-share/doc/gprbuild/html/tip.png
-share/doc/gprbuild/info/gprbuild_ug.info
-share/doc/gprbuild/pdf/gprbuild_ug.pdf
-share/doc/gprbuild/txt/gprbuild_ug.txt
-share/examples/gprbuild/Makefile
-share/examples/gprbuild/ada_cpp/Makefile
-share/examples/gprbuild/ada_cpp/animals.gpr
-share/examples/gprbuild/ada_cpp/except.gpr
-share/examples/gprbuild/ada_cpp/src1/ada_main.adb
-share/examples/gprbuild/ada_cpp/src1/call_cpp.adb
-share/examples/gprbuild/ada_cpp/src1/call_cpp.ads
-share/examples/gprbuild/ada_cpp/src1/cpp_main.cpp
-share/examples/gprbuild/ada_cpp/src1/cpp_routine.cpp
-share/examples/gprbuild/ada_cpp/src1/cpp_routine.h
-share/examples/gprbuild/ada_cpp/src2/animals.adb
-share/examples/gprbuild/ada_cpp/src2/animals.ads
-share/examples/gprbuild/ada_cpp/src2/animals.h
-share/examples/gprbuild/ada_cpp/src2/animals_c.cc
-share/examples/gprbuild/ada_cpp/src2/animals_interfaces.ads
-share/examples/gprbuild/ada_cpp/src2/main.adb
-share/examples/gprbuild/ada_f77/Makefile
-share/examples/gprbuild/ada_f77/ess.f
-share/examples/gprbuild/ada_f77/fm.gpr
-share/examples/gprbuild/ada_f77/ft.gpr
-share/examples/gprbuild/ada_f77/src/fm-interfac.adb
-share/examples/gprbuild/ada_f77/src/fm-interfac.ads
-share/examples/gprbuild/ada_f77/src/fm-locks.adb
-share/examples/gprbuild/ada_f77/src/fm-locks.ads
-share/examples/gprbuild/ada_f77/src/fm-protected_queue.adb
-share/examples/gprbuild/ada_f77/src/fm-protected_queue.ads
-share/examples/gprbuild/ada_f77/src/fm-system_dependant.adb
-share/examples/gprbuild/ada_f77/src/fm-system_dependant.ads
-share/examples/gprbuild/ada_f77/src/fm-tuple_manager.adb
-share/examples/gprbuild/ada_f77/src/fm-tuple_manager.ads
-share/examples/gprbuild/ada_f77/src/fm-types.ads
-share/examples/gprbuild/ada_f77/src/fm.adb
-share/examples/gprbuild/ada_f77/src/fm.ads
-share/examples/gprbuild/extended_projects/Makefile
-share/examples/gprbuild/extended_projects/new_ada_main.gpr
-share/examples/gprbuild/extended_projects/new_ada_src/ada_main.adb
-share/examples/gprbuild/extended_projects/new_common_subsystem.gpr
-share/examples/gprbuild/extended_projects/new_util_src/c_lib.ads
-share/examples/gprbuild/extended_projects/new_util_src/lib2.c
-share/examples/gprbuild/first_steps/Makefile
-share/examples/gprbuild/first_steps/ada_main.gpr
-share/examples/gprbuild/first_steps/ada_src/ada_main.adb
-share/examples/gprbuild/first_steps/c_main.gpr
-share/examples/gprbuild/first_steps/c_src/c_main.c
-share/examples/gprbuild/first_steps/util_src/ada_lib.adb
-share/examples/gprbuild/first_steps/util_src/ada_lib.ads
-share/examples/gprbuild/first_steps/util_src/c_lib.ads
-share/examples/gprbuild/first_steps/util_src/lib.c
-share/examples/gprbuild/first_steps/util_src/lib.h
-share/examples/gprbuild/libraries/Makefile
-share/examples/gprbuild/libraries/Makefile2
-share/examples/gprbuild/libraries/ada_main.adb
-share/examples/gprbuild/libraries/c_main.c
-share/examples/gprbuild/libraries/dynamic_lib.gpr
-share/examples/gprbuild/libraries/extern_lib.gpr
-share/examples/gprbuild/libraries/lib_src/ada_lib.adb
-share/examples/gprbuild/libraries/lib_src/ada_lib.ads
-share/examples/gprbuild/libraries/lib_src/c_lib.ads
-share/examples/gprbuild/libraries/lib_src/lib.c
-share/examples/gprbuild/libraries/lib_src/lib.h
-share/examples/gprbuild/libraries/main0.gpr
-share/examples/gprbuild/libraries/main1.gpr
-share/examples/gprbuild/libraries/main2.gpr
-share/examples/gprbuild/libraries/main3.gpr
-share/examples/gprbuild/libraries/main4.gpr
-share/examples/gprbuild/libraries/sa_lib.gpr
-share/examples/gprbuild/libraries/static_lib.gpr
-share/examples/gprbuild/matrix/Makefile
-share/examples/gprbuild/matrix/matrix.gpr
-share/examples/gprbuild/matrix/src/initmat.c
-share/examples/gprbuild/matrix/src/main.adb
-share/examples/gprbuild/matrix/src/multmat.f
-share/examples/gprbuild/namings/Makefile
-share/examples/gprbuild/namings/_print2.ada
-share/examples/gprbuild/namings/_print3.adb
-share/examples/gprbuild/namings/main.adb
-share/examples/gprbuild/namings/my_routine.c1
-share/examples/gprbuild/namings/my_routine2.c1
-share/examples/gprbuild/namings/namings.gpr
-share/examples/gprbuild/namings/src1/main.adb
-share/examples/gprbuild/namings/util-case1.ada
-share/examples/gprbuild/namings/util-case2.ada
-share/examples/gprbuild/namings/util.ads
-share/examples/gprbuild/ppc-elf/Makefile
-share/examples/gprbuild/ppc-elf/gdb.run
-share/examples/gprbuild/ppc-elf/hello.gpr
-share/examples/gprbuild/ppc-elf/srcs/c_io.c
-share/examples/gprbuild/ppc-elf/srcs/hello.adb
-share/examples/gprbuild/ppc-elf/srcs/ppc_start.s
-share/examples/gprbuild/ppc-elf/srcs/textio.adb
-share/examples/gprbuild/ppc-elf/srcs/textio.ads
-share/examples/gprbuild/scenarios/Makefile
-share/examples/gprbuild/scenarios/general_lib.gpr
-share/examples/gprbuild/scenarios/main.gpr
-share/examples/gprbuild/subsystems/Makefile
-share/examples/gprbuild/subsystems/ada_main.gpr
-share/examples/gprbuild/subsystems/ada_src/ada_main.adb
-share/examples/gprbuild/subsystems/attribute_sharing.gpr
-share/examples/gprbuild/subsystems/c_main.gpr
-share/examples/gprbuild/subsystems/c_src/c_main.c
-share/examples/gprbuild/subsystems/common_subsystem.gpr
-share/examples/gprbuild/subsystems/util_src/ada_lib.adb
-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/clean.xml
 share/gprconfig/compilers.xml
 share/gprconfig/cpp.xml
 share/gprconfig/cross.xml

Index: pkgsrc/devel/gprbuild-aux/distinfo
diff -u pkgsrc/devel/gprbuild-aux/distinfo:1.5 pkgsrc/devel/gprbuild-aux/distinfo:1.6
--- pkgsrc/devel/gprbuild-aux/distinfo:1.5      Tue Nov  3 03:27:30 2015
+++ pkgsrc/devel/gprbuild-aux/distinfo  Fri Nov 25 20:36:49 2016
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:30 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/11/25 20:36:49 marino Exp $
 
-SHA1 (gprbuild-gpl-2013-src.tgz) = 71c6278fd19f80ba4574de2696bfb3cbb9be4b70
-RMD160 (gprbuild-gpl-2013-src.tgz) = 8a7b78a84e1d52afc4009dad64ea89e773f1f585
-SHA512 (gprbuild-gpl-2013-src.tgz) = 5b84621770855bdc145eb100c3f61e1aeda6b05edc7c208b11377532619da9c7f9d920db03414aec02cf0e53317c132da99a018015af71434f14e426cf9f4664
-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
+SHA1 (gprbuild-376670f.tar.gz) = debb30f560d3f4ffe80edd47ee06aaab179a259c
+RMD160 (gprbuild-376670f.tar.gz) = 6b38f67ed96bc5d79cb072594e92530be7cb3136
+SHA512 (gprbuild-376670f.tar.gz) = d949ac450800fef4cf48038d613775d9210bc29baf01d03c276a59fce22add56b8e3b3ee0cd9b6353998fd2dc94e835ccf4df77c8559b27cac38cb28d56f4090
+Size (gprbuild-376670f.tar.gz) = 958175 bytes
+SHA1 (patch-share_gprconfig_compilers.xml) = 6046a2930995367448682e97ac06d603d3c9277e
+SHA1 (patch-share_gprconfig_gnat.xml) = e76972e517eeae6a968be5750775a95d9448e870
+SHA1 (patch-share_gprconfig_linker.xml) = f23657bd4f52e9089b59457aa850ded017290ad4
+SHA1 (patch-share_gprconfig_targetset.xml) = 0d760784701f6c0716663cf4fc8acfdce615af76
+SHA1 (patch-src_gprlib.adb) = 663d28aab30ff5d6cd923818952a840025ec57ca

Index: pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml
diff -u pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml:1.2 pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml:1.3
--- pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml:1.2   Wed Apr 30 16:28:09 2014
+++ pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_compilers.xml       Fri Nov 25 20:36:49 2016
@@ -1,10 +1,10 @@
-$NetBSD: patch-share_gprconfig_compilers.xml,v 1.2 2014/04/30 16:28:09 marino Exp $
+$NetBSD: patch-share_gprconfig_compilers.xml,v 1.3 2016/11/25 20:36:49 marino Exp $
 
 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.orig 2015-04-28 15:02:41 UTC
 +++ share/gprconfig/compilers.xml
-@@ -456,16 +456,15 @@
+@@ -693,17 +693,15 @@
      </version>
      <languages>Ada</languages>
      <variable name="gcc_version">
@@ -16,8 +16,9 @@ Tailor standard gprbuild to recognize gc
 -       <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
 -       <directory group="default" contents="^rts-">\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path</directory>
 -       <directory group="2" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory>
+-       <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
 +       <directory group="default">\.\./lib/gcc/$TARGET/$gcc_version/adalib</directory>
-+       <directory group="0">@AUXPREFIX@/lib/gcc/$TARGET/$gcc_version/adalib</directory>
++       <directory group="0">/usr/local/gcc5-aux/lib/gcc/$TARGET/$gcc_version/adalib</directory>
      </runtimes>
      <target>
 -      <external>${PREFIX}gcc -dumpmachine</external>
Index: pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml
diff -u pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml:1.2 pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml:1.3
--- pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml:1.2        Wed Apr 30 16:28:09 2014
+++ pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_gnat.xml    Fri Nov 25 20:36:49 2016
@@ -1,15 +1,15 @@
-$NetBSD: patch-share_gprconfig_gnat.xml,v 1.2 2014/04/30 16:28:09 marino Exp $
+$NetBSD: patch-share_gprconfig_gnat.xml,v 1.3 2016/11/25 20:36:49 marino Exp $
 
 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.orig      2014-10-13 22:03:37 UTC
 +++ share/gprconfig/gnat.xml
 @@ -63,7 +63,7 @@
     </config>
    </configuration>
  
 -  <!-- GNAT -->
-+  <!-- GNAT (tailored to lang/gcc-aux) -->
++  <!-- GNAT (tailored to lang/gcc5-aux) -->
    <configuration>
     &filter_gnat;
     <config>
Index: pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml
diff -u pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml:1.2 pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml:1.3
--- pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml:1.2      Wed Apr 30 16:28:09 2014
+++ pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_linker.xml  Fri Nov 25 20:36:49 2016
@@ -1,10 +1,10 @@
-$NetBSD: patch-share_gprconfig_linker.xml,v 1.2 2014/04/30 16:28:09 marino Exp $
+$NetBSD: patch-share_gprconfig_linker.xml,v 1.3 2016/11/25 20:36:49 marino Exp $
 
 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.orig    2015-04-28 14:21:56 UTC
 +++ share/gprconfig/linker.xml
-@@ -519,11 +519,14 @@
+@@ -687,11 +687,14 @@
      </config>
    </configuration>
  
@@ -20,7 +20,7 @@ Tailor standard gprbuild to recognize gc
         <target name="^.*irix.*$" />
      </targets>
      <config>
-@@ -557,10 +560,13 @@
+@@ -763,10 +766,13 @@
      </config>
    </configuration>
  
@@ -35,27 +35,20 @@ Tailor standard gprbuild to recognize gc
      </targets>
      <config>
     for Run_Path_Option  use ("-Wl,-rpath,");
-@@ -888,6 +894,9 @@
+@@ -1308,6 +1314,12 @@
         <target name="^.*mingw.*$" />
         <target name="^.*linux.*$" />
         <target name="^.*freebsd.*$" />
 +       <target name="^.*dragonfly.*$" />
 +       <target name="^.*openbsd.*$" />
 +       <target name="^.*netbsd.*$" />
-      </targets>
-     <compilers negate="true">
-        <compiler language="C++" />
-@@ -929,6 +938,9 @@
-        <target name="^.*mingw.*$" />
-        <target name="^.*linux.*$" />
-        <target name="^.*freebsd.*$" />
 +       <target name="^.*dragonfly.*$" />
 +       <target name="^.*openbsd.*$" />
 +       <target name="^.*netbsd.*$" />
       </targets>
      <compilers negate="true">
         <compiler language="C++" />
-@@ -970,6 +982,9 @@
+@@ -1392,6 +1404,9 @@
         <target name="^.*mingw.*$" />
         <target name="^.*linux.*$" />
         <target name="^.*freebsd.*$" />
Index: pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml
diff -u pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml:1.2 pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml:1.3
--- pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml:1.2   Wed Apr 30 16:28:09 2014
+++ pkgsrc/devel/gprbuild-aux/patches/patch-share_gprconfig_targetset.xml       Fri Nov 25 20:36:49 2016
@@ -1,10 +1,10 @@
-$NetBSD: patch-share_gprconfig_targetset.xml,v 1.2 2014/04/30 16:28:09 marino Exp $
+$NetBSD: patch-share_gprconfig_targetset.xml,v 1.3 2016/11/25 20:36:49 marino Exp $
 
 Add / correct BSD targets
 
---- share/gprconfig/targetset.xml.orig 2012-12-19 17:55:05.000000000 +0000
+--- share/gprconfig/targetset.xml.orig 2014-09-11 13:36:47 UTC
 +++ share/gprconfig/targetset.xml
-@@ -52,8 +52,8 @@
+@@ -66,8 +66,8 @@
  
    <!-- x86-solaris -->
    <targetset>
@@ -15,9 +15,12 @@ Add / correct BSD targets
    </targetset>
  
    <!-- x86-windows (mingw) -->
-@@ -144,10 +144,32 @@
+@@ -162,19 +162,34 @@
+     <target>pent.*-cygwin.*</target>
+   </targetset>
  
-   <!-- Freebsd -->
+-  <!-- x86 Freebsd -->
++  <!-- Freebsd -->
    <targetset>
 -    <target>x86-freebsd</target>
      <target>i.86-.*freebsd.*</target>
@@ -25,12 +28,16 @@ Add / correct BSD targets
 +    <target>x86_64-.*-freebsd.*</target>
    </targetset>
  
+-  <!-- x86_64 Freebsd -->
 +  <!-- DragonFlyBSD -->
-+  <targetset>
+   <targetset>
+-    <target>x86_64-freebsd</target>
+-    <target>x86_64-.*freebsd.*</target>
+-    <target>amd64-.*freebsd.*</target>
 +    <target>i.86-.*-dragonfly.*</target>
 +    <target>x86_64-.*-dragonfly.*</target>
-+  </targetset>
-+
+   </targetset>
+ 
 +  <!-- NetBSD -->
 +  <targetset>
 +    <target>i.86-.*-netbsd.*</target>
Index: pkgsrc/devel/gprbuild-aux/patches/patch-src_gprlib.adb
diff -u pkgsrc/devel/gprbuild-aux/patches/patch-src_gprlib.adb:1.2 pkgsrc/devel/gprbuild-aux/patches/patch-src_gprlib.adb:1.3
--- pkgsrc/devel/gprbuild-aux/patches/patch-src_gprlib.adb:1.2  Wed Apr 30 16:28:09 2014
+++ pkgsrc/devel/gprbuild-aux/patches/patch-src_gprlib.adb      Fri Nov 25 20:36:49 2016
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_gprlib.adb,v 1.2 2014/04/30 16:28:09 marino Exp $
+$NetBSD: patch-src_gprlib.adb,v 1.3 2016/11/25 20:36:49 marino Exp $
 
 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.orig        2015-05-06 11:08:38 UTC
 +++ src/gprlib.adb
-@@ -390,6 +390,11 @@ procedure Gprlib is
+@@ -393,6 +393,11 @@ procedure Gprlib is
  
     Separate_Run_Path_Options : Boolean := False;
  
@@ -17,7 +17,7 @@ Marino's modification to give Ada progra
     Rpath : String_List_Access := null;
     --  Allocated only if Path Option is supported
  
-@@ -1009,7 +1014,12 @@ begin
+@@ -1011,7 +1016,12 @@ begin
                    Use_GNAT_Lib := False;
                 end if;
  
@@ -29,9 +29,22 @@ Marino's modification to give Ada progra
 +                    (new String'(Line (1 .. Last)));
 +               end if;
  
-             when Library_Path =>
-                Osint.Fail ("library path should not be specified");
-@@ -2127,7 +2137,7 @@ begin
+             when Gprexch.Library_Rpath_Options =>
+                Library_Rpath_Options_Table.Append
+@@ -1143,10 +1153,10 @@ begin
+ 
+                      Libgnat :=
+                        new String'
+-                         ("-lgnat-" & Line (6 .. Last));
++                         ("-lgnat-" & Line (6));
+                      Libgnarl :=
+                        new String'
+-                         ("-lgnarl-" & Line (6 .. Last));
++                         ("-lgnarl-" & Line (6));
+                   end if;
+ 
+                else
+@@ -2113,7 +2123,7 @@ begin
           Library_Switches_Table.Append
             (new String'("-L" & Imported_Library_Directories.Table (J).all));
  

Index: pkgsrc/devel/gps/Makefile
diff -u pkgsrc/devel/gps/Makefile:1.45 pkgsrc/devel/gps/Makefile:1.46
--- pkgsrc/devel/gps/Makefile:1.45      Sun Oct  9 21:41:58 2016
+++ pkgsrc/devel/gps/Makefile   Fri Nov 25 20:36:49 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2016/10/09 21:41:58 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2016/11/25 20:36:49 marino Exp $
 #
 
 DISTNAME=      gps-${GPS_VERSION}
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    devel
 MASTER_SITES=  http://downloads.dragonlace.net/src/
 DISTFILES=     gps-5.2.1-1-src.tgz
@@ -12,6 +12,17 @@ HOMEPAGE=    http://www.adacore.com/home/pr
 COMMENT=       GNAT Programming Studio - IDE for Ada and many other languages
 LICENSE=       gnu-gpl-v2
 
+# GPS is several years behind and normally tied to the latest Ada compiler.
+# To update it would require several new and complicated dependencies.
+# The maintainer has no interest in doing this work.  Somebody else is free
+# to take over and use the FreeBSD Ports Collection as a reference point.
+#
+# The internal project support (GPR files) are illegally configured for
+# today's standards and gprbuild won't let the build progress far.
+# The only practical way forward to update to version 6.0.1 (which is at
+# least one year behind the current version of GPS)
+PKG_FAIL_REASON=       Unbuildable with gcc5-aux.  Scheduled for removal Jan 2017
+
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake sed perl awk pkg-config
 
@@ -20,7 +31,7 @@ USE_LANGUAGES=                c ada c++
 MY_CONFIGURE_ENV+=     ADA_PROJECT_PATH=${APP}
 MY_MAKE_ENV+=          PROCESSORS=${MAKE_JOBS:U1:Q} \
                        ADA_PROJECT_PATH=${APP} \
-                       PATH=${PREFIX}/gcc-aux/bin:${PATH}
+                       PATH=${PREFIX}/gcc5-aux/bin:${PATH}
 MAKE_ARGS=             Build=Production
 APP=                   ${PREFIX}/lib/gnat
 WRKSRC=                        ${WRKDIR}/gps-release-ide-${GPS_VERSION}-src

Index: pkgsrc/lang/gnat_util/Makefile
diff -u pkgsrc/lang/gnat_util/Makefile:1.2 pkgsrc/lang/gnat_util/Makefile:1.3
--- pkgsrc/lang/gnat_util/Makefile:1.2  Sun Dec 21 02:39:24 2014
+++ pkgsrc/lang/gnat_util/Makefile      Fri Nov 25 20:36:49 2016
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/12/21 02:39:24 obache Exp $
+# $NetBSD: Makefile,v 1.3 2016/11/25 20:36:49 marino Exp $
 
 PKGNAME=       gnat_util-${SNAPSHOT}
-PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 DISTFILES=     gcc-${GCC_VERSION}.tar.bz2
@@ -11,8 +10,12 @@ HOMEPAGE=    http://www.dragonlace.net/
 COMMENT=       Library used to build GNAT source-based tools
 LICENSE=       gnu-gpl-v3 AND gnu-lgpl-v3
 
+# gnat_util existed to construct gprbuild-aux which no longer requires it.
+# The package is still buildable, but its not practically useful.
+PKG_SKIP_REASON=       Deprecated (no longer useful), scheduled for removal Jan 2017
+
 .include "../../mk/bsd.prefs.mk"
-.include "../../lang/gcc-aux/Makefile.version"
+.include "../../lang/gcc5-aux/Makefile.version"
 .include "Makefile.sources"
 
 MAKE_ENV=      MAKEOBJDIR=${WRKSRC}/obj

Index: pkgsrc/lang/gnat_util/Makefile.sources
diff -u pkgsrc/lang/gnat_util/Makefile.sources:1.1 pkgsrc/lang/gnat_util/Makefile.sources:1.2
--- pkgsrc/lang/gnat_util/Makefile.sources:1.1  Wed Apr 30 16:25:20 2014
+++ pkgsrc/lang/gnat_util/Makefile.sources      Fri Nov 25 20:36:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sources,v 1.1 2014/04/30 16:25:20 marino Exp $
+# $NetBSD: Makefile.sources,v 1.2 2016/11/25 20:36:49 marino Exp $
 
 GNAT_SRCS= \
        ali-util.adb \
@@ -53,8 +53,6 @@ GNAT_SRCS= \
        mlib-fil.ads \
        mlib-tgt-specific.adb \
        mlib-tgt-specific.ads \
-       mlib-tgt-vms_common.adb \
-       mlib-tgt-vms_common.ads \
        mlib-tgt.adb \
        mlib-tgt.ads \
        mlib-utl.adb \

Index: pkgsrc/lang/gnat_util/distinfo
diff -u pkgsrc/lang/gnat_util/distinfo:1.3 pkgsrc/lang/gnat_util/distinfo:1.4
--- pkgsrc/lang/gnat_util/distinfo:1.3  Tue Nov  3 22:50:36 2015
+++ pkgsrc/lang/gnat_util/distinfo      Fri Nov 25 20:36:49 2016
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 22:50:36 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/11/25 20:36:49 marino Exp $
 
-SHA1 (gcc-4.9.2.tar.bz2) = 79dbcb09f44232822460d80b033c962c0237c6d8
-RMD160 (gcc-4.9.2.tar.bz2) = bc6454e7c67c6f5fd2c98cdd1364ebb1739e1347
-SHA512 (gcc-4.9.2.tar.bz2) = e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c
-Size (gcc-4.9.2.tar.bz2) = 89939747 bytes
+SHA1 (gcc-5.4.0.tar.bz2) = 07524df2b4ab9070bad9c49ab668da72237b8115
+RMD160 (gcc-5.4.0.tar.bz2) = 7ae3413ca7e90bb21e65e637c02ddf2b675b45f4
+SHA512 (gcc-5.4.0.tar.bz2) = 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
+Size (gcc-5.4.0.tar.bz2) = 95661481 bytes
 SHA1 (patch-gnatvsn.adb) = 1e16dba2500abf090b05484567cc0f1a2327c350

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.170 pkgsrc/mk/compiler/gcc.mk:1.171
--- pkgsrc/mk/compiler/gcc.mk:1.170     Mon Oct 10 08:26:08 2016
+++ pkgsrc/mk/compiler/gcc.mk   Fri Nov 25 20:36:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.170 2016/10/10 08:26:08 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.171 2016/11/25 20:36:49 marino Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -97,8 +97,8 @@ GCC_REQD+=    2.8.0
 GCC_REQD+=     3.0
 .endif
 
-# Only one compiler defined here supports Ada: lang/gcc-aux
-# If the Ada language is requested, force lang/gcc-aux to be selected
+# Only one compiler defined here supports Ada: lang/gcc5-aux
+# If the Ada language is requested, force lang/gcc5-aux to be selected
 .if !empty(USE_LANGUAGES:Mada)
 GCC_REQD+=     20120614
 .endif
@@ -623,16 +623,16 @@ _USE_GCC_SHLIB?=  yes
 .  endif
 .elif !empty(_NEED_GCC_AUX:M[yY][eE][sS])
 #
-# We require Ada-capable compiler in the lang/gcc-aux directory.
+# We require Ada-capable compiler in the lang/gcc5-aux directory.
 #
-_GCC_PKGBASE=          gcc-aux
-.  if !empty(PKGPATH:Mlang/gcc-aux)
+_GCC_PKGBASE=          gcc5-aux
+.  if !empty(PKGPATH:Mlang/gcc5-aux)
 _IGNORE_GCC=           yes
 MAKEFLAGS+=            _IGNORE_GCC=yes
 .  endif
 .  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
-_GCC_PKGSRCDIR=                ../../lang/gcc-aux
-_GCC_DEPENDENCY=       gcc-aux>=${_GCC_REQD}:../../lang/gcc-aux
+_GCC_PKGSRCDIR=                ../../lang/gcc5-aux
+_GCC_DEPENDENCY=       gcc5-aux>=${_GCC_REQD}:../../lang/gcc5-aux
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
         !empty(_LANGUAGES.gcc:Mfortran) || \
         !empty(_LANGUAGES.gcc:Mfortran77) || \

Index: pkgsrc/textproc/xmlada/Makefile
diff -u pkgsrc/textproc/xmlada/Makefile:1.13 pkgsrc/textproc/xmlada/Makefile:1.14
--- pkgsrc/textproc/xmlada/Makefile:1.13        Sat Jul  9 13:04:11 2016
+++ pkgsrc/textproc/xmlada/Makefile     Fri Nov 25 20:36:49 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2016/07/09 13:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/11/25 20:36:49 marino Exp $
 
 DISTNAME=      xmlada-${XMLADA_VERS}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc
 MASTER_SITES=  http://downloads.dragonlace.net/src/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/www/aws/Makefile
diff -u pkgsrc/www/aws/Makefile:1.22 pkgsrc/www/aws/Makefile:1.23
--- pkgsrc/www/aws/Makefile:1.22        Mon Sep 19 13:04:28 2016
+++ pkgsrc/www/aws/Makefile     Fri Nov 25 20:36:50 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2016/09/19 13:04:28 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2016/11/25 20:36:50 marino Exp $
 #
 
 DISTNAME=      aws-${AWS_VERSION}
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    www
 MASTER_SITES=  http://downloads.dragonlace.net/src/
 EXTRACT_SUFX=  .tar.bz2
@@ -25,8 +25,8 @@ USE_LANGUAGES=        c ada c++ fortran
 
 MY_MAKE_ENV+=          ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 MY_MAKE_ENV+=          AWK=awk
-MY_MAKE_ENV+=          PATH=${PREFIX}/gcc-aux/bin:${PATH}
-MY_CONF_ENV+=          PATH=${PREFIX}/gcc-aux/bin:${PATH}
+MY_MAKE_ENV+=          PATH=${PREFIX}/gcc5-aux/bin:${PATH}
+MY_CONF_ENV+=          PATH=${PREFIX}/gcc5-aux/bin:${PATH}
 CONFIGURE_ARGS+=       LPATH=${BUILDLINK_PREFIX.openssl}/lib
 CONFIGURE_ARGS+=       ZPATH=${BUILDLINK_PREFIX.zlib}/lib
 

Index: pkgsrc/www/aws-demos/Makefile
diff -u pkgsrc/www/aws-demos/Makefile:1.17 pkgsrc/www/aws-demos/Makefile:1.18
--- pkgsrc/www/aws-demos/Makefile:1.17  Mon Sep 19 13:04:28 2016
+++ pkgsrc/www/aws-demos/Makefile       Fri Nov 25 20:36:50 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2016/09/19 13:04:28 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2016/11/25 20:36:50 marino Exp $
 #
 
 DISTNAME=      aws-${AWS_VERSION}
 PKGNAME=       aws-demos-${AWS_VERSION}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    www
 MASTER_SITES=  http://downloads.dragonlace.net/src/
 EXTRACT_SUFX=  .tar.bz2
@@ -27,8 +27,8 @@ CONFIGURE_ARGS+=      DEBUG=true
 
 MY_MAKE_ENV+=          ADA_PROJECT_PATH=${PREFIX}/lib/gnat
 MY_MAKE_ENV+=          AWK=awk
-MY_MAKE_ENV+=          PATH=${PREFIX}/gcc-aux/bin:${PATH}
-MY_CONF_ENV+=          PATH=${PREFIX}/gcc-aux/bin:${PATH}
+MY_MAKE_ENV+=          PATH=${PREFIX}/gcc5-aux/bin:${PATH}
+MY_CONF_ENV+=          PATH=${PREFIX}/gcc5-aux/bin:${PATH}
 CONFIGURE_ARGS+=       LPATH=${BUILDLINK_PREFIX.openssl}/lib
 CONFIGURE_ARGS+=       ZPATH=${BUILDLINK_PREFIX.zlib}/lib
 

Index: pkgsrc/x11/gtkada/Makefile
diff -u pkgsrc/x11/gtkada/Makefile:1.35 pkgsrc/x11/gtkada/Makefile:1.36
--- pkgsrc/x11/gtkada/Makefile:1.35     Wed Aug  3 10:22:22 2016
+++ pkgsrc/x11/gtkada/Makefile  Fri Nov 25 20:36:50 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2016/08/03 10:22:22 adam Exp $
+# $NetBSD: Makefile,v 1.36 2016/11/25 20:36:50 marino Exp $
 #
 
 DISTNAME=      gtkada-${GTKADA_VERSION}
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    x11
 MASTER_SITES=  http://downloads.dragonlace.net/src/
 EXTRACT_SUFX=  .tar.bz2



Home | Main Index | Thread Index | Old Index