[pkgsrc/trunk]: pkgsrc/mk/scripts undo most of the last commit which was a mi...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e1aa430885b
branches:  trunk
changeset: 514149:7e1aa430885b
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Thu Jun 08 11:18:04 2006 +0000

description:
undo most of the last commit which was a mistake.

diffstat:

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

diffs (45 lines):

diff -r 73669d62b298 -r 7e1aa430885b mk/scripts/binpkg-cache
--- a/mk/scripts/binpkg-cache   Thu Jun 08 11:05:14 2006 +0000
+++ b/mk/scripts/binpkg-cache   Thu Jun 08 11:18:04 2006 +0000
@@ -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 @@
 STAT=${STAT:-stat}
 
 cachefile=.pkgcache
-cacheversion=20060203
+cacheversion=20050428
 
 prompt="----> "
 tab="      "
@@ -210,15 +210,7 @@
                        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 @@
                # 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
                        ;;