From owner-freebsd-ports@freebsd.org Tue May 7 01:03:52 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 CD01C159A6A3 for ; Tue, 7 May 2019 01:03:51 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E8216AEB7; Tue, 7 May 2019 01:03:50 +0000 (UTC) (envelope-from kob6558@gmail.com) Received: by mail-oi1-x233.google.com with SMTP id y25so4008256oih.11; Mon, 06 May 2019 18:03: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=AVN/A4899w9Raq9qxflliwxf30NLDe2nbUN51Mb4VgA=; b=SuO4iAt42ybL2g9Es2POsSeK2vrlX/Tdn3pV3pGt9Loy5mbb1H2k8+pE8zt+RZWfeY XJLIA9Fatz7deUUnUiExDFO9q00nD8Dk80fWiqHYn9dRX6WxjtBtG6fCEOTAwRzG+T6j kn29eQaKMQgH0S5lxPpm8zRltChtCKiL2lAt0F8srb2yFB38FLMZ5hhrvsAFhZEUTmax 6l5DQCfO5cVi08sLn6XAYM0NNgNrwPO++KbFqDNyvthcDakoqBoQvF7QzZbNX/vpClk6 sGhxggdt74NdkcC6/hCIfyhvcxyvdiIA/Gb5pbz+64n03+bfVKLNM3YVbnhbHZKlxBvW /Mzw== 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=AVN/A4899w9Raq9qxflliwxf30NLDe2nbUN51Mb4VgA=; b=jj+K0dRM3TtcJPqkq63Ino+VdyPuQqE9cnQOFDhheMWt1C5e3Rc9Fa8ToF7FSAhn1S WgCHZd0Q4i7CoP7ps9S5mvb63+5qer5vqn66wRfM5i1RwDagZ6graDUs5QViUi4+fyrF SrxX2BOhJg3nGmP5agMga/MyeQTcE+zWDza4nT23oMNRjKJnfaoLFgQXPGdZmJFHMbyu RXMVGdN+AEnRE+yGbJX6BME7i02Z4xtZbGdpV4EISyFvP02S5puvLv784bvd3tooO60C 4+ltip1Dzsom0HjLDUXqGDUG+pwIIlPk9TW2c5SDezOeclUG9E44upKjQtpd+xjieR5l d49g== X-Gm-Message-State: APjAAAXy1Y1VCFIhx5OE90V3QqnQCVcPELvdS7+qv0pm4q2+sBsASh1X k09A9zprCopgRLauoQLWHI2PXWTgr4rKByMoaUFRfg== X-Google-Smtp-Source: APXvYqztSuaUWvQ/Cj9sHHPo1ynPxT6UX4kxg6wmO/9pYKmupRSBZlBnRxNzyXHBphmbU5eGMlJO9vVx0U6ZyBGg7gg= X-Received: by 2002:aca:6743:: with SMTP id b3mr697113oiy.176.1557191029281; Mon, 06 May 2019 18:03:49 -0700 (PDT) MIME-Version: 1.0 References: <20190408015157.GE6019@over-yonder.net> <20190506181756.GK44790@rancor.immure.com> In-Reply-To: <20190506181756.GK44790@rancor.immure.com> From: Kevin Oberman Date: Mon, 6 May 2019 18:03:32 -0700 Message-ID: Subject: Re: portupgrade + FLAVORS To: Bob Willcox Cc: "Matthew D. Fuller" , FreeBSD Ports ML , Stefan Esser X-Rspamd-Queue-Id: 7E8216AEB7 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=SuO4iAt4; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of kob6558@gmail.com designates 2607:f8b0:4864:20::233 as permitted sender) smtp.mailfrom=kob6558@gmail.com X-Spamd-Result: default: False [-6.60 / 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)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_TLS_LAST(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; DWL_DNSWL_NONE(0.00)[gmail.com.dwl.dnswl.org : 127.0.5.0]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[3.3.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; IP_SCORE(-2.93)[ip: (-9.12), ipnet: 2607:f8b0::/32(-3.21), asn: 15169(-2.25), country: US(-0.06)]; FORGED_SENDER(0.30)[rkoberman@gmail.com,kob6558@gmail.com]; MIME_TRACE(0.00)[0:+,1:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[rkoberman@gmail.com,kob6558@gmail.com]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Tue, 07 May 2019 01:03:52 -0000 Looks like the maintainer should be on the CC, so I added Stefan. -- Kevin Oberman, Part time kid herder and retired Network Engineer E-mail: rkoberman@gmail.com PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 On Mon, May 6, 2019 at 11:35 AM Bob Willcox wrote: > On Sun, Apr 07, 2019 at 08:51:57PM -0500, 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. > > > > I haven't done any testing of using portupgrade with pre-built > > packages (is there even any reason to post-pkg?), or using portinstall > > (never saw the point), but it seems to handle the upgrading path just > > fine. > > > > > > Also sitting in a PR upstream at > > https://github.com/freebsd/portupgrade/pull/72 > > > > > > -- > > Matthew Fuller (MF4839) | fullermd@over-yonder.net > > Systems/Network Administrator | http://www.over-yonder.net/~fullermd/ > > On the Internet, nobody can hear you scream. > > > --- bin/portupgrade.orig 2018-03-09 18:59:29 UTC > > +++ bin/portupgrade > > @@ -1147,6 +1147,11 @@ def get_make_args(origin, pkgname = nil) > > else > > args = $make_args.split(' ') > > end > > + > > + if flavor = origin[/@(.+)$/, 1] > > + args << 'FLAVOR=' + flavor > > + end > > + > > quoted = 0 > > n = 0 > > is_quoted = false > > --- lib/pkgtools/pkgdb.rb.orig 2018-03-09 18:59:29 UTC > > +++ lib/pkgtools/pkgdb.rb > > @@ -425,10 +425,20 @@ class PkgDB > > @installed_pkgs = [] > > @installed_ports = [] > > @db = {} > > + > > + flavors = {} > > + pkg_flavors = xbackquote(PkgDB::command(:pkg), 'annotate', '-Sa', > > + 'flavor').split("\n") > > + pkg_flavors.each do |line| > > + pkg, flavor = line.sub(/: Tag: flavor Value: /, ':').split(':') > > + flavors[pkg] = flavor > > + end > > + > > pkg_origins = xbackquote(PkgDB::command(:pkg), 'query', '%n-%v > %o').split("\n") > > pkg_origins.each do |line| > > pkg, origin = line.split(' ') > > @installed_pkgs << pkg > > + origin << '@' + flavors[pkg] if flavors[pkg] > > add_origin(pkg, origin) > > end > > @installed_pkgs.freeze > > --- lib/pkgtools/portsdb.rb.orig 2018-03-09 18:59:29 UTC > > +++ lib/pkgtools/portsdb.rb > > @@ -325,6 +325,7 @@ class PortsDB > > end > > > > def portdir(port) > > + port = port.sub(/@.*$/, '') > > File.join(ports_dir, port) > > end > > > > > _______________________________________________ > > freebsd-ports@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-ports > > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" > > Hi Mathew, > > Thanks for the flavors patch to portupgrade. As with some others here it is > still my preferred tool for keeping my ports up-to-date. > > Any word on when/if your patch will be integraded into the port proper? > > Thanks again, > Bob > > > -- > Bob Willcox | "The only way to get rid of temptation is to yield to > it... > bob@immure.com | I can resist everything but temptation." > Austin, TX | - Oscar Wilde > _______________________________________________ > freebsd-ports@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" >