From 93c85e8038d41347acb25cac590b3be7c8430aaf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sun, 26 Apr 2015 10:05:56 +0200
Subject: [PATCH] xbps-fbulk: simplify recollection of dependencies.

The changes I made to xbps-src show-build-deps now will print only
real source package names, without version components or virtual packages,
so that fbulk does not do any extra work.
---
 bin/xbps-fbulk/main.c | 39 +++------------------------------------
 1 file changed, 3 insertions(+), 36 deletions(-)

diff --git a/bin/xbps-fbulk/main.c b/bin/xbps-fbulk/main.c
index 3083087c..6d5cae44 100644
--- a/bin/xbps-fbulk/main.c
+++ b/bin/xbps-fbulk/main.c
@@ -481,7 +481,6 @@ ordered_depends(const char *bpath, const char *pkgn)
 
 	fp = popen(cmd, "r");
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
-		char *tmp, *tmp2, *depn;
 		size_t len;
 
 		/* ignore pkgs returning errors */
@@ -494,46 +493,14 @@ ordered_depends(const char *bpath, const char *pkgn)
 		len = strlen(buf);
 		if (len && buf[len-1] == '\n')
 			buf[--len] = 0;
-		/*
-		 * Grab the package name component...
-		 */
-		if ((depn = xbps_pkgpattern_name(buf)) == NULL)
-			if ((depn = xbps_pkg_name(buf)) == NULL)
-				depn = strdup(buf);
 
 		if (VerboseOpt)
-			printf("%s: depends on %s\n", pkgn, depn);
+			printf("%s: depends on %s\n", pkgn, buf);
 
-		assert(depn);
-		/*
-		 * ... and then convert it to the real source package
-		 * (dependency could be a subpackage).
-		 */
-		tmp = xbps_xasprintf("%s/srcpkgs/%s", bpath, depn);
-		if ((tmp2 = realpath(tmp, NULL)) == NULL) {
-			item->emsg = xbps_xasprintf("unresolved dependency: %s\n", depn);
-			item->status = XBROKEN;
-			item->xcode = EXIT_FAILURE;
-			free(depn);
-			free(tmp);
-			break;
-		}
-		free(tmp);
-		free(depn);
-		tmp = strdup(tmp2);
-		depn = basename(tmp);
-		assert(depn);
-		free(tmp2);
-
-		if (VerboseOpt)
-			printf("%s: dependency transformed to %s\n", pkgn, depn);
-
-		xitem = lookupItem(depn);
+		xitem = lookupItem(buf);
 		if (xitem == NULL)
-			xitem = ordered_depends(bpath, depn);
+			xitem = ordered_depends(bpath, buf);
 		addDepn(item, xitem);
-		free(tmp);
-
 	}
 	pclose(fp);
 	free(cmd);