[pkgsrc/trunk]: pkgsrc/devel/gputils update gputils to 1.5.0. Changes since 1...

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83524c66b7fe
branches:  trunk
changeset: 309885:83524c66b7fe
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Mon Jun 25 14:01:45 2018 +0000

description:
update gputils to 1.5.0. Changes since 1.4.2:

    Several pre-defined constant and variable in the gpasm.
    Extension of error and messg directives: These directives - inside of the parameter string - recognize and execute the #v() macro.
    New directives: __badrom, assume, elif, elifdef, elifndef
    New gplink feature: Remove the unnecessary banksel and pagesel directives.
    The errorlevel directive accept number ranges. E.g. +303-310 or -303-310
    The gpvo utility use the disassembler to decode the program memory sections.
    The gplink save the local RAM symbols to COD file.
    The ".direct" directive - inside of the parameter string - recognize and execute the #v() macro.
    The length of source file names in COD file, now 256 bytes long instead of 64 bytes. The gpvc utility thereafter also able to correctly detect the shorter names.
    The inc and lkr files are synced with MPLABX 3.35

diffstat:

 devel/gputils/Makefile                             |   9 ++---
 devel/gputils/PLIST                                |  32 +++++++++++++++++++++-
 devel/gputils/distinfo                             |  16 +++++-----
 devel/gputils/patches/patch-libgputils_gparchive.c |  20 ++++++------
 devel/gputils/patches/patch-libgputils_gpreadobj.c |  21 ++++++-------
 devel/gputils/patches/patch-libgputils_gpsystem.c  |  12 ++++----
 6 files changed, 69 insertions(+), 41 deletions(-)

diffs (truncated from 357 to 300 lines):

diff -r 642960cb1c71 -r 83524c66b7fe devel/gputils/Makefile
--- a/devel/gputils/Makefile    Mon Jun 25 13:39:43 2018 +0000
+++ b/devel/gputils/Makefile    Mon Jun 25 14:01:45 2018 +0000
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.23 2016/09/18 05:28:02 dholland Exp $
+# $NetBSD: Makefile,v 1.24 2018/06/25 14:01:45 bouyer Exp $
 
-DISTNAME=      gputils-1.4.2-1
-PKGNAME=       gputils-1.4.2.1
-PKGREVISION=   1
+DISTNAME=      gputils-1.5.0
+#PKGREVISION=  2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gputils/}
 
 MAINTAINER=    dogcow%NetBSD.org@localhost
 HOMEPAGE=      http://gputils.sourceforge.net/
 COMMENT=       Collection of tools for Microchip's PIC micro-processors
+LICENSE=       gnu-gpl-v2
 
 CONFLICTS=     gpasm-[0-9]*
-WRKSRC=                ${WRKDIR}/gputils-1.4.2
 
 GNU_CONFIGURE= yes
 USE_TOOLS+=    bison flex gmake
diff -r 642960cb1c71 -r 83524c66b7fe devel/gputils/PLIST
--- a/devel/gputils/PLIST       Mon Jun 25 13:39:43 2018 +0000
+++ b/devel/gputils/PLIST       Mon Jun 25 14:01:45 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/03/15 20:39:52 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/06/25 14:01:45 bouyer Exp $
 bin/gpasm
 bin/gpdasm
 bin/gplib
@@ -189,6 +189,8 @@
 share/gputils/header/p16f1519.inc
 share/gputils/header/p16f1526.inc
 share/gputils/header/p16f1527.inc
+share/gputils/header/p16f15354.inc
+share/gputils/header/p16f15355.inc
 share/gputils/header/p16f1574.inc
 share/gputils/header/p16f1575.inc
 share/gputils/header/p16f1578.inc
@@ -249,6 +251,7 @@
 share/gputils/header/p16f18875.inc
 share/gputils/header/p16f18876.inc
 share/gputils/header/p16f18877.inc
+share/gputils/header/p16f19197.inc
 share/gputils/header/p16f1933.inc
 share/gputils/header/p16f1934.inc
 share/gputils/header/p16f1936.inc
@@ -357,6 +360,8 @@
 share/gputils/header/p16lf1519.inc
 share/gputils/header/p16lf1526.inc
 share/gputils/header/p16lf1527.inc
+share/gputils/header/p16lf15354.inc
+share/gputils/header/p16lf15355.inc
 share/gputils/header/p16lf1554.inc
 share/gputils/header/p16lf1559.inc
 share/gputils/header/p16lf1566.inc
@@ -409,8 +414,10 @@
 share/gputils/header/p16lf18323.inc
 share/gputils/header/p16lf18324.inc
 share/gputils/header/p16lf18325.inc
