From nobody@FreeBSD.org  Wed Sep  4 14:33:27 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id A2AEDEF5
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  4 Sep 2013 14:33:27 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 909A92842
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  4 Sep 2013 14:33:27 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r84EXR2B079543
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 4 Sep 2013 14:33:27 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r84EXRN2079539;
	Wed, 4 Sep 2013 14:33:27 GMT
	(envelope-from nobody)
Message-Id: <201309041433.r84EXRN2079539@oldred.freebsd.org>
Date: Wed, 4 Sep 2013 14:33:27 GMT
From: Takanori Saneto <sanewo@ba2.so-net.ne.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: portupgrade misbehave with pkg-devel
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         181813
>Category:       ports
>Synopsis:       ports-mgmt/portupgrade misbehave with pkg-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bdrewery
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 04 14:40:01 UTC 2013
>Closed-Date:    Wed Sep 18 19:20:03 CDT 2013
>Last-Modified:  Tue Dec 24 14:20:01 UTC 2013
>Originator:     Takanori Saneto
>Release:        10.0-CURRENT
>Organization:
an individual
>Environment:
FreeBSD muse 10.0-CURRENT FreeBSD 10.0-CURRENT #1243 r255108M: Sun Sep  1 22:55:29 JST 2013     root@muse:/usr/obj/usr/src/sys/MUSE  i386

>Description:
When ports-mgmt/pkg-devel is installed instead of ports-mgmt/pkg, portupgrade can't detect pkgng being used.

>How-To-Repeat:
install pkg-devel instead of pkg.
run any portupdate command.

>Fix:
Following patch should fix the problem.

