CVS commit: pkgsrc/converters/cbmconvert

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Dec  5 16:22:45 UTC 2021

Modified Files:
        pkgsrc/converters/cbmconvert: Makefile PLIST distinfo
Added Files:
        pkgsrc/converters/cbmconvert/patches: patch-CMakeLists.txt

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/converters/cbmconvert/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/cbmconvert/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/cbmconvert/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/converters/cbmconvert/patches/patch-CMakeLists.txt

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

Modified files:

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

Index: pkgsrc/converters/cbmconvert/PLIST
diff -u pkgsrc/converters/cbmconvert/PLIST:1.3 pkgsrc/converters/cbmconvert/PLIST:1.4
--- pkgsrc/converters/cbmconvert/PLIST:1.3      Sun Jun 14 17:39:09 2009
+++ pkgsrc/converters/cbmconvert/PLIST  Sun Dec  5 16:22:44 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:39:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/12/05 16:22:44 rhialto Exp $
 bin/cbmconvert
 bin/disk2zip
 bin/zip2disk
@@ -6,3 +6,4 @@ man/man1/cbmconvert.1
 man/man1/disk2zip.1
 man/man1/zip2disk.1
 share/doc/cbmconvert/cbmconvert.html
+@pkgdir man/man1

Index: pkgsrc/converters/cbmconvert/distinfo
diff -u pkgsrc/converters/cbmconvert/distinfo:1.7 pkgsrc/converters/cbmconvert/distinfo:1.8
--- pkgsrc/converters/cbmconvert/distinfo:1.7   Tue Oct 26 10:06:38 2021
+++ pkgsrc/converters/cbmconvert/distinfo       Sun Dec  5 16:22:44 2021
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:06:38 nia Exp $
+$NetBSD: distinfo,v 1.8 2021/12/05 16:22:44 rhialto Exp $
 
-BLAKE2s (cbmconvert-2.1.2.tar.gz) = f584841fefb39145d655e24bb01fc2b1f265ade2d1f825f868486c4c64deec1b
-SHA512 (cbmconvert-2.1.2.tar.gz) = 87a30b7c0981c579daf2a8ec72183108c4f81e311e16c5be4f5886cdb3901334f22f088ab9d7b776c2a8aa91e0feb391bad42943c82132b721155a36584a461e
-Size (cbmconvert-2.1.2.tar.gz) = 62666 bytes
+BLAKE2s (cbmconvert-2.1.4.tar.gz) = 0722c21332d1ae239a23774d13418146d51c8bc4e46a084cb485041ded221476
+SHA512 (cbmconvert-2.1.4.tar.gz) = 2e031577349b7a8d99e11a07817981335e95b99939ff731db3718b65029db176170cbe49f40e84a81c8c68b216e57df95687422f9889456511edaa49c61b13ce
+Size (cbmconvert-2.1.4.tar.gz) = 64597 bytes
+SHA1 (patch-CMakeLists.txt) = a162de1286e323917befcee3d38317d870a4d2a1

Added files:

Index: pkgsrc/converters/cbmconvert/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/converters/cbmconvert/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sun Dec  5 16:22:45 2021
+++ pkgsrc/converters/cbmconvert/patches/patch-CMakeLists.txt   Sun Dec  5 16:22:45 2021
@@ -0,0 +1,33 @@
+$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)
+