From owner-svn-ports-head@FreeBSD.ORG Fri Jul 4 20:08:12 2014 Return-Path: Delivered-To: svn-ports-head@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 ESMTPS id 9BD9BA21; Fri, 4 Jul 2014 20:08:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6EBB72D08; Fri, 4 Jul 2014 20:08:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64K8CZe049405; Fri, 4 Jul 2014 20:08:12 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64K8C3I049403; Fri, 4 Jul 2014 20:08:12 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201407042008.s64K8C3I049403@svn.freebsd.org> From: Bryan Drewery Date: Fri, 4 Jul 2014 20:08:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360653 - in head/ports-mgmt/pkg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2014 20:08:12 -0000 Author: bdrewery Date: Fri Jul 4 20:08:11 2014 New Revision: 360653 URL: http://svnweb.freebsd.org/changeset/ports/360653 QAT: https://qat.redports.org/buildarchive/r360653/ Log: - Fix pkg-rquery -I to have all expected output. Obtained from: upstream 29c9c84e0e11c2c182a8d79634344e57bf2575f1 With hat: portmgr Reported by: dteske Added: head/ports-mgmt/pkg/files/patch-rquery-I (contents, props changed) Modified: head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Fri Jul 4 19:52:27 2014 (r360652) +++ head/ports-mgmt/pkg/Makefile Fri Jul 4 20:08:11 2014 (r360653) @@ -2,7 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.2.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/${PORTNAME}/ \ Added: head/ports-mgmt/pkg/files/patch-rquery-I ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-rquery-I Fri Jul 4 20:08:11 2014 (r360653) @@ -0,0 +1,43 @@ +diff --git pkg/rquery.c pkg/rquery.c +index 7ce40f7..f967a34 100644 +--- pkg/rquery.c ++++ pkg/rquery.c +@@ -84,13 +84,23 @@ print_index(struct pkg *pkg) + #ifndef PORTSDIR + #define PORTSDIR "/usr/ports" + #endif +- struct pkg_category *cat = NULL; + +- pkg_printf("%n-%v|" PORTSDIR "/%o|%p|%c|" PORTSDIR "/%o/pkg-descr|%m|", +- pkg, pkg, pkg, pkg, pkg, pkg, pkg); +- while (pkg_categories(pkg, &cat) == EPKG_OK) +- pkg_printf("%Cn ", cat); +- printf("\n"); ++ pkg_printf( ++ "%n-%v|" /* PKGNAME */ ++ "%S/%o|" /* PORTDIR */ ++ "%p|" /* PREFIX */ ++ "%c|" /* COMMENT */ ++ "%S/%o/pkg-descr|" /* _DESCR */ ++ "%m|" /* MAINTAINER */ ++ "%C%{%Cn%| %}|" /* CATEGORIES */ ++ "|" /* BUILD_DEPENDS */ ++ "%d%{%dn-%dv%| %}|" /* RUN_DEPENDS */ ++ "%w|" /* WWW */ ++ "|" /* EXTRACT_DEPENDS */ ++ "|" /* PATCH_DEPENDS */ ++ "\n", /* FETCH_DEPENDS */ ++ pkg, pkg, PORTSDIR, pkg, pkg, pkg, PORTSDIR, pkg, pkg, pkg, pkg, ++ pkg); + } + + int +@@ -201,7 +211,7 @@ exec_rquery(int argc, char **argv) + return (EX_IOERR); + + if (index_output) +- query_flags = PKG_LOAD_BASIC|PKG_LOAD_CATEGORIES; ++ query_flags = PKG_LOAD_BASIC|PKG_LOAD_CATEGORIES|PKG_LOAD_DEPS; + + if (match == MATCH_ALL || match == MATCH_CONDITION) { + const char *condition_sql = NULL;