CVS commit: pkgsrc/sysutils/minipro

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Sun Apr 21 20:37:52 UTC 2024

Modified Files:
        pkgsrc/sysutils/minipro: Makefile distinfo
        pkgsrc/sysutils/minipro/patches: patch-Makefile patch-jedec.c
            patch-main.c

Log Message:
Update to minipro-0.7.  minipro now supports the Xgecu T48 programmer.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/minipro/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/minipro/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/minipro/patches/patch-Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/minipro/patches/patch-jedec.c \
    pkgsrc/sysutils/minipro/patches/patch-main.c

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

Modified files:

Index: pkgsrc/sysutils/minipro/Makefile
diff -u pkgsrc/sysutils/minipro/Makefile:1.4 pkgsrc/sysutils/minipro/Makefile:1.5
--- pkgsrc/sysutils/minipro/Makefile:1.4        Mon Feb 13 23:38:48 2023
+++ pkgsrc/sysutils/minipro/Makefile    Sun Apr 21 20:37:52 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2023/02/13 23:38:48 thorpej Exp $
+# $NetBSD: Makefile,v 1.5 2024/04/21 20:37:52 thorpej Exp $
 
-MINIPRO_VERS=  0.6
+MINIPRO_VERS=  0.7
 
 DISTNAME=      minipro-${MINIPRO_VERS}
 CATEGORIES=    sysutils
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.bz2
 
 MAINTAINER=    thorpej%NetBSD.org@localhost
 HOMEPAGE=      https://gitlab.com/DavidGriffith/minipro/
-COMMENT=       Control the MiniPRO TL866xx series of chip programmers
+COMMENT=       Control the MiniPRO TL866xx / Xgecu family of chip programmers
 LICENSE=       gnu-gpl-v3
 
 USE_TOOLS+=    gmake pkg-config

Index: pkgsrc/sysutils/minipro/distinfo
diff -u pkgsrc/sysutils/minipro/distinfo:1.2 pkgsrc/sysutils/minipro/distinfo:1.3
--- pkgsrc/sysutils/minipro/distinfo:1.2        Mon Feb 13 23:38:48 2023
+++ pkgsrc/sysutils/minipro/distinfo    Sun Apr 21 20:37:52 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2023/02/13 23:38:48 thorpej Exp $
+$NetBSD: distinfo,v 1.3 2024/04/21 20:37:52 thorpej Exp $
 
-BLAKE2s (minipro-0.6.tar.bz2) = a46777ec54ed7ecc25ad165b7ef6961409e94efed80ae15ccce38dbe98ba09ed
-SHA512 (minipro-0.6.tar.bz2) = d3a3aa139e4ce0aadfba405fd75a05250f1b5df85d9acd21020fca42b3aca867de39f9560429c82030bb6474bc4d8e89f56cf4f72a86dce60d2e5aa36cec7761
-Size (minipro-0.6.tar.bz2) = 260518 bytes
-SHA1 (patch-Makefile) = 0090dc700106c71bb0eb1dad1e91ee9b298fb0ba
-SHA1 (patch-jedec.c) = 6ea6a4bf9cccc442e86dc9a26fcdd210f9d471de
-SHA1 (patch-main.c) = ea464de8f0d69e65468ef878747ec76cd076ec06
+BLAKE2s (minipro-0.7.tar.bz2) = 9abb0013deca2ed11ffe04d267cc1509fcf311daec0dd51e3e35667ba15905f2
+SHA512 (minipro-0.7.tar.bz2) = bae4bbf004032f324e541b0bc821fd03e2a4d047612e79bb6fa1cdec2b6d724aa1edf2c88ddf2a424148d555500d86c5c5ad096f329dd02ad2cdb4d1af2ef23e
+Size (minipro-0.7.tar.bz2) = 286649 bytes
+SHA1 (patch-Makefile) = 9fea8b01839d07fbfc630394ea32813824f7900b
+SHA1 (patch-jedec.c) = ab004b3c9a55057675b6bbcc9087da3a27d07c12
+SHA1 (patch-main.c) = b221ca2f2522c6097ef03674554bd814ad8f0d22

Index: pkgsrc/sysutils/minipro/patches/patch-Makefile
diff -u pkgsrc/sysutils/minipro/patches/patch-Makefile:1.2 pkgsrc/sysutils/minipro/patches/patch-Makefile:1.3
--- pkgsrc/sysutils/minipro/patches/patch-Makefile:1.2  Mon Feb 13 23:38:48 2023
+++ pkgsrc/sysutils/minipro/patches/patch-Makefile      Sun Apr 21 20:37:52 2024
@@ -1,20 +1,10 @@
-$NetBSD: patch-Makefile,v 1.2 2023/02/13 23:38:48 thorpej Exp $
+$NetBSD: patch-Makefile,v 1.3 2024/04/21 20:37:52 thorpej Exp $
 
 - Install the man page into the correct location for pkgsrc.
-- Fix the version number.
 
