On 2019/07/02 18:44, Juan Francisco Cantero Hurtado wrote: > On Tue, Jul 02, 2019 at 05:48:12PM +0300, [email protected] wrote: > > Hi! > > > > Today is my upgrade day, so I traditionally run `pkg_add -u`, but this > > time I get a really weird output: > > Ambiguous: choose package for irssi-1.2.0 > > a 0: <None> > > 1: irssi-1.2.1p0 > > 2: irssi-1.2.1p0-socks > > Your choice: > > > > All other packages, including mupdf, upgraded with expeted output: > > mupdf-1.14.0p2->1.15.0: ok > > That's not weird. Don't worry. > > If you're not using the "socks" flavor, then select 1. If you want to > avoid that kind of question in the future, run pkg_add -Iu. > > > -- > Juan Francisco Cantero Hurtado http://juanfra.info >
Actually it is a bug in the port, the @pkgpath line should be adapted depending on the flavour. kn: OK? Index: Makefile =================================================================== RCS file: /cvs/ports/net/irssi/Makefile,v retrieving revision 1.84 diff -u -p -r1.84 Makefile --- Makefile 1 Jul 2019 13:52:09 -0000 1.84 +++ Makefile 2 Jul 2019 16:52:14 -0000 @@ -10,7 +10,7 @@ DISTNAME = irssi-$V PKGSPEC = irssi-=$V PKGNAME-main = irssi-$V -REVISION-main = 0 +REVISION-main = 1 REVISION-otr = 0 # -otr module doesn't vary between FLAVORs; override default FLAVOR suffix @@ -33,6 +33,8 @@ MASTER_SITES = https://github.com/irssi/ FLAVORS = socks FLAVOR ?= +FLAVOR_STRING = ${FLAVOR_EXT:S/-/,/g} +SUBST_VARS = FLAVOR_STRING LIB_DEPENDS = devel/glib2>=2.28.0 Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/net/irssi/pkg/PLIST-main,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-main --- pkg/PLIST-main 29 Jun 2019 14:54:09 -0000 1.1 +++ pkg/PLIST-main 2 Jul 2019 16:52:14 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST-main,v 1.1 2019/06/29 14:54:09 tj Exp $ -@pkgpath net/irssi +@pkgpath net/irssi${FLAVOR_STRING} @bin bin/irssi include/irssi/ include/irssi/irssi-config
