From 30b1a989cb4cbb10847fa2ea95b966204a68384d Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Fri, 25 Jul 2003 11:29:33 +0000
Subject: replace the -u and -d options to tflat with 'up' and 'down' as the
 former causes problems with some awks.  Patch provided by Jonathan Perkin in
 PR pkg/22246

---
 mk/bulk/bsd.bulk-pkg.mk |  6 +++---
 mk/bulk/tflat           | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'mk/bulk')

diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index a072b8c229b..f9e499b393e 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.45 2003/07/11 23:54:32 grant Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.46 2003/07/25 11:29:33 dmcmahill Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -126,8 +126,8 @@ bulk-cache:
 	@${ECHO_MSG} "BULK> Sorting build order."
 	tsort ${DEPENDSTREEFILE} > ${ORDERFILE}
 	@${ECHO_MSG} "BULK> Generating up and down dependency files."
-	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat -u ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
-	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat -d ${DEPENDSTREEFILE} > ${DEPENDSFILE}
+	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat up ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
+	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat down ${DEPENDSTREEFILE} > ${DEPENDSFILE}
 	@${ECHO_MSG} "BULK> Generating package name <=> package directory cross reference file"
 	@${ECHO_MSG} "      (this may take a while)."
 	cd ${_PKGSRCDIR} && ${SH} mk/bulk/printindex ${BROKENFILE} > ${INDEXFILE}
diff --git a/mk/bulk/tflat b/mk/bulk/tflat
index f1fd17424f2..eaec453e421 100755
--- a/mk/bulk/tflat
+++ b/mk/bulk/tflat
@@ -1,4 +1,4 @@
-# $NetBSD: tflat,v 1.9 2003/07/11 23:54:33 grant Exp $
+# $NetBSD: tflat,v 1.10 2003/07/25 11:29:33 dmcmahill Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -42,11 +42,11 @@ BEGIN {
 		exit(1);
 	}
 
-	if ( ARGV[1] == "-u" ) {
+	if ( ARGV[1] == "up" ) {
 		up=1;
 	}
 	else{
-		if ( ARGV[1] == "-d" ) { up=0; }
+		if ( ARGV[1] == "down" ) { up=0; }
 		else{
 			printf("tflat: unknown option  \"%s\"\n",ARGV[1]);
 			usage();
@@ -177,10 +177,10 @@ function usage(){
 	printf("         packages which depend upon a given package or alternatively\n");
 	printf("         all packages which are depend upon by a given package.\n");
 	printf("\n");
-	printf("Usage:\ttflat -u|-d depfile\n");
+	printf("Usage:\ttflat up|down depfile\n");
 	printf("\n");
-	printf("Options:\t-d\tgo down the depends tree (ie \"foo depends on:\")\n");
-	printf("        \t-u\tgo up the depends tree (ie \"foo is depended on by:\")\n");
+	printf("Options:\tdown\tgo down the depends tree (ie \"foo depends on:\")\n");
+	printf("        \tup\tgo up the depends tree (ie \"foo is depended on by:\")\n");
 	printf("\n");
 	printf("Input file format is in the form\n");
 	printf("foo	bar\n");
@@ -194,8 +194,8 @@ function usage(){
 	printf("The typical use is:\n");
 	printf("cd /usr/pkgsrc\n");
 	printf("./mk/bulk/printdepends > .depends\n");
-	printf("./mk/bulk/tflat -u .depends > .supports\n");
-	printf("./mk/bulk/tflat -d .depends > .requires\n");
+	printf("./mk/bulk/tflat up .depends > .supports\n");
+	printf("./mk/bulk/tflat down .depends > .requires\n");
 	printf("\n");
 
 }
-- 
cgit v1.2.3