From nobody Sun Nov 05 12:31:15 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SNYkC3Q4Tz4yt8g; Sun, 5 Nov 2023 12:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNYkC2y1wz3fRX; Sun, 5 Nov 2023 12:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699187475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oiIwGPJ87RIaiWQHwFlvWz3XxAa/aLBMjSVMYfBvLhc=; b=nITLTGUyr8Wc5Mc4AnBo10Wmu6vhSlB567uImvf002iWgyejK5BYzUycpPaJpq/u0wTmMS YLHQbiNE8wH15k18jV7zZoEWCC0BYDdQsOjZVQW2h8Ah8Xg09wG3uJbOP6wThiN+a/VFdA OzC3kO2kfJjb4REwwUnvTqgToPm/qhc0VYx1h3GBcaCEwjyGFGRmnhn8YNa0OLlsalfMWq n8MZaEQXssRhB4gcgxzuTsKpKb9pRf9Ca2evYuTRqTVXdgz4CbuoIoHBFJJetJKxYxgCq3 VnsBy17cOR1M08EWu6mdI7+DZ7prH1Gf0axwrcc4RpZ+OLWlLgQuu2OiGpPvog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699187475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oiIwGPJ87RIaiWQHwFlvWz3XxAa/aLBMjSVMYfBvLhc=; b=aoLNyEmTMvlqqB2LsNHwXapUn9AY7npW+GDZ8ZXxK2A3p07+EqzIrxZ99nWvepRzcOJHmN wq4xccpG+lyj5sW6atN7/ru8rNd8INxq8dlI5eTRImutGB/+2n1CoD+6mz9Fqmsib67lg7 nqGQdgVCFrh7aXANEmYZhBrDIxs5Ni4hN/SC0jpu84JufdiDIj02ub0JzoAWW/PN7gfXgp el9/UZwEGenzumhCSnaCzClKIMmRlws67SlAlwtc9grBRrlFWkbCQQdN1QvzZf69eI+NcZ gQkwGrp9y0UBzdGu/psoenh4tGN6P8FZ5p/uPFFXFhusWZ924nTSV8MVGfofrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699187475; a=rsa-sha256; cv=none; b=sRv0oZzGZzhf1gsPEmgU0ZAUzl5GhLdZUfaBpZO1sSWTb+YMpRQ7431na9PJKXiZjZjzK5 Tni8EtbZbYZe5+hoT2rhGwt/9vb0Ml7JhH2GUs1miSKzbRAOPexyzwhD81Acx2OjfJ/xNf NlYBo3Urou8x6CSiqn4tTMrZ4O152/qJFtL9cgpg5M9seN2kb/5bJiHs0hHi7/IQDgSprD mddrHqmlIIzzwMfkERpnzfGxKaGmZ1uqHhLaca3ecoQFfPcNq93Rorugbs2uuM2KkOgKiP Cvq+DJZgU4gq81kWfkQim13E/puuoC08TQZVyUAsW4AE0PCpSv1kVTNGCHr/rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SNYkC1hrkz8w6; Sun, 5 Nov 2023 12:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A5CVFSB035529; Sun, 5 Nov 2023 12:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A5CVFju035526; Sun, 5 Nov 2023 12:31:15 GMT (envelope-from git) Date: Sun, 5 Nov 2023 12:31:15 GMT Message-Id: <202311051231.3A5CVFju035526@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 131067d9a214 - main - comms/opencbm-plugin-xa1541: Fix run depends List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 131067d9a214456d10e3267225812f0906ab1d4c Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=131067d9a214456d10e3267225812f0906ab1d4c commit 131067d9a214456d10e3267225812f0906ab1d4c Author: Felix Palmen AuthorDate: 2023-11-05 11:09:01 +0000 Commit: Felix Palmen 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