Date: Fri, 4 Jul 2014 20:08:12 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> 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 Message-ID: <201407042008.s64K8C3I049403@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407042008.s64K8C3I049403>