---- Makefile.orig      2022-09-11 04:44:06.000000000 +0000
-+++ Makefile   2023-02-13 22:30:20.142674405 +0000
-@@ -24,7 +24,7 @@ MANDIR ?= $(PREFIX)/share/man
- ##########################################################################
- 
- NAME = minipro
--VERSION = 0.5
-+VERSION = 0.6
- 
- # If we're working from git, we have access to proper variables. If
- # not, make it clear that we're working from a release.
-@@ -72,7 +72,7 @@ BIN_INSTDIR=$(DESTDIR)$(PREFIX)/bin
+--- Makefile.orig      2024-04-21 20:21:34.514659003 +0000
++++ Makefile   2024-04-21 20:24:52.459594771 +0000
+@@ -73,7 +73,7 @@ BIN_INSTDIR=$(DESTDIR)$(PREFIX)/bin
  LIB_INSTDIR=$(DESTDIR)$(PREFIX)/lib
  SHARE_INSTDIR=$(DESTDIR)$(PREFIX)/share/minipro
  INCLUDE_INSTDIR=$(DESTDIR)$(PREFIX)/include/libminipro

Index: pkgsrc/sysutils/minipro/patches/patch-jedec.c
diff -u pkgsrc/sysutils/minipro/patches/patch-jedec.c:1.1 pkgsrc/sysutils/minipro/patches/patch-jedec.c:1.2
--- pkgsrc/sysutils/minipro/patches/patch-jedec.c:1.1   Sat Jan 22 17:52:53 2022
+++ pkgsrc/sysutils/minipro/patches/patch-jedec.c       Sun Apr 21 20:37:52 2024
@@ -1,24 +1,24 @@
-$NetBSD: patch-jedec.c,v 1.1 2022/01/22 17:52:53 thorpej Exp $
+$NetBSD: patch-jedec.c,v 1.2 2024/04/21 20:37:52 thorpej Exp $
 
 Use ctype(3) functions safely.
 
---- jedec.c.orig       2022-01-22 15:54:35.000000000 +0000
-+++ jedec.c
-@@ -125,7 +125,7 @@ static int parse_tokens(char *buffer, si
-     if (!*p_token) continue;
+--- jedec.c.orig       2024-04-21 20:28:47.620230367 +0000
++++ jedec.c    2024-04-21 20:30:15.920088540 +0000
+@@ -146,7 +146,7 @@ static int parse_tokens(char *buffer, si
+                       continue;
  
-     // Skip non printable characters but ETX
--    while (!isalpha(*p_token) && *p_token != ETX) p_token++;
-+    while (!isalpha((unsigned char)*p_token) && *p_token != ETX) p_token++;
+               /* Skip non printable characters but ETX */
+-              while (!isalpha((int)*p_token) && *p_token != ETX)
++              while (!isalpha((unsigned char)*p_token) && *p_token != ETX)
+                       p_token++;
  
-     // Exit the loop if the ETX character is found
-     if (*p_token == ETX) break;
-@@ -237,7 +237,7 @@ static int parse_tokens(char *buffer, si
-          We need to parse each line to get the entire 120 bits row.
-          */
-         while (*p_next != DELIMITER) {
--          if (!iscntrl(*p_next) && *p_next != ' ' && *p_next != '0' &&
-+          if (!iscntrl((unsigned char)*p_next) && *p_next != ' ' && *p_next != '0' &&
-               *p_next != '1')
-             return BAD_FORMAT;
+               /* Exit the loop if the ETX character is found */
+@@ -274,7 +274,7 @@ static int parse_tokens(char *buffer, si
+                        * 120 bits row.
+                        */
+                       while (*p_next != DELIMITER) {
+-                              if (!iscntrl((int)*p_next) && *p_next != ' ' &&
++                              if (!iscntrl((unsigned char)*p_next) && *p_next != ' ' &&
+                                   *p_next != '0' && *p_next != '1')
+                                       return BAD_FORMAT;
  
Index: pkgsrc/sysutils/minipro/patches/patch-main.c
diff -u pkgsrc/sysutils/minipro/patches/patch-main.c:1.1 pkgsrc/sysutils/minipro/patches/patch-main.c:1.2
--- pkgsrc/sysutils/minipro/patches/patch-main.c:1.1    Sat Jan 22 17:52:53 2022
+++ pkgsrc/sysutils/minipro/patches/patch-main.c        Sun Apr 21 20:37:52 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-main.c,v 1.1 2022/01/22 17:52:53 thorpej Exp $
+$NetBSD: patch-main.c,v 1.2 2024/04/21 20:37:52 thorpej Exp $
 
 Use ctype(3) functions safely.
 
---- main.c.orig        2022-01-22 15:56:02.000000000 +0000
-+++ main.c
-@@ -922,7 +922,7 @@ int get_config_value(const char *buffer,
-     val = num;
-     cur += 2;  // Advances the pointer to the first numeric character
-     while (cur < eol) {
--      if (isxdigit(*cur++))  // check for hex digit
-+      if (isxdigit((unsigned char)*cur++))  // check for hex digit
-       {
-         *val++ = *(cur - 1);  // put it in the buffer
-       }
+--- main.c.orig        2024-04-21 20:31:05.892824868 +0000
++++ main.c     2024-04-21 20:31:14.668888370 +0000
+@@ -987,7 +987,7 @@ int get_config_value(const char *buffer,
+               val = num;
+               cur += 2; /* Advances the pointer to the first numeric character */
+               while (cur < eol) {
+-                      if (isxdigit((int)*cur++)) /* check for hex digit */
++                      if (isxdigit((unsigned char)*cur++)) /* check for hex digit */
+                       {
+                               *val++ = *(cur - 1); /* put it in the buffer */
+                       }