portupgrade + FLAVORS

[Torfinn Ingolfsen]

Hello,

On Mon, Apr 8, 2019 at 3:53 AM Matthew D. Fuller
<fullermd at over-yonder.net> wrote:
>
> For any portupgrade users still out there wishing for FLAVOR support,
> I have patches to add it.  I've been running them here locally for a
> few weeks without incident (apart from an extra upgrade or two
> actually working without manual intervention/resort to portmaster,
> that is).  Dropping the attached patch into
> $PORTS/ports-mgmt/portupgrade/files/patch-flavors and rebuilding it is
> a simple shortcut to getting it in place.

It doesn't apply cleanly to portupgrade in an up to date ports tree
root at kg-core1# make
===>  License BSD3CLAUSE accepted by the user
===>   portupgrade-2.4.16,2 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by portupgrade-2.4.16,2 for building
===>  Extracting for portupgrade-2.4.16,2
=> SHA256 Checksum OK for portupgrade/freebsd-portupgrade-2.4.16_GH0.tar.gz.
===>   portupgrade-2.4.16,2 depends on file: /usr/local/bin/ruby24 - found
===>  Patching for portupgrade-2.4.16,2
===>   portupgrade-2.4.16,2 depends on file: /usr/local/bin/ruby24 - found
===>  Applying FreeBSD patches for portupgrade-2.4.16,2
1 out of 1 hunks failed--saving rejects to bin/portupgrade.rej
1 out of 1 hunks failed--saving rejects to lib/pkgtools/pkgdb.rb.rej
1 out of 1 hunks failed--saving rejects to lib/pkgtools/portsdb.rb.rej
=> FreeBSD patch patch-flavors failed to apply cleanly.
*** Error code 1

Stop.
make[1]: stopped in /usr/ports/ports-mgmt/portupgrade
*** Error code 1

Stop.
make: stopped in /usr/ports/ports-mgmt/portupgrade

This on
FreeBSD kg-core1.kg4.no 11.2-STABLE FreeBSD 11.2-STABLE #0 r342545:
Thu Dec 27 00:29:46 CET 2018
root at kg-core1.kg4.no:/usr/obj/usr/src/sys/GENERIC  amd64

HTH, HAND
-- 
Regards,
Torfinn Ingolfsen