+share/gputils/header/p16lf18326.inc
 share/gputils/header/p16lf18344.inc
 share/gputils/header/p16lf18345.inc
+share/gputils/header/p16lf18346.inc
 share/gputils/header/p16lf1847.inc
 share/gputils/header/p16lf18854.inc
 share/gputils/header/p16lf18855.inc
@@ -560,6 +567,7 @@
 share/gputils/header/p18f26k80.inc
 share/gputils/header/p18f27j13.inc
 share/gputils/header/p18f27j53.inc
+share/gputils/header/p18f27k40.inc
 share/gputils/header/p18f4220.inc
 share/gputils/header/p18f4221.inc
 share/gputils/header/p18f4320.inc
@@ -640,6 +648,7 @@
 share/gputils/header/p18f65j90.inc
 share/gputils/header/p18f65j94.inc
 share/gputils/header/p18f65k22.inc
+share/gputils/header/p18f65k40.inc
 share/gputils/header/p18f65k80.inc
 share/gputils/header/p18f65k90.inc
 share/gputils/header/p18f6620.inc
@@ -661,6 +670,7 @@
 share/gputils/header/p18f66j94.inc
 share/gputils/header/p18f66j99.inc
 share/gputils/header/p18f66k22.inc
+share/gputils/header/p18f66k40.inc
 share/gputils/header/p18f66k80.inc
 share/gputils/header/p18f66k90.inc
 share/gputils/header/p18f6720.inc
@@ -674,6 +684,7 @@
 share/gputils/header/p18f67j93.inc
 share/gputils/header/p18f67j94.inc
 share/gputils/header/p18f67k22.inc
+share/gputils/header/p18f67k40.inc
 share/gputils/header/p18f67k90.inc
 share/gputils/header/p18f8310.inc
 share/gputils/header/p18f8390.inc
@@ -802,6 +813,7 @@
 share/gputils/header/p18lf26k80.inc
 share/gputils/header/p18lf27j13.inc
 share/gputils/header/p18lf27j53.inc
+share/gputils/header/p18lf27k40.inc
 share/gputils/header/p18lf4220.inc
 share/gputils/header/p18lf4221.inc
 share/gputils/header/p18lf4320.inc
@@ -867,6 +879,7 @@
 share/gputils/header/p18lf6525.inc
 share/gputils/header/p18lf6527.inc
 share/gputils/header/p18lf6585.inc
+share/gputils/header/p18lf65k40.inc
 share/gputils/header/p18lf65k80.inc
 share/gputils/header/p18lf6620.inc
 share/gputils/header/p18lf6621.inc
@@ -874,10 +887,12 @@
 share/gputils/header/p18lf6627.inc
 share/gputils/header/p18lf6628.inc
 share/gputils/header/p18lf6680.inc
+share/gputils/header/p18lf66k40.inc
 share/gputils/header/p18lf66k80.inc
 share/gputils/header/p18lf6720.inc
 share/gputils/header/p18lf6722.inc
 share/gputils/header/p18lf6723.inc
+share/gputils/header/p18lf67k40.inc
 share/gputils/header/p18lf8310.inc
 share/gputils/header/p18lf8390.inc
 share/gputils/header/p18lf8393.inc
@@ -1071,6 +1086,8 @@
 share/gputils/lkr/16f1519_g.lkr
 share/gputils/lkr/16f1526_g.lkr
 share/gputils/lkr/16f1527_g.lkr
+share/gputils/lkr/16f15354_g.lkr
+share/gputils/lkr/16f15355_g.lkr
 share/gputils/lkr/16f1574_g.lkr
 share/gputils/lkr/16f1575_g.lkr
 share/gputils/lkr/16f1578_g.lkr
@@ -1131,6 +1148,7 @@
 share/gputils/lkr/16f18875_g.lkr
 share/gputils/lkr/16f18876_g.lkr
 share/gputils/lkr/16f18877_g.lkr
+share/gputils/lkr/16f19197_g.lkr
 share/gputils/lkr/16f1933_g.lkr
 share/gputils/lkr/16f1934_g.lkr
 share/gputils/lkr/16f1936_g.lkr
@@ -1237,6 +1255,8 @@
 share/gputils/lkr/16lf1519_g.lkr
 share/gputils/lkr/16lf1526_g.lkr
 share/gputils/lkr/16lf1527_g.lkr
+share/gputils/lkr/16lf15354_g.lkr
+share/gputils/lkr/16lf15355_g.lkr
 share/gputils/lkr/16lf1554_g.lkr
 share/gputils/lkr/16lf1559_g.lkr
 share/gputils/lkr/16lf1566_g.lkr
@@ -1289,8 +1309,10 @@
 share/gputils/lkr/16lf18323_g.lkr
 share/gputils/lkr/16lf18324_g.lkr
 share/gputils/lkr/16lf18325_g.lkr
