From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 3 22:50:06 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD8A816A41F for ; Sat, 3 Dec 2005 22:50:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E690143D60 for ; Sat, 3 Dec 2005 22:50:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jB3Mo2kw003275 for ; Sat, 3 Dec 2005 22:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jB3Mo2p3003274; Sat, 3 Dec 2005 22:50:02 GMT (envelope-from gnats) Resent-Date: Sat, 3 Dec 2005 22:50:02 GMT Resent-Message-Id: <200512032250.jB3Mo2p3003274@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Michael C. Shultz" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17C3116A41F for ; Sat, 3 Dec 2005 22:44:23 +0000 (GMT) (envelope-from ringworm01@gmail.com) Received: from vms048pub.verizon.net (vms048pub.verizon.net [206.46.252.48]) by mx1.FreeBSD.org (Postfix) with ESMTP id 184AA43D62 for ; Sat, 3 Dec 2005 22:44:22 +0000 (GMT) (envelope-from ringworm01@gmail.com) Received: from ringworm.mechee.com ([71.102.14.129]) by vms048.mailsrvcs.net (Sun Java System Messaging Server 6.2-4.02 (built Sep 9 2005)) with ESMTPA id <0IQY00M681TW8LI5@vms048.mailsrvcs.net> for FreeBSD-gnats-submit@freebsd.org; Sat, 03 Dec 2005 16:44:21 -0600 (CST) Received: by ringworm.mechee.com (Postfix, from userid 1001) id 26806130C2B; Sat, 03 Dec 2005 14:44:20 -0800 (PST) Message-Id: <20051203224420.26806130C2B@ringworm.mechee.com> Date: Sat, 03 Dec 2005 14:44:20 -0800 (PST) From: "Michael C. Shultz" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Jiawei Ye , dan@slightlystrange.org Subject: ports/89903: [MAINTAINER] update sysutils/portmanager X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Michael C. Shultz" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2005 22:50:07 -0000 >Number: 89903 >Category: ports >Synopsis: [MAINTAINER] update sysutils/portmanager >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 03 22:50:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Michael C. Shultz >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD ringworm.mechee.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Wed Nov 30 13:51:49 PST 2005 root@ringworm.mechee.com:/usr5/obj/usr5/src/sys/RINGWORM5 i386 >Description: update sysutils/portmanager to 0.3.9_6 1, Fixes corruption of +CONTENTS files when portmanager is compiled in BUILD_DEPENDS_ARE_LEAVES mode Bug identified by Jiawei Ye 2. Fixes parsing pkgtools.conf when arrays are used, patch provided by dan@slightlystrange.org, thank you! >How-To-Repeat: N/A >Fix: --- portmanager-0.3.9_6.diff begins here --- diff -ruN portmanager/Makefile portmanager-0.3.9_6/Makefile --- portmanager/Makefile Fri Dec 2 08:36:57 2005 +++ portmanager-0.3.9_6/Makefile Sat Dec 3 14:34:38 2005 @@ -7,7 +7,7 @@ PORTNAME= portmanager PORTVERSION= 0.3.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= http://portmanager.sunsite.dk/distfiles/ \ ${MASTER_SITE_SOURCEFORGE} diff -ruN portmanager/files/patch-0.3.9_6 portmanager-0.3.9_6/files/patch-0.3.9_6 --- portmanager/files/patch-0.3.9_6 Wed Dec 31 16:00:00 1969 +++ portmanager-0.3.9_6/files/patch-0.3.9_6 Sat Dec 3 14:34:25 2005 @@ -0,0 +1,143 @@ +diff -ruN ../0.3.9_5/libMGPM/src/MGPMrController.c ./libMGPM/src/MGPMrController.c +--- ../0.3.9_5/libMGPM/src/MGPMrController.c Tue Nov 29 18:31:42 2005 ++++ ./libMGPM/src/MGPMrController.c Sat Dec 3 14:01:34 2005 +@@ -165,17 +165,6 @@ + */ + MGPMrReadConfigure( property, " " ); + +- while( fflush( stdout ) ); +- if( property->buildDependsAreLeaves ) +- { +- fprintf( stdout, "%s\n", SINGLE_LINES ); +- fprintf( stdout, "%s\n", "running in WITH_BUILD_DEPENDS_ARE_LEAVES mode" ); +- fprintf( stdout, "%s\n", "using this mode is not endorsed by author, if ports" ); +- fprintf( stdout, "%s\n", "fail building due to missing build dependencies" ); +- fprintf( stdout, "%s\n", "in sysutils/portmanager run \"make config\" and shut this mode off" ); +- fprintf( stdout, "%s\n", "then rebuild/reinstall portmanager before contacting author/maintainer" ); +- fprintf( stdout, "%s\n", DOUBLE_LINES ); +- } + if( path && ( strcmp( path, "SHOWLEAVES" ) == 0 ) ) + { + if( property->resume == 0 ) /* skip this if portmanager has upgraded/rebuilt its self */ +@@ -273,7 +262,21 @@ + */ + if( argv[2] && strcmp( "package-depends", argv[2] ) == 0 ) + { +- errorCode = MGPMrPackageDepends( property, path ); ++ property->pmMode = 2; ++ ++ if( property->buildDependsAreLeaves && property->pmMode != 2 ) ++ { ++ fprintf( stdout, "%s\n", SINGLE_LINES ); ++ fprintf( stdout, "%s\n", "running in WITH_BUILD_DEPENDS_ARE_LEAVES mode" ); ++ fprintf( stdout, "%s\n", "using this mode is not endorsed by author, if ports" ); ++ fprintf( stdout, "%s\n", "fail building due to missing build dependencies" ); ++ fprintf( stdout, "%s\n", "in sysutils/portmanager run \"make config\" and shut this mode off" ); ++ fprintf( stdout, "%s\n", "then rebuild/reinstall portmanager before contacting author/maintainer" ); ++ fprintf( stdout, "%s\n", DOUBLE_LINES ); ++ while( fflush( stdout ) ); ++ } ++ ++ errorCode = MGPMrPackageDepends( property, path ); + rControllerCleanUp( &localProperty ); + MGPMlogDestroy( property ); + return( 0 ); +diff -ruN ../0.3.9_5/libMGPM/src/MGPMrStatus.c ./libMGPM/src/MGPMrStatus.c +--- ../0.3.9_5/libMGPM/src/MGPMrStatus.c Tue Nov 29 18:31:42 2005 ++++ ./libMGPM/src/MGPMrStatus.c Fri Dec 2 12:06:43 2005 +@@ -305,7 +305,7 @@ + property->fieldInstalledPortsDbPortName ) ); + + +- fprintf( stdout, "%05d have:%-35s %-35s OLD avalable: %s\n", ++ fprintf( stdout, "%05d have:%-35s %-35s OLD available: %s\n", + counter, + installedPortsDbPortName, + installedPortsDbPortDir, +diff -ruN ../0.3.9_5/portmanager/pkgtools-to-portmanager.rb ./portmanager/pkgtools-to-portmanager.rb +--- ../0.3.9_5/portmanager/pkgtools-to-portmanager.rb Tue Nov 29 18:31:42 2005 ++++ ./portmanager/pkgtools-to-portmanager.rb Sat Dec 3 12:53:50 2005 +@@ -27,6 +27,11 @@ + # + # jan + # ++# ++# if .. end added by patch provided by: ++# Daniel Bye ++# fixes not reading pkgtools.conf args when in array format ++# + #!/usr/local/bin/ruby + + require "pkgtools" +@@ -35,7 +40,6 @@ + + load_config + +- + # held packages + + puts "" +@@ -43,9 +47,10 @@ + puts "" + + config_value(:HOLD_PKGS).each do |pkg| +- +- puts "IGNORE|" + pkg + "|" +- ++ if pkg.empty? ++ pkg = " " ++ end ++ puts pkg + "|" + "#{pkg}" + "|" + end + + +@@ -56,9 +61,10 @@ + puts "" + + config_value(:BEFOREBUILD).each do |pkg| +- +- puts "STOP|/" + pkg[0] + " " + pkg[1] + "|" +- ++ if pkg[1].instance_of?(Array) ++ pkg[1] = pkg[1].join(" ") ++ end ++ puts "STOP|/" + pkg[0] + " " + "#{pkg[1]}" + "|" + end + + # afterinstall becomes start +@@ -68,24 +74,25 @@ + puts "" + + config_value(:AFTERINSTALL).each do |pkg| +- +- puts "START|/" + pkg[0] + " " + pkg[1] + "|" +- ++ if pkg[1].instance_of?(Array) ++ pkg[1] = pkg[1].join(" ") ++ end ++ puts "START|/" + pkg[0] + " " + "#{pkg[1]}" + "|" + end + + # package options. + +- + puts "" + puts "# Package options from MAKE_ARGS" + puts "# Note: pkgtools.conf will use the UNION of all matching lines" + puts "" + + config_value(:MAKE_ARGS).each do |pkg| +- +-##mcs mod## +-# puts pkg[0] + "|" + pkg[1] + "|" +-# +- puts pkg[0] + "|" + pkg[1] + " " + "|" +- ++ if pkg[1].instance_of?(Array) ++ pkg[1] = pkg[1].join(" ") ++ end ++ if pkg[1].empty? ++ pkg[1] = " " ++ end ++ puts pkg[0] + "|" + "#{pkg[1]}" + "|" + end --- portmanager-0.3.9_6.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: