Sun Dec 5 16:22:45 2021 UTC ()
converters/cbmconvert: update to 2.1.4.

This is a maintenance release of cbmconvert after a 15-year break. Some old
source code releases were imported as snapshots, because no version control
system had been used in the past.

What's Changed

-   Empty files are now supported.
-   The build system was converted to CMake.
-   Some test cases with CTest were introduced.
-   Support for CPack packaging as well as native Debian packages was
    implemented.

Full Changelog: https://github.com/dr-m/cbmconvert/commits/cbmconvert-2.1.4


(rhialto)
diff -r1.19 -r1.20 pkgsrc/converters/cbmconvert/Makefile
diff -r1.3 -r1.4 pkgsrc/converters/cbmconvert/PLIST
diff -r1.7 -r1.8 pkgsrc/converters/cbmconvert/distinfo
diff -r0 -r1.1 pkgsrc/converters/cbmconvert/patches/patch-CMakeLists.txt
cvs diff -r1.19 -r1.20 pkgsrc/converters/cbmconvert/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/cbmconvert/Makefile 2012/10/03 00:20:09 1.19
+++ pkgsrc/converters/cbmconvert/Makefile 2021/12/05 16:22:44 1.20
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1# $NetBSD: Makefile,v 1.19 2012/10/03 00:20:09 asau Exp $ 1# $NetBSD: Makefile,v 1.20 2021/12/05 16:22:44 rhialto Exp $
2 2
3DISTNAME= cbmconvert-2.1.2 3DISTNAME= cbmconvert-2.1.4
4CATEGORIES= converters archivers 4CATEGORIES= converters archivers
5MASTER_SITES= ftp://ftp.zimmers.net/pub/cbm/crossplatform/converters/unix/ 5MASTER_SITES= ${MASTER_SITE_GITHUB:=dr-m/}
 6GITHUB_PROJECT= cbmconvert
 7GITHUB_TAG= ${PKGNAME_NOREV}
6 8
7MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Converts files to and from various C64/C128/CBM formats 10HOMEPAGE= https://github.com/dr-m/cbmconvert/
 11COMMENT= Converts files to and from various C64/C128/CBM formats
 12LICENSE= gnu-gpl-v2
 13
 14USE_LANGUAGES+= c
 15
 16USE_CMAKE= yes
 17#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
9 18
10MAKE_FILE= Makefile.unix 
11MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q} 
12INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/cbmconvert 19INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/cbmconvert
13 20
14do-install: 21do-test:
15.for f in cbmconvert disk2zip zip2disk 22 cd ${WRKSRC} && ctest -C Debug
16 ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin 
17 ${INSTALL_MAN} ${WRKSRC}/${f}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 
18.endfor 
19 ${INSTALL_DATA} ${WRKSRC}/cbmconvert.html \ 
20 ${DESTDIR}${PREFIX}/share/doc/cbmconvert 
21 23
22.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/converters/cbmconvert/PLIST (expand / switch to unified diff)

--- pkgsrc/converters/cbmconvert/PLIST 2009/06/14 17:39:09 1.3
+++ pkgsrc/converters/cbmconvert/PLIST 2021/12/05 16:22:44 1.4
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:39:09 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2021/12/05 16:22:44 rhialto Exp $
2bin/cbmconvert 2bin/cbmconvert
3bin/disk2zip 3bin/disk2zip
4bin/zip2disk 4bin/zip2disk
5man/man1/cbmconvert.1 5man/man1/cbmconvert.1
6man/man1/disk2zip.1 6man/man1/disk2zip.1
7man/man1/zip2disk.1 7man/man1/zip2disk.1
8share/doc/cbmconvert/cbmconvert.html 8share/doc/cbmconvert/cbmconvert.html
 9@pkgdir man/man1
cvs diff -r1.7 -r1.8 pkgsrc/converters/cbmconvert/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/cbmconvert/distinfo 2021/10/26 10:06:38 1.7
+++ pkgsrc/converters/cbmconvert/distinfo 2021/12/05 16:22:44 1.8
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.7 2021/10/26 10:06:38 nia Exp $ 1$NetBSD: distinfo,v 1.8 2021/12/05 16:22:44 rhialto Exp $
2 2
3BLAKE2s (cbmconvert-2.1.2.tar.gz) = f584841fefb39145d655e24bb01fc2b1f265ade2d1f825f868486c4c64deec1b 3BLAKE2s (cbmconvert-2.1.4.tar.gz) = 0722c21332d1ae239a23774d13418146d51c8bc4e46a084cb485041ded221476
4SHA512 (cbmconvert-2.1.2.tar.gz) = 87a30b7c0981c579daf2a8ec72183108c4f81e311e16c5be4f5886cdb3901334f22f088ab9d7b776c2a8aa91e0feb391bad42943c82132b721155a36584a461e 4SHA512 (cbmconvert-2.1.4.tar.gz) = 2e031577349b7a8d99e11a07817981335e95b99939ff731db3718b65029db176170cbe49f40e84a81c8c68b216e57df95687422f9889456511edaa49c61b13ce
5Size (cbmconvert-2.1.2.tar.gz) = 62666 bytes 5Size (cbmconvert-2.1.4.tar.gz) = 64597 bytes
 6SHA1 (patch-CMakeLists.txt) = a162de1286e323917befcee3d38317d870a4d2a1
File Added: pkgsrc/converters/cbmconvert/patches/Attic/patch-CMakeLists.txt
$NetBSD: patch-CMakeLists.txt,v 1.1 2021/12/05 16:22:45 rhialto Exp $

- Declare "C" as the used language, so that cmake won't try to detect C++.
- Correct the location of the manual pages for pkgsrc.

--- CMakeLists.txt.orig	2021-12-05 11:58:51.000000000 +0000
+++ CMakeLists.txt
@@ -18,13 +18,15 @@ ENDIF()
 
 IF (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
   PROJECT (cbmconvert VERSION ${VERSION}
+    LANGUAGES C
     DESCRIPTION "Create and convert Commodore 8-bit binary file archives"
     HOMEPAGE_URL "https://github.com/dr-m/cbmconvert/")
 ELSEIF (CMAKE_VERSION VERSION_GREATER_EQUAL 3.9)
   PROJECT (cbmconvert VERSION ${VERSION}
+    LANGUAGES C
     DESCRIPTION "Create and convert Commodore 8-bit binary file archives")
 ELSE()
-  PROJECT (cbmconvert VERSION ${VERSION})
+  PROJECT (cbmconvert VERSION ${VERSION} LANGUAGES C)
 ENDIF()
 
 SET (CPACK_PACKAGE_DESCRIPTION
@@ -49,7 +51,7 @@ IF (WIN32)
 ELSE()
   INSTALL(FILES cbmconvert.html DESTINATION "share/doc/cbmconvert")
   INSTALL(FILES cbmconvert.1 zip2disk.1 disk2zip.1
-    DESTINATION "share/man/man1")
+    DESTINATION "man/man1")
 ENDIF()
 INSTALL(TARGETS cbmconvert zip2disk disk2zip)