summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2020-07-06 17:02:32 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2020-07-06 17:02:32 +0000
commitaddfda81a9d3a22d4c6138e2718073560016782e (patch)
treee7a126a65cecd3a24a674dcf29b7a176b30c5429 /comms
parent- Update to v0.4.3-11-g5e0e6ef (diff)
Update to 0.4.99.102
PR: 247807 Submitted by: Felix Palmen <felix@palmen-it.de> (maintainer)
Notes
Notes: svn path=/head/; revision=541351
Diffstat (limited to 'comms')
-rw-r--r--comms/opencbm-kmod/Makefile4
-rw-r--r--comms/opencbm-plugin-xa1541/Makefile9
-rw-r--r--comms/opencbm-plugin-xa1541/pkg-plist2
-rw-r--r--comms/opencbm/Makefile10
-rw-r--r--comms/opencbm/Makefile.inc3
-rw-r--r--comms/opencbm/distinfo20
-rw-r--r--comms/opencbm/files/patch-fs.c11
-rw-r--r--comms/opencbm/pkg-plist8
8 files changed, 27 insertions, 40 deletions
diff --git a/comms/opencbm-kmod/Makefile b/comms/opencbm-kmod/Makefile
index e25b33ff7f1b..36ac6bbf33d9 100644
--- a/comms/opencbm-kmod/Makefile
+++ b/comms/opencbm-kmod/Makefile
@@ -5,10 +5,6 @@ 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
diff --git a/comms/opencbm-plugin-xa1541/Makefile b/comms/opencbm-plugin-xa1541/Makefile
index b74eb6c6a904..f37cd8ff2e52 100644
--- a/comms/opencbm-plugin-xa1541/Makefile
+++ b/comms/opencbm-plugin-xa1541/Makefile
@@ -5,8 +5,9 @@ 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
@@ -17,7 +18,7 @@ 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
@@ -27,7 +28,7 @@ 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
diff --git a/comms/opencbm-plugin-xa1541/pkg-plist b/comms/opencbm-plugin-xa1541/pkg-plist
index db83ee6994ce..6d5f67e322e8 100644
--- a/comms/opencbm-plugin-xa1541/pkg-plist
+++ b/comms/opencbm-plugin-xa1541/pkg-plist
@@ -2,4 +2,4 @@ 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
diff --git a/comms/opencbm/Makefile b/comms/opencbm/Makefile
index ee09d61658bc..7c88eea1ebc1 100644
--- a/comms/opencbm/Makefile
+++ b/comms/opencbm/Makefile
@@ -5,7 +5,9 @@ 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
@@ -15,7 +17,7 @@ LICENSE_COMB= multi
BUILD_DEPENDS= cc65:devel/cc65
-USES= gmake
+USES= gmake pkgconfig
USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS INFO
@@ -49,9 +51,9 @@ post-patch:
${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 \
diff --git a/comms/opencbm/Makefile.inc b/comms/opencbm/Makefile.inc
index 5dbaa7b4b81e..e94e3af1f797 100644
--- a/comms/opencbm/Makefile.inc
+++ b/comms/opencbm/Makefile.inc
@@ -1,7 +1,7 @@
# Created by: Felix Palmen <felix@palmen-it.de>
# $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 @@ PATCH_WRKSRC= ${WRKDIR}/OpenCBM-${OCBM_VERSION}
MAKE_ENV= USER_CFLAGS="${CFLAGS}"
-OCBM_LIBVERSION= 0.4.99.99
PLUGINBASENAME= ${PREFIX}/lib/opencbm/plugin/libopencbm-
diff --git a/comms/opencbm/distinfo b/comms/opencbm/distinfo
index 64672974ab6e..a869cf845066 100644
--- a/comms/opencbm/distinfo
+++ b/comms/opencbm/distinfo
@@ -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
diff --git a/comms/opencbm/files/patch-fs.c b/comms/opencbm/files/patch-fs.c
deleted file mode 100644
index 9c196c19e6a0..000000000000
--- a/comms/opencbm/files/patch-fs.c
+++ /dev/null
@@ -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; )
diff --git a/comms/opencbm/pkg-plist b/comms/opencbm/pkg-plist
index d024fa120db3..e556ce50dae8 100644
--- a/comms/opencbm/pkg-plist
+++ b/comms/opencbm/pkg-plist
@@ -11,6 +11,7 @@ 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
@@ -21,17 +22,17 @@ 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
@@ -45,6 +46,7 @@ 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-20 04:21:49 +0000