On Thu, May 24, 2018 at 10:53:45PM +0200, Rafael Sadowski wrote:
> On Sun May 20, 2018 at 10:40:18AM +0200, Rafael Sadowski wrote:
> > espie@ and some others have let me know that the bulk is not stable
> > because the bulk needs both qwt flavors.
> >
> > With many ideas and help from espie@ you will find below a first attempt.
> > All comsumers need a little tweak to find the correct qwt:
> >
> > - geo/qgis
> > - security/ophcrack
> > - x11/kde4/plasma-addons
> > - x11/kde4/smokeqt
> >
> > If you like it could you test that in an bulk?
> >
> > Ok? Comments?
> >
>
> I run into the following issue: "@conflict qwt-<=6.3.1"
>
> Example #1 only works WITHOUT "@conflict qwt-<=6.3.1" in PLIST-common
>
> cd x11/qwt && make install && env FLAVOR=qt5 make install
>
> With "@conflict qwt-<=6.3.1" it I run into:
There's your problem... a silly typo :) we're talking about 6.1.3, not
6.3.1..
On top of your diff, i did the following changes:
- set REVISION=0 in Makefile, not only REVISION-main (unsure?)
- set no-default-conflict on PLIST-common too (unsure?), and the correct
@conflict version:
$head -3 pkg/PLIST-common
@comment $OpenBSD: $
@option no-default-conflict
@conflict qwt-<6.1.3p0
- move the @pkgpath annotations from PLIST-common to the correct
fragment: we want x11/qwt to upgrade to x11/qwt,-main, not x11/qwt,-common,
same thing for qt5 FLAVOR
$head pkg/PFRAG.*
==> pkg/PFRAG.no-qt5-main <==
@comment $OpenBSD: $
@conflict qwt-*-!qt5
@pkgpath x11/qwt
@lib lib/libqwt${QTLIBSUFFIX}.so.${LIBqwt_VERSION}
==> pkg/PFRAG.qt5-main <==
@comment $OpenBSD: $
@conflict qwt-*-qt5
@pkgpath x11/qwt,qt5
@lib lib/libqwt${QTLIBSUFFIX}.so.${LIBqwt-qt5_VERSION}
with this, both can be installed without conflicts, testing upgrade path
works:
$doas pkg_add qwt
Ambiguous: choose package for qwt
a 0: <None>
1: qwt-6.1.3
2: qwt-6.1.3-qt5
Your choice: 1
qwt-6.1.3: ok
$doas env PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -Dunsigned -u qwt
qwt-6.1.3->qwt-6.1.3p0+qwt-common-6.1.3p0: ok
$doas pkg_delete qwt-common qwt
$doas pkg_add qwt
Ambiguous: choose package for qwt
a 0: <None>
1: qwt-6.1.3
2: qwt-6.1.3-qt5
Your choice: 2
qwt-6.1.3-qt5: ok
$doas env PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -Dunsigned -u
qwt-6.1.3-qt5
qwt-6.1.3-qt5->qwt-6.1.3p0-qt5+qwt-common-6.1.3p0: ok
