From owner-freebsd-ports@freebsd.org Tue May 7 12:27:32 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 33D5C1584971 for ; Tue, 7 May 2019 12:27:32 +0000 (UTC) (envelope-from bob@rancor.immure.com) Received: from rancor.immure.com (108-84-10-9.lightspeed.austtx.sbcglobal.net [108.84.10.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "darth.immure.com", Issuer "darth.immure.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 41CBF87502; Tue, 7 May 2019 12:27:31 +0000 (UTC) (envelope-from bob@rancor.immure.com) Received: from rancor.immure.com (localhost [127.0.0.1]) by rancor.immure.com (8.15.2/8.15.2) with ESMTPS id x47CRHGi088919 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 7 May 2019 07:27:17 -0500 (CDT) (envelope-from bob@rancor.immure.com) Received: (from bob@localhost) by rancor.immure.com (8.15.2/8.15.2/Submit) id x47CRGA8088918; Tue, 7 May 2019 07:27:16 -0500 (CDT) (envelope-from bob) Date: Tue, 7 May 2019 07:27:16 -0500 From: Bob Willcox To: Kevin Oberman Cc: "Matthew D. Fuller" , FreeBSD Ports ML , Stefan Esser , bdrewery@freebsd.org Subject: Re: portupgrade + FLAVORS Message-ID: <20190507122716.GS3392@rancor.immure.com> Reply-To: Bob Willcox References: <20190408015157.GE6019@over-yonder.net> <20190506181756.GK44790@rancor.immure.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Queue-Id: 41CBF87502 X-Spamd-Bar: ++++ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [4.27 / 15.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[bob@immure.com]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MX_INVALID(0.50)[cached]; NEURAL_SPAM_SHORT(0.69)[0.689,0]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[immure.com]; AUTH_NA(1.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_MEDIUM(0.77)[0.768,0]; NEURAL_SPAM_LONG(1.00)[0.995,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[bob@immure.com,bob@rancor.immure.com]; FREEMAIL_TO(0.00)[gmail.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:7018, ipnet:108.64.0.0/11, country:US]; FROM_NEQ_ENVFROM(0.00)[bob@immure.com,bob@rancor.immure.com]; IP_SCORE(0.11)[ip: (0.36), ipnet: 108.64.0.0/11(0.18), asn: 7018(0.09), country: US(-0.06)] 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 12:27:32 -0000 Yeah, bdrewery is listed as the maintainer of portupgrade in its Makefile. On Mon, May 06, 2019 at 06:05:24PM -0700, Kevin Oberman wrote: > Oops. Disregard. Confusing portupgrade with portmaster. > -- > Kevin Oberman, Part time kid herder and retired Network Engineer > E-mail: rkoberman@gmail.com > PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683 > > > On Mon, May 6, 2019 at 6:03 PM Kevin Oberman wrote: > > > 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" > >> > > -- 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