Index: head/comms/opencbm/files/patch-fs.c =================================================================== --- head/comms/opencbm/files/patch-fs.c (revision 541350) +++ head/comms/opencbm/files/patch-fs.c (nonexistent) @@ -1,11 +0,0 @@ ---- opencbm/libimgcopy/fs.c.orig 2017-09-06 16:59:00 UTC -+++ opencbm/libimgcopy/fs.c -@@ -121,7 +121,7 @@ static int open_disk(CBM_FILE fd, imgcopy_settings *se - } - else - { -- printf("filesize=%d, blockcount=%d, calc1=%d, calc2=%d\n", filesize, block_count, block_count * (BLOCKSIZE), block_count * (BLOCKSIZE + 1)); -+ printf("filesize=%ld, blockcount=%d, calc1=%d, calc2=%d\n", (long)filesize, block_count, block_count * (BLOCKSIZE), block_count * (BLOCKSIZE + 1)); - /* D64 sonderformate - - for( tr = D82_TRACKS; !is_image && tr <= D82_TRACKS; ) Property changes on: head/comms/opencbm/files/patch-fs.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/opencbm/Makefile =================================================================== --- head/comms/opencbm/Makefile (revision 541350) +++ head/comms/opencbm/Makefile (revision 541351) @@ -1,74 +1,76 @@ # Created by: Felix Palmen # $FreeBSD$ PORTNAME= opencbm PORTVERSION= ${OCBM_VERSION} CATEGORIES= comms archivers -PATCHFILES= 12ef17d4cf78903c9c52d7a348a816424d549b89.diff +PATCHFILES= 077611e1ec27b52081c45c1702ff3812233fdd5e.diff \ + dfa9dd172e2843a661cdb6cdba09d1c6c2c1b35e.diff \ + a5fb83548b0ed54372d7615118c8ec9ba338bb9b.diff MAINTAINER= felix@palmen-it.de COMMENT= Commodore CBM serial IEC/IEEE-488 bus utilities LICENSE= GPLv2 BSD3CLAUSE LICENSE_COMB= multi BUILD_DEPENDS= cc65:devel/cc65 -USES= gmake +USES= gmake pkgconfig USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS INFO OPTIONS_DEFAULT= DOCS INFO MAKE_ARGS= CC="${CC}" INFODIR=${PREFIX}/${INFO_PATH} MAKEFILE= LINUX/Makefile MAKE_JOBS_UNSAFE= yes ALL_TARGET= opencbm plugin-xu1541 plugin-xum1541 INSTALL_TARGET= install install-plugin-xu1541 install-plugin-xum1541 DOCS_BUILD_DEPENDS= dvips:print/tex-dvipsk \ latex:print/tex-formats \ linuxdoc:textproc/linuxdoc-tools DOCS_USES= ghostscript:build DOCS_ALL_TARGET= doc DOCS_MAKE_ARGS_OFF= TXT= DVI= PDF= HTML= INFO_BUILD_DEPENDS= linuxdoc:textproc/linuxdoc-tools INFO_USES= makeinfo INFO_ALL_TARGET= doc INFO_INFO= opencbm INFO_MAKE_ARGS_OFF= INFO= OCBM_CONFDIR= ${LOCALBASE}/etc/opencbm.conf.d post-patch: @${REINPLACE_CMD} -e 's|_ETC="$$1"|_ETC="$${1:-${LOCALBASE}/etc}"|' \ -e 's|in /.*/ instead|in ${OCBM_CONFDIR}/ instead|' \ -e "s|execute 'opencbm_|execute '|" \ ${WRKSRC}/opencbm/LINUX/plugin_helper_tools post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopencbm.so.${OCBM_LIBVERSION} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopencbm.so.${OCBM_VERSION} .for p in xu1541 xum1541 - ${STRIP_CMD} ${STAGEDIR}${PLUGINBASENAME}${p}.so.${OCBM_LIBVERSION} + ${STRIP_CMD} ${STAGEDIR}${PLUGINBASENAME}${p}.so.${OCBM_VERSION} .endfor @${RM} ${STAGEDIR}${PREFIX}/etc/opencbm.conf @${MV} ${STAGEDIR}${PREFIX}/etc/opencbm.conf.d/00opencbm.conf \ ${STAGEDIR}${PREFIX}/etc/opencbm.conf.d/00opencbm.conf.sample @${MV} ${STAGEDIR}${PREFIX}/bin/opencbm_plugin_helper_tools \ ${STAGEDIR}${PREFIX}/sbin/opencbm_plugin_helper_tools post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/opencbm/docs && \ ${COPYTREE_SHARE} "html misc opencbm.pdf opencbm.txt" \ ${STAGEDIR}${DOCSDIR}) post-install-INFO-on: ${INSTALL_MAN} ${WRKSRC}/opencbm/docs/opencbm.info \ ${STAGEDIR}${PREFIX}/${INFO_PATH} .include "Makefile.inc" .include Index: head/comms/opencbm/Makefile.inc =================================================================== --- head/comms/opencbm/Makefile.inc (revision 541350) +++ head/comms/opencbm/Makefile.inc (revision 541351) @@ -1,22 +1,21 @@ # Created by: Felix Palmen # $FreeBSD$ -OCBM_VERSION= 0.4.99.99a +OCBM_VERSION= 0.4.99.102 DISTVERSIONPREFIX= v DIST_SUBDIR= opencbm DISTINFO_FILE= ${.CURDIR}/../opencbm/distinfo PATCH_DIST_STRIP= -p1 PATCH_SITES= https://github.com/OpenCBM/OpenCBM/commit/ USE_GITHUB= yes GH_ACCOUNT= OpenCBM GH_PROJECT= OpenCBM PATCHDIR= ${.CURDIR}/../opencbm/files PATCH_WRKSRC= ${WRKDIR}/OpenCBM-${OCBM_VERSION} MAKE_ENV= USER_CFLAGS="${CFLAGS}" -OCBM_LIBVERSION= 0.4.99.99 PLUGINBASENAME= ${PREFIX}/lib/opencbm/plugin/libopencbm- Index: head/comms/opencbm/distinfo =================================================================== --- head/comms/opencbm/distinfo (revision 541350) +++ head/comms/opencbm/distinfo (revision 541351) @@ -1,11 +1,9 @@ -TIMESTAMP = 1590503036 -SHA256 (opencbm/OpenCBM-OpenCBM-v0.4.99.99a_GH0.tar.gz) = 0ae35e9011231eef1c4b6800bba16ced82690e80a91d67853888d49c63b874a0 -SIZE (opencbm/OpenCBM-OpenCBM-v0.4.99.99a_GH0.tar.gz) = 8661428 -SHA256 (opencbm/ca4c06e7430caf3b2296d4e1e00051fff015fc53.diff) = 3babd55eaa0378c688a422b1176325874a46fa4014e9420e672418998c592c27 -SIZE (opencbm/ca4c06e7430caf3b2296d4e1e00051fff015fc53.diff) = 8726 -SHA256 (opencbm/12ef17d4cf78903c9c52d7a348a816424d549b89.diff) = 2bea76abc6e3f19d93776c39a921c6e17d892613ae6e4740eda5f555483bb095 -SIZE (opencbm/12ef17d4cf78903c9c52d7a348a816424d549b89.diff) = 561 -SHA256 (opencbm/073b833772e4325c7f680d6aeb81bc11844f03ca.diff) = e4c5858162d000e099140d78590effc8b5dccbf1f80c9dcdfffc4420ad9b6c03 -SIZE (opencbm/073b833772e4325c7f680d6aeb81bc11844f03ca.diff) = 27055 -SHA256 (opencbm/3e967551e200d0c03aa4898e482626a7510acd21.diff) = d1d73fa395e16956dce1e971750ecefbb2b80b6be1c1ec95392fc9be4d2d4676 -SIZE (opencbm/3e967551e200d0c03aa4898e482626a7510acd21.diff) = 825 +TIMESTAMP = 1594050328 +SHA256 (opencbm/OpenCBM-OpenCBM-v0.4.99.102_GH0.tar.gz) = 37e0e2018dc667285d5dcdcbef662c3c00281714748e627ad2c9ce32ef44577f +SIZE (opencbm/OpenCBM-OpenCBM-v0.4.99.102_GH0.tar.gz) = 13398879 +SHA256 (opencbm/077611e1ec27b52081c45c1702ff3812233fdd5e.diff) = 75a3914ffa73abaa0abec7f2ede5fc34bffb6faf0d3e8579cc133933c234e01f +SIZE (opencbm/077611e1ec27b52081c45c1702ff3812233fdd5e.diff) = 700 +SHA256 (opencbm/dfa9dd172e2843a661cdb6cdba09d1c6c2c1b35e.diff) = c3e94219a390c6071c7a2baf6d4705c673c810f57ce0b2d665d37af85bb8f269 +SIZE (opencbm/dfa9dd172e2843a661cdb6cdba09d1c6c2c1b35e.diff) = 1487 +SHA256 (opencbm/a5fb83548b0ed54372d7615118c8ec9ba338bb9b.diff) = 42c22f3bf5d72d65742fe79b00417d75c2def62ddb58543f0e9d3b08023a2db9 +SIZE (opencbm/a5fb83548b0ed54372d7615118c8ec9ba338bb9b.diff) = 552 Index: head/comms/opencbm/pkg-plist =================================================================== --- head/comms/opencbm/pkg-plist (revision 541350) +++ head/comms/opencbm/pkg-plist (revision 541351) @@ -1,101 +1,103 @@ bin/cbmcopy bin/cbmctrl bin/cbmformat bin/cbmforng bin/cbmlinetester bin/cbmread bin/cbmrpm41 bin/cbmwrite bin/d64copy bin/d82copy bin/frm_analyzer bin/imgcopy bin/samplelibtransf +bin/testlines bin/xum1541cfg @sample etc/opencbm.conf.d/00opencbm.conf.sample etc/opencbm.conf.d/10xu1541.conf etc/opencbm.conf.d/10xum1541.conf include/cbmcopy.h include/d64copy.h include/opencbm.h lib/libopencbm.a lib/libopencbm.so lib/libopencbm.so.0 -lib/libopencbm.so.0.4.99.99 +lib/libopencbm.so.0.4.99.102 lib/opencbm/plugin/libopencbm-xu1541.a lib/opencbm/plugin/libopencbm-xu1541.so lib/opencbm/plugin/libopencbm-xu1541.so.0 -lib/opencbm/plugin/libopencbm-xu1541.so.0.4.99.99 +lib/opencbm/plugin/libopencbm-xu1541.so.0.4.99.102 lib/opencbm/plugin/xu1541/read_event_log lib/opencbm/plugin/xu1541/usb_echo_test lib/opencbm/plugin/libopencbm-xum1541.a lib/opencbm/plugin/libopencbm-xum1541.so lib/opencbm/plugin/libopencbm-xum1541.so.0 -lib/opencbm/plugin/libopencbm-xum1541.so.0.4.99.99 +lib/opencbm/plugin/libopencbm-xum1541.so.0.4.99.102 man/man1/cbmcopy.1.gz man/man1/cbmctrl.1.gz man/man1/cbmformat.1.gz man/man1/cbmforng.1.gz man/man1/cbmlinetester.1.gz man/man1/cbmread.1.gz man/man1/cbmrpm41.1.gz man/man1/cbmwrite.1.gz man/man1/d64copy.1.gz man/man1/d82copy.1.gz man/man1/frm_analyzer.1.gz man/man1/imgcopy.1.gz man/man1/samplelibtransf.1.gz +man/man1/testlines.1.gz man/man1/xum1541cfg.1.gz sbin/opencbm_plugin_helper_tools %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-1.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-10.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-11.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-12.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-13.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-14.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-15.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-16.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-17.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-18.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-19.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-2.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-20.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-21.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-22.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-23.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-24.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-25.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-26.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-27.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-28.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-29.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-3.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-30.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-31.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-32.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-33.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-34.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-35.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-36.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-4.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-5.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-6.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-7.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-8.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-9.html %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-software-installed-uninstall.png %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-software-installed.png %%PORTDOCS%%%%DOCSDIR%%/html/opencbm.html %%PORTDOCS%%%%DOCSDIR%%/html/zadig-listalldevices.png %%PORTDOCS%%%%DOCSDIR%%/html/zadig-success.png %%PORTDOCS%%%%DOCSDIR%%/html/zadig-uac.png %%PORTDOCS%%%%DOCSDIR%%/html/zadig-xu1541.png %%PORTDOCS%%%%DOCSDIR%%/html/zadig-xum1541.png %%PORTDOCS%%%%DOCSDIR%%/misc/README %%PORTDOCS%%%%DOCSDIR%%/misc/ibmlpt.txt %%PORTDOCS%%%%DOCSDIR%%/misc/serial-bus.txt %%PORTDOCS%%%%DOCSDIR%%/misc/serial.txt %%PORTDOCS%%%%DOCSDIR%%/opencbm.pdf %%PORTDOCS%%%%DOCSDIR%%/opencbm.txt @postexec opencbm_plugin_helper_tools rebuild @preunexec rm -f %%LOCALBASE%%/etc/opencbm.conf Index: head/comms/opencbm-kmod/Makefile =================================================================== --- head/comms/opencbm-kmod/Makefile (revision 541350) +++ head/comms/opencbm-kmod/Makefile (revision 541351) @@ -1,26 +1,22 @@ # Created by: Felix Palmen # $FreeBSD$ PORTNAME= opencbm-kmod PORTVERSION= ${OCBM_VERSION} CATEGORIES= comms archivers -PATCHFILES= ca4c06e7430caf3b2296d4e1e00051fff015fc53.diff \ - 073b833772e4325c7f680d6aeb81bc11844f03ca.diff \ - 3e967551e200d0c03aa4898e482626a7510acd21.diff - MAINTAINER= felix@palmen-it.de COMMENT= OpenCBM driver module for parallel-port X[MA]-1541 cables LICENSE= GPLv2+ USES= kmod uidfix WRKSRC_SUBDIR= opencbm/sys/freebsd post-install: ${INSTALL_MAN} ${FILESDIR}/opencbm.4 ${STAGEDIR}${PREFIX}/man/man4 .include "../opencbm/Makefile.inc" .include Index: head/comms/opencbm-plugin-xa1541/Makefile =================================================================== --- head/comms/opencbm-plugin-xa1541/Makefile (revision 541350) +++ head/comms/opencbm-plugin-xa1541/Makefile (revision 541351) @@ -1,36 +1,37 @@ # Created by: Felix Palmen # $FreeBSD$ PORTNAME= opencbm-plugin-xa1541 PORTVERSION= ${OCBM_VERSION} CATEGORIES= comms archivers -PATCHFILES= 12ef17d4cf78903c9c52d7a348a816424d549b89.diff \ - ca4c06e7430caf3b2296d4e1e00051fff015fc53.diff +PATCHFILES= 077611e1ec27b52081c45c1702ff3812233fdd5e.diff \ + dfa9dd172e2843a661cdb6cdba09d1c6c2c1b35e.diff \ + a5fb83548b0ed54372d7615118c8ec9ba338bb9b.diff MAINTAINER= felix@palmen-it.de COMMENT= OpenCBM plugin for parallel-port cables LICENSE= GPLv2 BUILD_DEPENDS= cc65:devel/cc65 RUN_DEPENDS= opencbm=${PORTVERSION}:comms/opencbm \ opencbm-kmod=${PORTVERSION}:comms/opencbm-kmod -USES= gmake +USES= gmake pkgconfig USE_LDCONFIG= yes MAKE_ARGS= CC="${CC}" SUBDIRS_PLUGIN_XA1541=opencbm/lib/plugin/xa1541 MAKEFILE= LINUX/Makefile MAKE_JOBS_UNSAFE= yes ALL_TARGET= plugin-xa1541 INSTALL_TARGET= install-plugin-xa1541 post-install: - ${STRIP_CMD} ${STAGEDIR}${PLUGINBASENAME}xa1541.so.${OCBM_LIBVERSION} + ${STRIP_CMD} ${STAGEDIR}${PLUGINBASENAME}xa1541.so.${OCBM_VERSION} @${RM} ${STAGEDIR}${PREFIX}/etc/opencbm.conf.d/00opencbm.conf @${RM} ${STAGEDIR}${PREFIX}/etc/opencbm.conf .include "../opencbm/Makefile.inc" .include Index: head/comms/opencbm-plugin-xa1541/pkg-plist =================================================================== --- head/comms/opencbm-plugin-xa1541/pkg-plist (revision 541350) +++ head/comms/opencbm-plugin-xa1541/pkg-plist (revision 541351) @@ -1,5 +1,5 @@ etc/opencbm.conf.d/10xa1541.conf lib/opencbm/plugin/libopencbm-xa1541.a lib/opencbm/plugin/libopencbm-xa1541.so lib/opencbm/plugin/libopencbm-xa1541.so.0 -lib/opencbm/plugin/libopencbm-xa1541.so.0.4.99.99 +lib/opencbm/plugin/libopencbm-xa1541.so.0.4.99.102