From 772a83fc348c7fae060755ae24e6c7ee4fc063d4 Mon Sep 17 00:00:00 2001 From: rhialto Date: Sun, 5 Dec 2021 16:22:44 +0000 Subject: 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 --- converters/cbmconvert/Makefile | 32 +++++++++++---------- converters/cbmconvert/PLIST | 3 +- converters/cbmconvert/distinfo | 9 +++--- converters/cbmconvert/patches/patch-CMakeLists.txt | 33 ++++++++++++++++++++++ 4 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 converters/cbmconvert/patches/patch-CMakeLists.txt diff --git a/converters/cbmconvert/Makefile b/converters/cbmconvert/Makefile index da741b5719a..0277038383d 100644 --- a/converters/cbmconvert/Makefile +++ b/converters/cbmconvert/Makefile @@ -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 -COMMENT= Converts files to and from various C64/C128/CBM formats +MAINTAINER= pkgsrc-users@NetBSD.org +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" diff --git a/converters/cbmconvert/PLIST b/converters/cbmconvert/PLIST index 5a2f5f7132d..ea2a07372d1 100644 --- a/converters/cbmconvert/PLIST +++ b/converters/cbmconvert/PLIST @@ -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 diff --git a/converters/cbmconvert/distinfo b/converters/cbmconvert/distinfo index 8cccf89d02c..27ab8b83e19 100644 --- a/converters/cbmconvert/distinfo +++ b/converters/cbmconvert/distinfo @@ -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 diff --git a/converters/cbmconvert/patches/patch-CMakeLists.txt b/converters/cbmconvert/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..0ca2e0b894c --- /dev/null +++ b/converters/cbmconvert/patches/patch-CMakeLists.txt @@ -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) + -- cgit v1.2.3