From owner-freebsd-ports@freebsd.org Mon Apr 8 16:56:51 2019 Return-Path: Delivered-To: freebsd-ports@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CEE09155FA37 for ; Mon, 8 Apr 2019 16:56:51 +0000 (UTC) (envelope-from tingox@gmail.com) Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A75EF813AE for ; Mon, 8 Apr 2019 16:56:50 +0000 (UTC) (envelope-from tingox@gmail.com) Received: by mail-wr1-x42a.google.com with SMTP id h4so17263403wre.7 for ; Mon, 08 Apr 2019 09:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xtb6sdzpQ6St9J+vsiF/joxpaq6LaoisKxbz/EhZQK4=; b=TGhnoWqnu/y1CgyVl/JIM+APb85bI+KCNbGPtxPEn/DVPgRZZe0M3+Q73WJuHaWTGK NW5ZUq3OhCXt5FmmVTrLo8d8XHdXAiBIznsiQvq0L9vO3hdcq8i5UKDPAGtQ8DixHwsq QzYnsUU9wN9FlLKVmILlk8L43DRtrbmnD/twEB0MwKsRcD1gH9H1BenPQxgDNK2erhKu HFRa81jHiC9hoIpvwrV1iti0uiyis23e8ldirJcCHTqEZQ8XDd5eQPeBLTXgW9vQMkto A7zFZ/1fr8/FNrQmyUJeLccZWyWbfji1tsrV4INt4VBjKxWXJd4urnJ6mMQsuhLsWz+d j8Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xtb6sdzpQ6St9J+vsiF/joxpaq6LaoisKxbz/EhZQK4=; b=aU7zmS3gieW8TPa0hBmJGTqSsFPYZTQmbzRq+fNO+56XKk3LjSOt9lsptrUUJF76hf IgOHK+8OE1Rsx5CHXFxyEZ9lRGPRu5QI4Yt51jX7YmBibv89Twn/JZMH9+0LIzRca6TY pxWLEyxRZQvpA9iNHyXjMXqSZ8eJkdithbfJEkQoQZxwT1I6g5VYmZNKfjnatVHyqHjO BOPCmb6fIiPKDLJsyeNnEhXQUPwNplBzC4fTsT4zsHDAtOkdkEs6Ve+mBqFVUG2+fbdU fJJf5ylV0eaU1WaGLbdGiR6x7v8i3TjrVl2PamVpw44iKIXhnZytXRzQb83ZwUe8miNs 92VQ== X-Gm-Message-State: APjAAAWc3jATsjb4gOz64iHcr42o0p2XYBnr+6kt3O607kVV+LKGWZFp DiHKV7Mo5N8qNgkZ9nnIYBIjmEyOPveUZC4hm9lHRa+x X-Google-Smtp-Source: APXvYqytFR36BiWIyP/g80bjYTImTsOMDgglG00/BCutIhhoIckP0YNoIlk65xcd22p0LCodV6amF8D+D2n5pzae4wo= X-Received: by 2002:adf:ea0b:: with SMTP id q11mr1304416wrm.233.1554742609423; Mon, 08 Apr 2019 09:56:49 -0700 (PDT) MIME-Version: 1.0 References: <20190408015157.GE6019@over-yonder.net> In-Reply-To: <20190408015157.GE6019@over-yonder.net> From: Torfinn Ingolfsen Date: Mon, 8 Apr 2019 18:56:37 +0200 Message-ID: Subject: Re: portupgrade + FLAVORS To: "Matthew D. Fuller" Cc: FreeBSD Ports ML Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: A75EF813AE X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=TGhnoWqn; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of tingox@gmail.com designates 2a00:1450:4864:20::42a as permitted sender) smtp.mailfrom=tingox@gmail.com X-Spamd-Result: default: False [-6.84 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-ports@freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[a.2.4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.5.4.1.0.0.a.2.list.dnswl.org : 127.0.5.0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; IP_SCORE(-2.87)[ip: (-9.72), ipnet: 2a00:1450::/32(-2.38), asn: 15169(-2.18), country: US(-0.06)]; DWL_DNSWL_NONE(0.00)[gmail.com.dwl.dnswl.org : 127.0.5.0] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 16:56:52 -0000 Hello, On Mon, Apr 8, 2019 at 3:53 AM Matthew D. Fuller 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