--- lib/pkgtools/pkgdb.rb.orig       2013-07-19 11:43:32.000000000 +0900
+++ lib/pkgtools/pkgdb.rb            2013-09-04 10:35:04.000000000 +0900
@@ -126,7 +126,7 @@
     if @with_pkgng.nil?
       @with_pkgng = `env TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 \
        PACKAGESITE=file:///nonexistent \
-       pkg info pkg >/dev/null 2>&1 && echo yes`.chomp != ""
+       pkg info -x 'pkg(-devel)?' >/dev/null 2>&1 && echo yes`.chomp != ""
       @with_pkgng = false unless @with_pkgng
       @pkgng_origin = $portsdb.make_var('PKGNG_ORIGIN')
       #STDERR.puts "USING PKGNG[#{@pkgng_origin}]" if @with_pkgng


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->bdrewery 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Sep 9 00:47:55 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181813 

From: Bryan Drewery <bdrewery@FreeBSD.org>
To: bug-followup@FreeBSD.org, sanewo@ba2.so-net.ne.jp
Cc:  
Subject: Re: ports/181813: ports-mgmt/portupgrade misbehave with pkg-devel
Date: Sun, 08 Sep 2013 20:02:10 -0500

 Good catch. I will commit it tomorrow.
 -- 
 Regards,
 Bryan Drewery

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181813: commit references a PR
Date: Sat, 14 Sep 2013 12:32:21 +0000 (UTC)

 Author: bdrewery
 Date: Sat Sep 14 12:32:14 2013
 New Revision: 327279
 URL: http://svnweb.freebsd.org/changeset/ports/327279
 
 Log:
   - Update to 3.17.2
   
   Changes:
    - Fix detection of pkg-devel
   
   PR:		ports/181813 [1]
   Reported by:	Takanori Saneto <sanewo@ba2.so-net.ne.jp> [1], eadler
 
 Modified:
   head/ports-mgmt/portmaster/Makefile
   head/ports-mgmt/portmaster/distinfo
 
 Modified: head/ports-mgmt/portmaster/Makefile
 ==============================================================================
 --- head/ports-mgmt/portmaster/Makefile	Sat Sep 14 12:04:18 2013	(r327278)
 +++ head/ports-mgmt/portmaster/Makefile	Sat Sep 14 12:32:14 2013	(r327279)
 @@ -1,7 +1,7 @@
  # $FreeBSD$
  
  PORTNAME=	portmaster
 -PORTVERSION=	3.17.1
 +PORTVERSION=	3.17.2
  CATEGORIES=	ports-mgmt
  MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
    		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 @@ -15,7 +15,7 @@ LICENSE=	BSD
  
  USE_GITHUB=	yes
  GH_ACCOUNT=	freebsd
 -GH_COMMIT=	2daa6d5
 +GH_COMMIT=	7359019
  GH_TAGNAME=	${GH_COMMIT}
  
  OPTIONS_DEFINE=	BASH ZSH
 
 Modified: head/ports-mgmt/portmaster/distinfo
 ==============================================================================
 --- head/ports-mgmt/portmaster/distinfo	Sat Sep 14 12:04:18 2013	(r327278)
 +++ head/ports-mgmt/portmaster/distinfo	Sat Sep 14 12:32:14 2013	(r327279)
 @@ -1,2 +1,2 @@
 -SHA256 (g-freebsd-portmaster-3.17.1-2daa6d5.tar.gz) = 21d96aa1e0533ca68aac8bdde89672830543f843f05b3cb9c8d08f0e8f146bd2
 -SIZE (g-freebsd-portmaster-3.17.1-2daa6d5.tar.gz) = 44587
 +SHA256 (g-freebsd-portmaster-3.17.2-7359019.tar.gz) = 481dca8236438666ebae213c6f3576d5fd7cfb9530997f25a40c3b124e652115
 +SIZE (g-freebsd-portmaster-3.17.2-7359019.tar.gz) = 44616
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181813: commit references a PR
Date: Tue, 17 Sep 2013 01:10:27 +0000 (UTC)

 Author: bdrewery
 Date: Tue Sep 17 01:10:19 2013
 New Revision: 327448
 URL: http://svnweb.freebsd.org/changeset/ports/327448
 
 Log:
   - Update to checkin e4a515a
   
   Changes:
     - Fix pkgng detection when using pkg-devel [1]
     - Try to fix stack overflow issue with Ruby 1.9 and large installs [2]
   
   PR:		ports/181813 [1]
   Reported by:	Takanori Saneto <sanewo@ba2.so-net.ne.jp> [1]
   Reported by:	many [2]
 
 Modified:
   head/ports-mgmt/portupgrade-devel/Makefile
   head/ports-mgmt/portupgrade-devel/distinfo
 
 Modified: head/ports-mgmt/portupgrade-devel/Makefile
 ==============================================================================
 --- head/ports-mgmt/portupgrade-devel/Makefile	Mon Sep 16 23:50:58 2013	(r327447)
 +++ head/ports-mgmt/portupgrade-devel/Makefile	Tue Sep 17 01:10:19 2013	(r327448)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	portupgrade
 -PORTVERSION=	20130718
 +PORTVERSION=	20130916
  PORTEPOCH=	3
  CATEGORIES=	ports-mgmt
  MASTER_SITES=	GH \
 @@ -20,7 +20,7 @@ CONFLICTS_INSTALL=	portupgrade-[0-9]*
  USE_GITHUB=	yes
  GH_ACCOUNT=	freebsd
  GH_PROJECT=	portupgrade
 -GH_COMMIT=	633cdd7
 +GH_COMMIT=	e4a515a
  GH_TAGNAME=	${GH_COMMIT}
  
  DIST_SUBDIR=	${PORTNAME}
 
 Modified: head/ports-mgmt/portupgrade-devel/distinfo
 ==============================================================================
 --- head/ports-mgmt/portupgrade-devel/distinfo	Mon Sep 16 23:50:58 2013	(r327447)
 +++ head/ports-mgmt/portupgrade-devel/distinfo	Tue Sep 17 01:10:19 2013	(r327448)
 @@ -1,2 +1,2 @@
 -SHA256 (portupgrade/freebsd-portupgrade-20130718-0-g633cdd7.tar.gz) = 8cf21617d36dc74b8eb7c907ee7bc9401a779d7a88c9fee6f5b37a17f3f45e40
 -SIZE (portupgrade/freebsd-portupgrade-20130718-0-g633cdd7.tar.gz) = 106819
 +SHA256 (portupgrade/freebsd-portupgrade-20130916-0-ge4a515a.tar.gz) = dbfc0e35693afd243707483e22bd5d60a92a47009175dff9208858d28485bd95
 +SIZE (portupgrade/freebsd-portupgrade-20130916-0-ge4a515a.tar.gz) = 106884
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181813: commit references a PR
Date: Thu, 19 Sep 2013 00:19:45 +0000 (UTC)

 Author: bdrewery
 Date: Thu Sep 19 00:19:37 2013
 New Revision: 327590
 URL: http://svnweb.freebsd.org/changeset/ports/327590
 
 Log:
   - Update to 2.4.11.1
   
   Changes:
     - Fix pkgng detection when using pkg-devel [1]
     - Try to fix stack overflow issue with Ruby 1.9 and large installs [2]
   
   PR:		ports/181813 [1]
   Reported by:	Takanori Saneto <sanewo@ba2.so-net.ne.jp> [1]
   Reported by:	many [2]
   Tested by:	Robert Burmeister [2]
 
 Modified:
   head/ports-mgmt/portupgrade/Makefile
   head/ports-mgmt/portupgrade/distinfo
 
 Modified: head/ports-mgmt/portupgrade/Makefile
 ==============================================================================
 --- head/ports-mgmt/portupgrade/Makefile	Wed Sep 18 23:30:31 2013	(r327589)
 +++ head/ports-mgmt/portupgrade/Makefile	Thu Sep 19 00:19:37 2013	(r327590)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	portupgrade
 -PORTVERSION=	2.4.11
 +PORTVERSION=	2.4.11.1
  PORTEPOCH=	2
  CATEGORIES=	ports-mgmt
  MASTER_SITES=	SF/portupgrade/pkgtools/dist/ \
 
 Modified: head/ports-mgmt/portupgrade/distinfo
 ==============================================================================
 --- head/ports-mgmt/portupgrade/distinfo	Wed Sep 18 23:30:31 2013	(r327589)
 +++ head/ports-mgmt/portupgrade/distinfo	Thu Sep 19 00:19:37 2013	(r327590)
 @@ -1,2 +1,2 @@
 -SHA256 (portupgrade/pkgtools-2.4.11.tar.bz2) = c05d8d485c15c5efc0220ab0a8bd40d4a08f057238726797a7f49a288a1e065c
 -SIZE (portupgrade/pkgtools-2.4.11.tar.bz2) = 85766
 +SHA256 (portupgrade/pkgtools-2.4.11.1.tar.bz2) = 9e683cba14fe5717f0518e00463a200c4318da177158fc284c7b482c6452b790
 +SIZE (portupgrade/pkgtools-2.4.11.1.tar.bz2) = 85818
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: bdrewery 
State-Changed-When: Wed Sep 18 19:20:02 CDT 2013 
State-Changed-Why:  
Thanks, portmaster and portupgrade are all fixed now. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181813 

From: Takanori Saneto <sanewo@ba2.so-net.ne.jp>
To: bug-followup@FreeBSD.org, sanewo@ba2.so-net.ne.jp
Cc:  
Subject: Re: ports/181813: ports-mgmt/portupgrade misbehave with pkg-devel
Date: Mon, 23 Dec 2013 11:48:47 +0900

 Hi guys,
 
 I found that it needs some more for portupgrade(-devel) to work with 
 pkg-devel.
 
 Current pkgdb.rb has @pkgng_origin as instance variable, which seems not 
 properly initialized when accessed within the class method (e.g. 
 self.command).
 
 Following patch makes it a class variable and it seems work as expected.
 I'm not vary sure it won't break anything, though.
 
 ===
 --- lib/pkgtools/pkgdb.rb.orig      2013-12-13 03:20:27.000000000 +0900
 +++ lib/pkgtools/pkgdb.rb 2013-12-23 11:32:49.000000000 +0900
 @@ -99,7 +99,7 @@
       # Use what the port advises to use via PKG_BIN as that will properly
       # handle upgrades
       if sym == :pkg
 -      pkg_origin = @pkgng_origin || "ports-mgmt/pkg"
 +      pkg_origin = @@pkgng_origin || "ports-mgmt/pkg"
         pkg_dir = "#{$portsdb.ports_dir}/#{pkg_origin}"
 
         if File.directory?(pkg_dir)
 @@ -128,8 +128,8 @@
          PACKAGESITE=file:///nonexistent \
          pkg info -x 'pkg(-devel)?$' >/dev/null 2>&1 && echo yes`.chomp 
 != ""
         @with_pkgng = false unless @with_pkgng
 -      @pkgng_origin = $portsdb.make_var('PKGNG_ORIGIN')
 -      #STDERR.puts "USING PKGNG[#{@pkgng_origin}]" if @with_pkgng
 +      @@pkgng_origin = $portsdb.make_var('PKGNG_ORIGIN')
 +      #STDERR.puts "USING PKGNG[#{@@pkgng_origin}]" if @with_pkgng
       end
       @with_pkgng
     end
 
 ===
 Happy Hacking!
 
 

