CVS commit: pkgsrc/mk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May  5 06:19:55 UTC 2025

Modified Files:
        pkgsrc/mk/misc: toplevel.mk
        pkgsrc/mk/scripts: genindex.awk

Log Message:
mk: index: pass output file name to genindex.awk


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mk/misc/toplevel.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mk/scripts/genindex.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/misc/toplevel.mk
diff -u pkgsrc/mk/misc/toplevel.mk:1.7 pkgsrc/mk/misc/toplevel.mk:1.8
--- pkgsrc/mk/misc/toplevel.mk:1.7      Mon Jul 11 22:53:48 2016
+++ pkgsrc/mk/misc/toplevel.mk  Mon May  5 06:19:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: toplevel.mk,v 1.7 2016/07/11 22:53:48 wiz Exp $
+# $NetBSD: toplevel.mk,v 1.8 2025/05/05 06:19:55 wiz Exp $
 #
 # This file contains the make targets that can be used from the
 # top-level Makefile. They are in this separate file to keep the
@@ -74,7 +74,7 @@ index:
 ${.CURDIR}/INDEX:
        @${MAKE} ${.CURDIR}/PKGDB
        @${RM} -f ${.CURDIR}/INDEX
-       @${AWK} -f ./mk/scripts/genindex.awk PKGSRCDIR=${.CURDIR} SORT=${SORT} ${.CURDIR}/PKGDB
+       @${AWK} -f ./mk/scripts/genindex.awk -v SORT=${SORT} -v INDEX=${.CURDIR}/INDEX ${.CURDIR}/PKGDB
        @${RM} -f ${.CURDIR}/PKGDB
 
 print-index: ${.CURDIR}/INDEX

Index: pkgsrc/mk/scripts/genindex.awk
diff -u pkgsrc/mk/scripts/genindex.awk:1.11 pkgsrc/mk/scripts/genindex.awk:1.12
--- pkgsrc/mk/scripts/genindex.awk:1.11 Sun May  4 22:32:07 2025
+++ pkgsrc/mk/scripts/genindex.awk      Mon May  5 06:19:55 2025
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: genindex.awk,v 1.11 2025/05/04 22:32:07 wiz Exp $
+# $NetBSD: genindex.awk,v 1.12 2025/05/05 06:19:55 wiz Exp $
 #
 # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -199,7 +199,7 @@ BEGIN {
 
 END {
     if( SORT == "" ) { SORT = "sort"; }
-    indexf = SORT " > INDEX";
+    indexf = SORT " > " INDEX;
     if ( dependsfile == "" ) dependsfile = "/dev/null";
     if ( builddependsfile == "" ) builddependsfile = "/dev/null";
 
@@ -232,7 +232,7 @@ END {
     }
     close(builddependsfile);
 
-    printf("Generating INDEX file\n");
+    printf("Generated INDEX file\n");
 
 # Output format:
 #  package-name|package-path|installation-prefix|comment| \