Skip to content

Commit

Permalink
comms/opencbm-plugin-xa1541: Fix run depends
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Zirias committed Nov 5, 2023
1 parent 71d020c commit 131067d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 2 additions & 2 deletions comms/opencbm-plugin-xa1541/Makefile
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion comms/opencbm/Makefile
@@ -1,6 +1,5 @@
PORTNAME= opencbm
PORTVERSION= ${OCBM_VERSION}
PORTREVISION= 1
CATEGORIES= comms archivers

MAINTAINER= zirias@FreeBSD.org
Expand Down
9 changes: 9 additions & 0 deletions comms/opencbm/Makefile.inc
@@ -1,4 +1,5 @@
OCBM_VERSION= 0.4.99.104
OCBM_REVISION= 1
DISTVERSIONPREFIX= v
DISTINFO_FILE= ${.CURDIR}/../opencbm/distinfo

Expand All @@ -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

0 comments on commit 131067d

Please sign in to comment.