From a7548e970884e7d49183dbe2486f3063d4ba4e15 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Thu, 8 Jun 2006 11:18:04 +0000
Subject: undo most of the last commit which was a mistake.

---
 mk/scripts/binpkg-cache | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'mk')

diff --git a/mk/scripts/binpkg-cache b/mk/scripts/binpkg-cache
index 954799fb0a2..93b4c81c44c 100755
--- a/mk/scripts/binpkg-cache
+++ b/mk/scripts/binpkg-cache
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: binpkg-cache,v 1.8 2006/06/06 11:10:31 dmcmahill Exp $
+# $NetBSD: binpkg-cache,v 1.9 2006/06/08 11:18:04 dmcmahill Exp $
 #
 # Script for generating a cache file with information about
 # all binary packages contained in a directory.
@@ -54,7 +54,7 @@ SORT=${SORT:-sort}
 STAT=${STAT:-stat}
 
 cachefile=.pkgcache
-cacheversion=20060203
+cacheversion=20050428
 
 prompt="----> "
 tab="      "
@@ -210,15 +210,7 @@ process_binpkg_dir(){
 			if test "X${DEBUG}" = "Xyes" ; then
 				echo "${PKG_INFO} -q -B ${f}"
 			fi
-			# The output of pkg_info contains the dependency information first
-			# (from the -n) followed by all the build definitions (-B).
-			# To make the dependency information easier to parse later, we
-			# want to prefix it with DEPENDS+=.  Right now the only way I see
-			# to figure out when the DEPENDS section ends in the pkg_info output
-			# is by looking for a blank line.
-			${PKG_INFO} -q -Bn ${f} | \
-				${AWK} '/^$/ {x=1; print; next;} x==0 {printf("DEPENDS+=");} {print}' \
-				>> ${tmpd}/${cachefile}
+			${PKG_INFO} -q -B ${f} >> ${tmpd}/${cachefile}
 			echo "pkgcache_end ${fn}" >> ${tmpd}/${cachefile}
 		done
 		mv -f ${tmpd}/${cachefile} ${d}/${cachefile}
@@ -313,7 +305,6 @@ do
 		# Version
 		-V|--version)
 			${AWK} '/^#[ \t]*\$NetBSD/ {gsub(/,v/,"",$3);printf("%s:  Version %s, %s\n",$3,$4,$5); exit 0;}' $prog
-			echo "Generating version ${cacheversion} of the cache files."
 			exit 0
 	    		;;
 
-- 
cgit v1.2.3