+share/gputils/lkr/16lf18326_g.lkr
 share/gputils/lkr/16lf18344_g.lkr
 share/gputils/lkr/16lf18345_g.lkr
+share/gputils/lkr/16lf18346_g.lkr
 share/gputils/lkr/16lf1847_g.lkr
 share/gputils/lkr/16lf18854_g.lkr
 share/gputils/lkr/16lf18855_g.lkr
@@ -1439,6 +1461,7 @@
 share/gputils/lkr/18f26k80_g.lkr
 share/gputils/lkr/18f27j13_g.lkr
 share/gputils/lkr/18f27j53_g.lkr
+share/gputils/lkr/18f27k40_g.lkr
 share/gputils/lkr/18f4220_g.lkr
 share/gputils/lkr/18f4221_g.lkr
 share/gputils/lkr/18f4320_g.lkr
@@ -1519,6 +1542,7 @@
 share/gputils/lkr/18f65j90_g.lkr
 share/gputils/lkr/18f65j94_g.lkr
 share/gputils/lkr/18f65k22_g.lkr
+share/gputils/lkr/18f65k40_g.lkr
 share/gputils/lkr/18f65k80_g.lkr
 share/gputils/lkr/18f65k90_g.lkr
 share/gputils/lkr/18f6620_g.lkr
@@ -1540,6 +1564,7 @@
 share/gputils/lkr/18f66j94_g.lkr
 share/gputils/lkr/18f66j99_g.lkr
 share/gputils/lkr/18f66k22_g.lkr
+share/gputils/lkr/18f66k40_g.lkr
 share/gputils/lkr/18f66k80_g.lkr
 share/gputils/lkr/18f66k90_g.lkr
 share/gputils/lkr/18f6720_g.lkr
@@ -1553,6 +1578,7 @@
 share/gputils/lkr/18f67j93_g.lkr
 share/gputils/lkr/18f67j94_g.lkr
 share/gputils/lkr/18f67k22_g.lkr
+share/gputils/lkr/18f67k40_g.lkr
 share/gputils/lkr/18f67k90_g.lkr
 share/gputils/lkr/18f8310_g.lkr
 share/gputils/lkr/18f8390_g.lkr
@@ -1681,6 +1707,7 @@
 share/gputils/lkr/18lf26k80_g.lkr
 share/gputils/lkr/18lf27j13_g.lkr
 share/gputils/lkr/18lf27j53_g.lkr
+share/gputils/lkr/18lf27k40_g.lkr
 share/gputils/lkr/18lf4220_g.lkr
 share/gputils/lkr/18lf4221_g.lkr
 share/gputils/lkr/18lf4320_g.lkr
@@ -1746,6 +1773,7 @@
 share/gputils/lkr/18lf6525_g.lkr
 share/gputils/lkr/18lf6527_g.lkr
 share/gputils/lkr/18lf6585_g.lkr
+share/gputils/lkr/18lf65k40_g.lkr
 share/gputils/lkr/18lf65k80_g.lkr
 share/gputils/lkr/18lf6620_g.lkr
 share/gputils/lkr/18lf6621_g.lkr
@@ -1753,10 +1781,12 @@
 share/gputils/lkr/18lf6627_g.lkr
 share/gputils/lkr/18lf6628_g.lkr
 share/gputils/lkr/18lf6680_g.lkr
+share/gputils/lkr/18lf66k40_g.lkr
 share/gputils/lkr/18lf66k80_g.lkr
 share/gputils/lkr/18lf6720_g.lkr
 share/gputils/lkr/18lf6722_g.lkr
 share/gputils/lkr/18lf6723_g.lkr
+share/gputils/lkr/18lf67k40_g.lkr
 share/gputils/lkr/18lf8310_g.lkr
 share/gputils/lkr/18lf8390_g.lkr
 share/gputils/lkr/18lf8393_g.lkr
diff -r 642960cb1c71 -r 83524c66b7fe devel/gputils/distinfo
--- a/devel/gputils/distinfo    Mon Jun 25 13:39:43 2018 +0000
+++ b/devel/gputils/distinfo    Mon Jun 25 14:01:45 2018 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2016/09/14 14:10:50 dholland Exp $
+$NetBSD: distinfo,v 1.13 2018/06/25 14:01:45 bouyer Exp $
 
