[pkgsrc/trunk]: pkgsrc/mk Rename PKGTOOLS_VER to PKGTOOLS_VERSION and use tha...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/870b3ff2a809
branches:  trunk
changeset: 534431:870b3ff2a809
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Oct 20 13:35:12 2007 +0000

description:
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'

diffstat:

 mk/bsd.pkg.readme.mk     |  4 ++--
 mk/scripts/genreadme.awk |  6 +++---
 mk/scripts/mkreadme      |  3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (64 lines):

diff -r 167b6603370c -r 870b3ff2a809 mk/bsd.pkg.readme.mk
--- a/mk/bsd.pkg.readme.mk      Sat Oct 20 10:58:01 2007 +0000
+++ b/mk/bsd.pkg.readme.mk      Sat Oct 20 13:35:12 2007 +0000
@@ -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.15 2007/10/20 13:35:12 adrianp 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 @@
                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 -r 167b6603370c -r 870b3ff2a809 mk/scripts/genreadme.awk
--- a/mk/scripts/genreadme.awk  Sat Oct 20 10:58:01 2007 +0000
+++ b/mk/scripts/genreadme.awk  Sat Oct 20 13:35:12 2007 +0000
@@ -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.29 2007/10/20 13:35:12 adrianp Exp $
 #
 # Copyright (c) 2002, 2003, 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -380,7 +380,7 @@
 # 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 @@
                                }
                        }
 
-                       if (have_vfile && PKGTOOLS_VER >= 20070714) {
+                       if (have_vfile && PKGTOOLS_VERSION >= 20070714) {
                                pkg = pkgdir2name[toppkg];
 
                                if (debug) {
diff -r 167b6603370c -r 870b3ff2a809 mk/scripts/mkreadme
--- a/mk/scripts/mkreadme       Sat Oct 20 10:58:01 2007 +0000
+++ b/mk/scripts/mkreadme       Sat Oct 20 13:35:12 2007 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkreadme,v 1.19 2007/10/09 19:19:13 martti Exp $
+# $NetBSD: mkreadme,v 1.20 2007/10/20 13:35:12 adrianp Exp $
 #
 # Script for README.html generation
 #
@@ -447,6 +447,7 @@
     PKG_SUFX=$PKG_SUFX \
     PKG_URL=$PKG_URL \
     PKGSRCDIR=$PKGSRCDIR \
+    PKGTOOLS_VERSION=$PKGTOOLS_VERSION \
     PVDIR=$PVDIR \
     SED=$SED \
     SETENV=$SETENV \