From owner-cvs-all@FreeBSD.ORG Sun Aug 21 15:54:02 2011 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 979C0106567F; Sun, 21 Aug 2011 15:54:02 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [204.109.58.86]) by mx1.freebsd.org (Postfix) with ESMTP id 5EC958FC12; Sun, 21 Aug 2011 15:54:02 +0000 (UTC) Received: from meatwad.mouf.net (cpe-065-190-149-241.nc.res.rr.com [65.190.149.241]) (authenticated bits=0) by mouf.net (8.14.4/8.14.4) with ESMTP id p7LFrxwi023671 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NOT); Sun, 21 Aug 2011 11:54:00 -0400 (EDT) (envelope-from swills@FreeBSD.org) Message-ID: <4E512A16.6090305@FreeBSD.org> Date: Sun, 21 Aug 2011 11:53:58 -0400 From: Steve Wills User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.17) Gecko/20110531 Thunderbird/3.1.10 MIME-Version: 1.0 To: Andrey Chernov , Stanislav Sedov , ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org References: <201108180805.p7I85ow2002308@repoman.freebsd.org> <20110821104221.GA60534@vniz.net> <20110821110216.GA4989@vniz.net> In-Reply-To: <20110821110216.GA4989@vniz.net> X-Enigmail-Version: 1.1.2 Content-Type: multipart/mixed; boundary="------------010409070401050702020701" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (mouf.net [204.109.58.86]); Sun, 21 Aug 2011 11:54:00 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.96.2 at mouf.net X-Virus-Status: Clean Cc: Subject: Re: cvs commit: ports/ports-mgmt/portupgrade Makefile distinfo ports/ports-mgmt/portupgrade/files patch-bin-Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Aug 2011 15:54:02 -0000 This is a multi-part message in MIME format. --------------010409070401050702020701 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/21/11 07:02, Andrey Chernov wrote: >> # portupgrade -vuR >> /usr/local/lib/ruby/site_ruby/1.9/pkgmisc.rb:104:in `realpath': wrong >> number of arguments (2 for 1) (ArgumentError) >> from /usr/local/lib/ruby/1.9/pathname.rb:446:in `realpath' >> >> It is true: 'realpath' have 2 args in pathname.rb and 1 arg in pkgmisc.rb > > Despite ability to directly specify port name, portupgrade on ruby-1.9 is > totally broken, issuing lots 'Not in due form' at the end. > > portupgrade -vuR php5-extensions > ---> Session started at: Sun, 21 Aug 2011 14:54:42 +0400 > [Gathering depends for lang/php5-extensions > ................................................ done] > [Exclude up-to-date packages ...................... done] > ---> Listing the results (+:done / -:ignored / *:skipped / !:failed) > - ["php5-5.3.7_1"] (["php5-5.3.7_1"]: 5.3.7_1"]: Not in due form: > '[_][,]'.) > - ["php5-iconv-5.3.6_1"] (["php5-iconv-5.3.6_1"]: 5.3.6_1"]: Not > in due form: '[_][,]'.) The attached patch may help. Please give it a try and let me know. Create ports/ports-mgmt/portupgrade/files and drop this in. Thanks, Steve -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (FreeBSD) iQEcBAEBAgAGBQJOUSoWAAoJEPXPYrMgexuh8XAH/iDCK4hjKjKlKZXv063Brr1n Xyp7jZMLWgiWcCgzI6XR1+3p3od/SBf9rf/8/9ekRZNtv+57cuaDPSsDdDlULNK2 07QRNneeiHzHCOVWpX80clq1wl15/gNgV7u5kW2mSHwWDzw3b1Y014hOFhZ123sP S/i2dyP1UaXb1W67Ob5mcSgPvgLVhfLSqOm3l1GwEpKgadM/A/ieT0hw5Kagci4c hOnVGOlKVMLw/8TjUELpXyCcVCq/JH7/GdNNxEQxWNzudCPZ27cyAaGKzBNF6EeJ DPPik3F3bnez27dRWhVdHly17Si3QaBKoqxVhfcDTmO87TVsAxWQ2EHQr31Ur4w= =M70I -----END PGP SIGNATURE----- --------------010409070401050702020701 Content-Type: text/plain; name="patch-1.9" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-1.9" --- lib/pkgmisc.rb.orig 2011-08-21 10:15:39.000000000 +0000 +++ lib/pkgmisc.rb 2011-08-21 10:15:45.000000000 +0000 @@ -28,8 +28,8 @@ # $FreeBSD: projects/pkgtools/lib/pkgmisc.rb,v 1.12 2011-07-25 12:34:43 swills Exp $ begin - require 'features/ruby18/dir' # for Dir.chdir(dir) { ... } - require 'features/ruby18/enum' # Enumerable#any?, etc. + require 'features/ruby19/dir' # for Dir.chdir(dir) { ... } + require 'features/ruby19/enum' # Enumerable#any?, etc. rescue LoadError end @@ -100,12 +100,6 @@ }.join(' ') end -class File - def File.realpath(path) - return File.expand_path(path) - end -end - def init_tmpdir if ! $tmpdir.nil? && $tmpdir != "" then return --- bin/portupgrade.orig 2011-08-21 11:46:59.000000000 +0000 +++ bin/portupgrade 2011-08-21 11:47:06.000000000 +0000 @@ -634,7 +634,7 @@ get_all_depends(origin).each do |d| newdep = $pkgdb.deorigin(d) unless newdep.nil? then - dep << newdep.to_s + dep << newdep.join end end depends |= dep if $upward_recursive --------------010409070401050702020701 Content-Type: application/octet-stream; name="patch-1.9.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch-1.9.sig" iQEcBAABAgAGBQJOUSoWAAoJEPXPYrMgexuh+GcIAJI7qAC+MJq30uGxrHHulHkYEFheaz7k v35zTFPsVmgauY32iVViweneOlzjUhHoMKjfP3tWoSwInYbIKwHH9/3k2OP/OoRrCzmCN5WX mW70I8HT/jNViy8xql71JyLLF7HSYzyLjJ/YlIYeBMdxzNjr1/wBwhG/O+SP6NxAyXVjlcFG kdXTkvBezxW2P8rHAqRAIHCYAIU836RgqVQA9UnoYSv6rmvI8WfsRbiTqUY5/VobQFyRFm8e erzYzYLQqxVbmBs/ylf3gMkAV7kayKlljj9nrH9IiBTTqBa/t3srx9qYWtUQi9RS97Vd7Hzu WkBXr/RWm8DM2wWZ64tcdUs= --------------010409070401050702020701--