Sun Jan 15 15:41:47 2023 UTC ()
Update cpmtools to cpmtools-2.23.

Changes since 2.22:

o  Use 16 bit block pointers for file systems > 256 blocks, not >= 256
o  Translate CP/M file name character '/' to ',' for the host and back
o  dirblks in Kaypro format fixed
o  Misc fixes for directory listing
o  Added bootsec diskdefs option
o  Check Device_close return value
o  Check for too small block number when reading file data
o  Replaced obsolete macros in configure.in
o  Cygwin/Windows support did not build any more and likely not for quite
   some time, so it was removed.

(We're coming from 2.13, so there's quite a few more since then.)


(thorpej)
diff -r1.8 -r1.9 pkgsrc/sysutils/cpmtools/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/cpmtools/distinfo
diff -r1.2 -r0 pkgsrc/sysutils/cpmtools/patches/patch-aa
diff -r1.2 -r0 pkgsrc/sysutils/cpmtools/patches/patch-ab
diff -r1.2 -r0 pkgsrc/sysutils/cpmtools/patches/patch-ac
diff -r1.2 -r0 pkgsrc/sysutils/cpmtools/patches/patch-ad
diff -r0 -r1.1 pkgsrc/sysutils/cpmtools/patches/patch-cpmcp.c
diff -r0 -r1.1 pkgsrc/sysutils/cpmtools/patches/patch-cpmfs.c
diff -r0 -r1.1 pkgsrc/sysutils/cpmtools/patches/patch-term_curses.c

cvs diff -r1.8 -r1.9 pkgsrc/sysutils/cpmtools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/cpmtools/Makefile 2017/01/03 22:46:53 1.8
+++ pkgsrc/sysutils/cpmtools/Makefile 2023/01/15 15:41:46 1.9
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.8 2017/01/03 22:46:53 roy Exp $ 1# $NetBSD: Makefile,v 1.9 2023/01/15 15:41:46 thorpej Exp $
2# 2#
3 3
4DISTNAME= cpmtools-2.13 4DISTNAME= cpmtools-2.23
5PKGREVISION= 2 
6CATEGORIES= sysutils 5CATEGORIES= sysutils
7MASTER_SITES= http://www.moria.de/~michael/cpmtools/ 6MASTER_SITES= http://www.moria.de/~michael/cpmtools/files/
8 7
9MAINTAINER= dgriffi@cs.csubak.edu 8MAINTAINER= dgriffi@cs.csubak.edu
10HOMEPAGE= http://www.moria.de/~michael/cpmtools/ 9HOMEPAGE= http://www.moria.de/~michael/cpmtools/
11COMMENT= Similar to mtools, except for CP/M filesystems 10COMMENT= Similar to mtools, except for CP/M filesystems
12 11
13GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
14 13
15CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/cpmtools 14CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/cpmtools
16 15
17INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} 16INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
18INSTALLATION_DIRS+= bin share/cpmtools ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 17INSTALLATION_DIRS+= bin share/cpmtools ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
19 18
20# I have no idea why this even wants to link against curses as it appears 19# I have no idea why this even wants to link against curses as it appears

cvs diff -r1.7 -r1.8 pkgsrc/sysutils/cpmtools/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/cpmtools/distinfo 2021/10/26 11:19:27 1.7
+++ pkgsrc/sysutils/cpmtools/distinfo 2023/01/15 15:41:46 1.8
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.7 2021/10/26 11:19:27 nia Exp $ 1$NetBSD: distinfo,v 1.8 2023/01/15 15:41:46 thorpej Exp $
2 2
3BLAKE2s (cpmtools-2.13.tar.gz) = e937e5f83ad03bae6ade7eabd216842b877ec1a93b9c85d97aac986369d8c588 3BLAKE2s (cpmtools-2.23.tar.gz) = 831befdbf98cc7037b462374c9e9b2758c7d0b529606a9d8ea24f0eded240e01
4SHA512 (cpmtools-2.13.tar.gz) = c110736259099d8c473484e82adb986c25d58fd7736204a331a061f06034f80b82523a10190f072ed05cd7bb5758b15ebbabcc0c702e74e0802bb3c08b5d9e6f 4SHA512 (cpmtools-2.23.tar.gz) = 14ead54e78ae1d99bad67f665d9c962ea3e928d4147dda41a8620d0f65cca76323768b0006d58b2f1710fbe15d1f8d102c5624b97fd5d441537770d997ea953e
5Size (cpmtools-2.13.tar.gz) = 170008 bytes 5Size (cpmtools-2.23.tar.gz) = 177636 bytes
6SHA1 (patch-aa) = c15fa42a3cfbb2477fba4467fee77ba33f966c89 6SHA1 (patch-cpmcp.c) = 4a250548df328a187814488616d45292c1c2ef59
7SHA1 (patch-ab) = aaf72082a55ed08627d44912f461e4a0f9510294 7SHA1 (patch-cpmfs.c) = ee90077d46db59e8070097db0fc1cb71ea194de7
8SHA1 (patch-ac) = c9e2423320f6e3ece5b9a3caf9f8416faf9d8a3c 8SHA1 (patch-term_curses.c) = 6e8d760f2de731804093f963134a441a9c195afc
9SHA1 (patch-ad) = 40d980ed06806e1784994e2bf783f0c159fcd2d4 

File Deleted: pkgsrc/sysutils/cpmtools/patches/Attic/patch-aa

File Deleted: pkgsrc/sysutils/cpmtools/patches/Attic/patch-ab

File Deleted: pkgsrc/sysutils/cpmtools/patches/Attic/patch-ac

File Deleted: pkgsrc/sysutils/cpmtools/patches/Attic/patch-ad

File Added: pkgsrc/sysutils/cpmtools/patches/patch-cpmcp.c
$NetBSD: patch-cpmcp.c,v 1.1 2023/01/15 15:41:47 thorpej Exp $

Some systems require <sys/types.h> before <sys/stat.h>.

--- cpmcp.c.orig	2012-10-07 10:46:25.000000000 +0000
+++ cpmcp.c
@@ -1,8 +1,8 @@
 /* #includes */ /*{{{C}}}*//*{{{*/
 #include "config.h"
 
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>

File Added: pkgsrc/sysutils/cpmtools/patches/patch-cpmfs.c
$NetBSD: patch-cpmfs.c,v 1.1 2023/01/15 15:41:47 thorpej Exp $

Some systems require <sys/types.h> before <sys/stat.h>.

--- cpmfs.c.orig	2012-10-07 10:46:25.000000000 +0000
+++ cpmfs.c
@@ -1,6 +1,7 @@
 /* #includes */ /*{{{C}}}*//*{{{*/
 #include "config.h"
 
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <assert.h>
 #include <ctype.h>

File Added: pkgsrc/sysutils/cpmtools/patches/patch-term_curses.c
$NetBSD: patch-term_curses.c,v 1.1 2023/01/15 15:41:47 thorpej Exp $

Include <stdarg.h> for needed va_list, etc. declarations.

--- term_curses.c.orig	2023-01-15 15:26:33.250094786 +0000
+++ term_curses.c	2023-01-15 15:26:49.974666733 +0000
@@ -13,6 +13,7 @@
 #include <curses.h>
 #endif
 #include <errno.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>