Index: comms/opencbm/Makefile =================================================================== --- comms/opencbm/Makefile (revision 541279) +++ comms/opencbm/Makefile (working copy) @@ -5,7 +5,9 @@ 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 @@ -15,7 +17,7 @@ BUILD_DEPENDS= cc65:devel/cc65 -USES= gmake +USES= gmake pkgconfig USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS INFO @@ -49,9 +51,9 @@ ${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 \ Index: comms/opencbm/Makefile.inc =================================================================== --- comms/opencbm/Makefile.inc (revision 541279) +++ comms/opencbm/Makefile.inc (working copy) @@ -1,7 +1,7 @@ # 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 @@ -18,5 +18,4 @@ MAKE_ENV= USER_CFLAGS="${CFLAGS}" -OCBM_LIBVERSION= 0.4.99.99 PLUGINBASENAME= ${PREFIX}/lib/opencbm/plugin/libopencbm- Index: comms/opencbm/distinfo =================================================================== --- comms/opencbm/distinfo (revision 541279) +++ comms/opencbm/distinfo (working copy) @@ -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: comms/opencbm/files/patch-fs.c =================================================================== --- comms/opencbm/files/patch-fs.c (revision 541279) +++ 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: 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: comms/opencbm/pkg-plist =================================================================== --- comms/opencbm/pkg-plist (revision 541279) +++ comms/opencbm/pkg-plist (working copy) @@ -11,6 +11,7 @@ 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 @@ -21,17 +22,17 @@ 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 @@ -45,6 +46,7 @@ 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 Index: comms/opencbm-kmod/Makefile =================================================================== --- comms/opencbm-kmod/Makefile (revision 541279) +++ comms/opencbm-kmod/Makefile (working copy) @@ -5,10 +5,6 @@ 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 Index: comms/opencbm-plugin-xa1541/Makefile =================================================================== --- comms/opencbm-plugin-xa1541/Makefile (revision 541279) +++ comms/opencbm-plugin-xa1541/Makefile (working copy) @@ -5,8 +5,9 @@ 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 @@ -17,7 +18,7 @@ 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 @@ -27,7 +28,7 @@ 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 Index: comms/opencbm-plugin-xa1541/pkg-plist =================================================================== --- comms/opencbm-plugin-xa1541/pkg-plist (revision 541279) +++ comms/opencbm-plugin-xa1541/pkg-plist (working copy) @@ -2,4 +2,4 @@ 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