Date: Mon, 8 Apr 2019 18:56:37 +0200 From: Torfinn Ingolfsen <tingox@gmail.com> To: "Matthew D. Fuller" <fullermd@over-yonder.net> Cc: FreeBSD Ports ML <freebsd-ports@freebsd.org> Subject: Re: portupgrade + FLAVORS Message-ID: <CAJ_iqtbFf5fh3XSguGpaQEBG71AnobLCbOjANFK8%2Bh24D0ysJQ@mail.gmail.com> In-Reply-To: <20190408015157.GE6019@over-yonder.net> References: <20190408015157.GE6019@over-yonder.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Hello, On Mon, Apr 8, 2019 at 3:53 AM Matthew D. Fuller <fullermd@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@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@kg-core1.kg4.no:/usr/obj/usr/src/sys/GENERIC amd64 HTH, HAND -- Regards, Torfinn Ingolfsen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ_iqtbFf5fh3XSguGpaQEBG71AnobLCbOjANFK8%2Bh24D0ysJQ>