Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Aug 2014 16:15:07 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r364717 - in branches/2014Q3/ports-mgmt/pkg: . files
Message-ID:  <53ea3d8b.6167.1e0a495e@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Tue Aug 12 16:15:07 2014
New Revision: 364717
URL: http://svnweb.freebsd.org/changeset/ports/364717
QAT: https://qat.redports.org/buildarchive/r364717/

Log:
  MFH: r360653
  
  - Fix pkg-rquery -I to have all expected output.
  
  Obtained from:	upstream 29c9c84e0e11c2c182a8d79634344e57bf2575f1
  With hat:	portmgr
  Reported by:	dteske

Added:
  branches/2014Q3/ports-mgmt/pkg/files/patch-rquery-I
     - copied unchanged from r360653, head/ports-mgmt/pkg/files/patch-rquery-I
Modified:
  branches/2014Q3/ports-mgmt/pkg/Makefile
Directory Properties:
  branches/2014Q3/   (props changed)

Modified: branches/2014Q3/ports-mgmt/pkg/Makefile
==============================================================================
--- branches/2014Q3/ports-mgmt/pkg/Makefile	Tue Aug 12 16:07:26 2014	(r364716)
+++ branches/2014Q3/ports-mgmt/pkg/Makefile	Tue Aug 12 16:15:07 2014	(r364717)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.2.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
 		http://files.etoilebsd.net/${PORTNAME}/ \

Copied: branches/2014Q3/ports-mgmt/pkg/files/patch-rquery-I (from r360653, head/ports-mgmt/pkg/files/patch-rquery-I)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q3/ports-mgmt/pkg/files/patch-rquery-I	Tue Aug 12 16:15:07 2014	(r364717, copy of r360653, head/ports-mgmt/pkg/files/patch-rquery-I)
@@ -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?53ea3d8b.6167.1e0a495e>