5 files changed, 16 insertions, 52 deletions

diff --git a/comms/opencbm/Makefile b/comms/opencbm/Makefile
index 7cfb85f1c072..3ff32d5e8901 100644
--- a/comms/opencbm/Makefile
+++ b/comms/opencbm/Makefile
@@ -2,10 +2,6 @@ PORTNAME=	opencbm
 PORTVERSION=	${OCBM_VERSION}
 CATEGORIES=	comms archivers
 
-PATCHFILES=	077611e1ec27b52081c45c1702ff3812233fdd5e.diff \
-		dfa9dd172e2843a661cdb6cdba09d1c6c2c1b35e.diff \
-		a5fb83548b0ed54372d7615118c8ec9ba338bb9b.diff
-
 MAINTAINER=	zirias@FreeBSD.org
 COMMENT=	Commodore CBM serial IEC/IEEE-488 bus utilities
 
@@ -20,9 +16,6 @@ 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
 
diff --git a/comms/opencbm/Makefile.inc b/comms/opencbm/Makefile.inc
index 27d6041c5561..e4bf962ae8d8 100644
--- a/comms/opencbm/Makefile.inc
+++ b/comms/opencbm/Makefile.inc
@@ -1,18 +1,19 @@
-OCBM_VERSION=	0.4.99.102
+OCBM_VERSION=	0.4.99.104
 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}
-
+MAKEFILE?=	LINUX/Makefile
+MAKE_ARGS=	CC="${CC}" \
+		INFODIR=${PREFIX}/${INFO_PATH} \
+		SUBDIRS_PLUGIN_XA1541=opencbm/lib/plugin/xa1541
 MAKE_ENV=	USER_CFLAGS="${CFLAGS}"
 
+PLIST_SUB=	OCBM_VERSION=${OCBM_VERSION}
+
+PORTSCOUT=	limit:\d\.\d
+
 PLUGINBASENAME=	${PREFIX}/lib/opencbm/plugin/libopencbm-
diff --git a/comms/opencbm/distinfo b/comms/opencbm/distinfo
index a869cf845066..de74d4f37816 100644
--- a/comms/opencbm/distinfo
+++ b/comms/opencbm/distinfo
@@ -1,9 +1,3 @@
-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
+TIMESTAMP = 1657617946
+SHA256 (OpenCBM-OpenCBM-v0.4.99.104_GH0.tar.gz) = 5499cd1143b4a246d6d7e93b94efbdf31fda0269d939d227ee5bcc0406b5056a
+SIZE (OpenCBM-OpenCBM-v0.4.99.104_GH0.tar.gz) = 13415998
diff --git a/comms/opencbm/files/patch-opencbm_sys_freebsd_opencbm.c b/comms/opencbm/files/patch-opencbm_sys_freebsd_opencbm.c
deleted file mode 100644
index 4495b8f9e936..000000000000
--- a/comms/opencbm/files/patch-opencbm_sys_freebsd_opencbm.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- opencbm/sys/freebsd/opencbm.c.orig	2022-05-13 16:48:06 UTC
-+++ opencbm/sys/freebsd/opencbm.c
-@@ -133,8 +133,6 @@ static struct cdevsw cbm_cdevsw = {
-     .d_name = CBM_NAME
- };
- 
--static devclass_t cbm_devclass;
--
- /* forward references for parallel burst routines */
- int cbm_parallel_burst_read_track(struct cbm_data *sc, device_t ppbus,
-         unsigned char *buffer);
-@@ -930,7 +928,13 @@ static driver_t cbm_driver = {
-     sizeof(struct cbm_data)
- };
- 
-+#if __FreeBSD_version >= 1400058
-+DRIVER_MODULE(cbm, ppbus, cbm_driver, 0, 0);
-+#else
-+static devclass_t cbm_devclass;
-+
- DRIVER_MODULE(cbm, ppbus, cbm_driver, cbm_devclass, 0, 0);
-+#endif
- MODULE_DEPEND(cbm, ppbus, 1, 1, 1);
- 
- /*
diff --git a/comms/opencbm/pkg-plist b/comms/opencbm/pkg-plist
index e556ce50dae8..8644b778bc35 100644
--- a/comms/opencbm/pkg-plist
+++ b/comms/opencbm/pkg-plist
@@ -22,17 +22,17 @@ include/opencbm.h
 lib/libopencbm.a
 lib/libopencbm.so
 lib/libopencbm.so.0
-lib/libopencbm.so.0.4.99.102
+lib/libopencbm.so.%%OCBM_VERSION%%
 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.102
+lib/opencbm/plugin/libopencbm-xu1541.so.%%OCBM_VERSION%%
 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.102
+lib/opencbm/plugin/libopencbm-xum1541.so.%%OCBM_VERSION%%
 man/man1/cbmcopy.1.gz
 man/man1/cbmctrl.1.gz
 man/man1/cbmformat.1.gz
@@ -79,6 +79,7 @@ sbin/opencbm_plugin_helper_tools
 %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-34.html
 %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-35.html
 %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-36.html
+%%PORTDOCS%%%%DOCSDIR%%/html/opencbm-37.html
 %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-4.html
 %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-5.html
 %%PORTDOCS%%%%DOCSDIR%%/html/opencbm-6.html