-SHA1 (gputils-1.4.2-1.tar.gz) = f71ce8419b497ff8fc72aa11344919095726f40e
-RMD160 (gputils-1.4.2-1.tar.gz) = 0084c8160f4c2c6fd75db7cbda37aba116e98220
-SHA512 (gputils-1.4.2-1.tar.gz) = dfa469157008b9cac486f353ac9089326d093d7daa7e4b909d018e703963ed09481e76a3afb275ed2d9ca0bf41c53de635bb55ff3dbe0509f48e801986982341
-Size (gputils-1.4.2-1.tar.gz) = 12505612 bytes
-SHA1 (patch-libgputils_gparchive.c) = cf6ddbc27ae797ef38ef075280fa004b06583d0b
-SHA1 (patch-libgputils_gpreadobj.c) = eb67daa2d27310ac842c0902df136d281b5d3a1b
-SHA1 (patch-libgputils_gpsystem.c) = 539dc4947a31ed634f320689d528dd1efa79da3a
+SHA1 (gputils-1.5.0.tar.gz) = c78f2835c7b9f7cd29e7f5d27607568c2021e81e
+RMD160 (gputils-1.5.0.tar.gz) = 0e7f0c3dc388cf7ee8a67dcd2e93a57b9a6e8e57
+SHA512 (gputils-1.5.0.tar.gz) = fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645
+Size (gputils-1.5.0.tar.gz) = 13155377 bytes
+SHA1 (patch-libgputils_gparchive.c) = 52a00eff09ead81926263e84163ab9abf89279d3
+SHA1 (patch-libgputils_gpreadobj.c) = 561d9c37bcd6ff4a2e3bfea5504817a057c5e38b
+SHA1 (patch-libgputils_gpsystem.c) = 42e406defa88de95ab9aafb5affb09a6cb8a01cf
diff -r 642960cb1c71 -r 83524c66b7fe devel/gputils/patches/patch-libgputils_gparchive.c
--- a/devel/gputils/patches/patch-libgputils_gparchive.c        Mon Jun 25 13:39:43 2018 +0000
+++ b/devel/gputils/patches/patch-libgputils_gparchive.c        Mon Jun 25 14:01:45 2018 +0000
@@ -1,27 +1,27 @@
-$NetBSD: patch-libgputils_gparchive.c,v 1.1 2016/09/14 14:10:50 dholland Exp $
+$NetBSD: patch-libgputils_gparchive.c,v 1.2 2018/06/25 14:01:45 bouyer Exp $
 
 Be more paranoid about input, pursuant to a build failure in sdcc3
 that seems to involve gplib trying to allocate gigs of memory.
 
---- libgputils/gparchive.c~    2015-12-12 14:47:51.000000000 +0000
-+++ libgputils/gparchive.c
-@@ -333,10 +333,18 @@ gp_archive_read(const char *filename)
+--- libgputils/gparchive.c.orig        2016-08-12 15:14:27.000000000 +0200
++++ libgputils/gparchive.c     2018-06-25 14:40:35.697419998 +0200
+@@ -378,10 +378,18 @@
  
      /* read the object file or symbol index into memory */
      sscanf(new->header.ar_size, "%il", &object_size);
 +    if (object_size < 0) {
-+      gp_error("bad archive \"%s\" (negative entry size)", filename);
++      gp_error("bad archive \"%s\" (negative entry size)", File_name);
 +    }
 +    /* sanity check */
 +    if (object_size > 100*1024*1024) {
-+      gp_error("bad archive \"%s\" (unreasonable entry size %d)", filename,
-+             object_size);
++      gp_error("bad archive \"%s\" (unreasonable entry size %d)", File_name,
++              object_size);
 +    }
      new->data.size = object_size;
-     new->data.file = (unsigned char *)GP_Malloc(object_size);
+     new->data.file = (uint8_t *)GP_Malloc(object_size);
      if (fread(new->data.file, sizeof(char), object_size, infile) != object_size) {
--      gp_error("bad archive \"%s\"", filename);
-+      gp_error("bad archive \"%s\" (read error)", filename);
+-      gp_error("bad archive \"%s\"", File_name);
++      gp_error("bad archive \"%s\" (read error)", File_name);
      }
  
      /* insert the new member in the archive list */
diff -r 642960cb1c71 -r 83524c66b7fe devel/gputils/patches/patch-libgputils_gpreadobj.c
--- a/devel/gputils/patches/patch-libgputils_gpreadobj.c        Mon Jun 25 13:39:43 2018 +0000
+++ b/devel/gputils/patches/patch-libgputils_gpreadobj.c        Mon Jun 25 14:01:45 2018 +0000
@@ -1,23 +1,22 @@
-$NetBSD: patch-libgputils_gpreadobj.c,v 1.1 2016/09/14 14:10:50 dholland Exp $
+$NetBSD: patch-libgputils_gpreadobj.c,v 1.2 2018/06/25 14:01:45 bouyer Exp $
 
 Be more paranoid about input, pursuant to a build failure in sdcc3