Pullup ticket 2207 - requested by adrianp

bugfix for "make readme"

- pkgsrc/mk/bsd.pkg.readme.mk				1.15
- pkgsrc/mk/scritps/genreadme.awk			1.29
- pkgsrc/mk/scritps/mkreadme				1.20

   Module Name:	pkgsrc
   Committed By:	adrianp
   Date:		Sat Oct 20 13:35:12 UTC 2007

   Modified Files:
	   pkgsrc/mk: bsd.pkg.readme.mk
	   pkgsrc/mk/scripts: genreadme.awk mkreadme

   Log Message:
   Rename PKGTOOLS_VER to PKGTOOLS_VERSION and use that everywhere
   Export PKGTOOLS_VERSION so that genreadme.awk can use it
   This will sync the output between './mkreadme' and 'make readme'

3 files changed, 7 insertions, 6 deletions

diff --git a/mk/bsd.pkg.readme.mk b/mk/bsd.pkg.readme.mk
index 8c7ab0a8749..bdea2fbe19c 100644
--- a/mk/bsd.pkg.readme.mk
+++ b/mk/bsd.pkg.readme.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.readme.mk,v 1.14 2007/10/09 19:19:12 martti Exp $
+# $NetBSD: bsd.pkg.readme.mk,v 1.14.2.1 2007/10/22 11:23:32 ghen Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and encapsulates the
 # code to produce README.html files in each package directory.
@@ -299,7 +299,7 @@ README.html: .PRECIOUS
 		PKG_URL=${PKG_URL:Q} \
 		PKGSRCDIR=${.CURDIR:C|/[^/]*/[^/]*$||:Q} \
 		PVDIR=$$_PVDIR \
-		PKGTOOLS_VER=${PKGTOOLS_VERSION} \
+		PKGTOOLS_VERSION=${PKGTOOLS_VERSION} \
 		SED=${SED:Q} \
 		SETENV=${SETENV:Q} \
 		SORT=${SORT:Q} \
diff --git a/mk/scripts/genreadme.awk b/mk/scripts/genreadme.awk
index 320afb5a35d..a9774aafaea 100755
--- a/mk/scripts/genreadme.awk
+++ b/mk/scripts/genreadme.awk
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: genreadme.awk,v 1.28 2007/08/29 23:26:30 adrianp Exp $
+# $NetBSD: genreadme.awk,v 1.28.2.1 2007/10/22 11:23:33 ghen Exp $
 #
 # Copyright (c) 2002, 2003, 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -380,7 +380,7 @@ END {
 # XXX: shown in the generated README.html files for packages.
 
 			vul = "";
-			if (have_vfile && PKGTOOLS_VER < 20070714) {
+			if (have_vfile && PKGTOOLS_VERSION < 20070714) {
 				i = 1;
 				pkgbase = pkgdir2name[toppkg];
 				gsub(/-[^-]*$/, "", pkgbase);
@@ -410,7 +410,7 @@ END {
 				}
 			}
 
-			if (have_vfile && PKGTOOLS_VER >= 20070714) {
+			if (have_vfile && PKGTOOLS_VERSION >= 20070714) {
 				pkg = pkgdir2name[toppkg];
 
 				if (debug) {
diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme
index 6f043948a9f..ac032841902 100755
--- a/mk/scripts/mkreadme
+++ b/mk/scripts/mkreadme
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkreadme,v 1.19 2007/10/09 19:19:13 martti Exp $
+# $NetBSD: mkreadme,v 1.19.2.1 2007/10/22 11:23:33 ghen Exp $
 #
 # Script for README.html generation
 #
@@ -447,6 +447,7 @@ ${AWK} -f ${PKGSRCDIR}/mk/scripts/genreadme.awk  \
     PKG_SUFX=$PKG_SUFX \
     PKG_URL=$PKG_URL \
     PKGSRCDIR=$PKGSRCDIR \
+    PKGTOOLS_VERSION=$PKGTOOLS_VERSION \
     PVDIR=$PVDIR \
     SED=$SED \
     SETENV=$SETENV \