From: Bryan Drewery <bdrewery@FreeBSD.org>
To: bug-followup@FreeBSD.org, sanewo@ba2.so-net.ne.jp
Cc:  
Subject: Re: ports/181813: ports-mgmt/portupgrade misbehave with pkg-devel
Date: Tue, 24 Dec 2013 08:11:04 -0600

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 --ha0uOM2Vn0X8qNuhtEutwgAdFUVf4jOV7
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 Thanks! Will test and commit soon.
 
 By the way, it's best to open a new PR next time.
 
 --=20
 Regards,
 Bryan Drewery
 
 
 --ha0uOM2Vn0X8qNuhtEutwgAdFUVf4jOV7
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (MingW32)
 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
 
 iQEcBAEBAgAGBQJSuZX4AAoJEDXXcbtuRpfPwXIIAMOOjokp0JRu0pUW5XmHJ0AO
 2mBCkJmpKorKrjRfhdfk1xGFUAB6KYp8R2IIsen+XKVNWqoptjUNTgyq+TWccWr3
 RhUF+RFi4Ya3qjIyRLfqUoCJ774T8WwtB1doX4qe5UgLC61WhTFKN86/8ZE8RgGw
 myDSElZ4fBh90Pqsz2ZliP4dN6wPgKAx+ZtymF0ufJ1HlRKJYz1uagmvtvtEDGPH
 fy7ShO4H++wOsUvc7mU/8rj5n9NXchzgH7g+enUiI7bFN/cQnGt2668R6vDLCQNv
 vPumhRsFPTFnie+e36LBuRmAL/n3C3/fT2MWlWzEQQU+DDG/UgJIhZDvgi2ecN4=
 =puQi
 -----END PGP SIGNATURE-----
 
 --ha0uOM2Vn0X8qNuhtEutwgAdFUVf4jOV7--
>Unformatted:
