Date: Sun, 5 Nov 2023 12:31:15 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 131067d9a214 - main - comms/opencbm-plugin-xa1541: Fix run depends Message-ID: <202311051231.3A5CVFju035526@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=131067d9a214456d10e3267225812f0906ab1d4c commit 131067d9a214456d10e3267225812f0906ab1d4c Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2023-11-05 11:09:01 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2023-11-05 12:30:23 +0000 comms/opencbm-plugin-xa1541: Fix run depends The XA1541 plugin must depend on the exact same version of opencbm base. * Make sure both ports use the same PORTREVISION by defining it in comms/opencbm/Makefile.inc and enforcing no explicit definition in the port Makefiles. * Use PKGVERSION instead of PORTVERSION to construct the dependency. Reported by: pkg-fallout --- comms/opencbm-plugin-xa1541/Makefile | 4 ++-- comms/opencbm/Makefile | 1 - comms/opencbm/Makefile.inc | 9 +++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/comms/opencbm-plugin-xa1541/Makefile b/comms/opencbm-plugin-xa1541/Makefile index 3d9e312c77af..fddd313b1467 100644 --- a/comms/opencbm-plugin-xa1541/Makefile +++ b/comms/opencbm-plugin-xa1541/Makefile @@ -9,8 +9,8 @@ WWW= http://opencbm.sourceforge.net/ LICENSE= GPLv2 BUILD_DEPENDS= cc65:devel/cc65 -RUN_DEPENDS= opencbm=${PORTVERSION}:comms/opencbm \ - opencbm-kmod=${PORTVERSION}:comms/opencbm-kmod +RUN_DEPENDS= opencbm=${PKGVERSION}:comms/opencbm \ + opencbm-kmod>0:comms/opencbm-kmod USES= gmake pkgconfig USE_LDCONFIG= yes diff --git a/comms/opencbm/Makefile b/comms/opencbm/Makefile index 60a41c46b2fe..d01d86da4815 100644 --- a/comms/opencbm/Makefile +++ b/comms/opencbm/Makefile @@ -1,6 +1,5 @@ PORTNAME= opencbm PORTVERSION= ${OCBM_VERSION} -PORTREVISION= 1 CATEGORIES= comms archivers MAINTAINER= zirias@FreeBSD.org diff --git a/comms/opencbm/Makefile.inc b/comms/opencbm/Makefile.inc index 14ead178951d..a4d863c37667 100644 --- a/comms/opencbm/Makefile.inc +++ b/comms/opencbm/Makefile.inc @@ -1,4 +1,5 @@ OCBM_VERSION= 0.4.99.104 +OCBM_REVISION= 1 DISTVERSIONPREFIX= v DISTINFO_FILE= ${.CURDIR}/../opencbm/distinfo @@ -17,3 +18,11 @@ PLIST_SUB= OCBM_VERSION=${OCBM_VERSION} PORTSCOUT= limit:^v\d PLUGINBASENAME= ${PREFIX}/lib/opencbm/plugin/libopencbm- + +.if ${PORTNAME:Nopencbm-kmod} +. if defined(PORTREVISION) +IGNORE= PORTREVISION must not be defined explicitly +. else +PORTREVISION= ${OCBM_REVISION} +. endif +.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311051231.3A5CVFju035526>