CVS commit: pkgsrc/mk/scripts

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May  4 22:32:07 UTC 2025

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

Log Message:
genindex.awk: re-indent, NFCI


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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/scripts/genindex.awk
diff -u pkgsrc/mk/scripts/genindex.awk:1.10 pkgsrc/mk/scripts/genindex.awk:1.11
--- pkgsrc/mk/scripts/genindex.awk:1.10 Sun May  4 20:08:16 2025
+++ pkgsrc/mk/scripts/genindex.awk      Sun May  4 22:32:07 2025
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# $NetBSD: genindex.awk,v 1.10 2025/05/04 20:08:16 wiz Exp $
+# $NetBSD: genindex.awk,v 1.11 2025/05/04 22:32:07 wiz Exp $
 #
 # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -46,8 +46,8 @@
 
 
 BEGIN {
-  debug = 0;
-       printf("Reading database file\n");
+    debug = 0;
+    printf("Reading database file\n");
 }
 
 #conflicts /usr/pkgsrc/math/scilab
@@ -63,88 +63,88 @@ BEGIN {
 #depends /usr/pkgsrc/math/scilab xless-[0-9]*:../../x11/xless pvm-3.4.3:../../parallel/pvm3
 #build_depends /usr/pkgsrc/math/scilab libtool-base>=1.4.20010614nb9:../../devel/libtool-base
 #
-       deptype=$1;
+    deptype=$1;
 #    pkg=fulldir2pkgdir($2);
-       pkg = $2;
-       if (pkg in topdepends) {}
-       else {topdepends[pkg] = "";}
-       if (pkg in topbuilddepends) {}
-       else {topbuilddepends[pkg] = "";}
-
-       for (i = 3; i <= NF; i++) {
-               split($i, a,":");
-               pkgpat = a[1];
-               pkgdir = a[2];
-               sub(/[\.\/]*/, "", pkgdir);
-               if (pkgdir !~ /\//) {
-                       pkgcat = pkg;
-                       gsub(/\/.*/, "", pkgcat);
-                       pkgdir=pkgcat "/" pkgdir;
-                       if (debug)
-                               printf("Corrected missing category directory to get \"%s\"\n",
-                                      pkgdir);
-               }
-               if (debug){
-                       printf("package in directory %s %s on:\n",
-                              pkg, deptype);
-                       printf("\tpkgpat = %s\n", pkgpat);
-                       printf("\tpkgdir = %s\n", pkgdir);
-               }
+    pkg = $2;
+    if (pkg in topdepends) {}
+    else {topdepends[pkg] = "";}
+    if (pkg in topbuilddepends) {}
+    else {topbuilddepends[pkg] = "";}
+
+    for (i = 3; i <= NF; i++) {
+       split($i, a,":");
+       pkgpat = a[1];
+       pkgdir = a[2];
+       sub(/[\.\/]*/, "", pkgdir);
+       if (pkgdir !~ /\//) {
+           pkgcat = pkg;
+           gsub(/\/.*/, "", pkgcat);
+           pkgdir=pkgcat "/" pkgdir;
+           if (debug)
+               printf("Corrected missing category directory to get \"%s\"\n",
+                      pkgdir);
+       }
+       if (debug){
+           printf("package in directory %s %s on:\n",
+                  pkg, deptype);
+           printf("\tpkgpat = %s\n", pkgpat);
+           printf("\tpkgdir = %s\n", pkgdir);
+       }
 
 
 #
 # store the package directory in a associative array with the wildcard
 # pattern as the index since we will need to be able to look this up later
 #
-               pat2dir[pkgpat] = pkgdir;
+       pat2dir[pkgpat] = pkgdir;
 
-               if (deptype == "depends") {
-                       topdepends[pkg] = topdepends[pkg] " " pkgpat " " ;
-                       if (debug) {
-                         printf("Appending %s to topdepends[%s] (%s)\n",
-                                pkgpat, pkg, topdepends[pkg]);
-                       }
-               }
-               else {
-                       if (debug) {
-                         printf("Appending %s to topbuilddepends[%s] (%s)\n",
-                                pkgpat, pkg, topbuilddepends[pkg]);
-                       }
-                       topbuilddepends[pkg] = topbuilddepends[pkg] " " pkgpat " " ;
-               }
+       if (deptype == "depends") {
+           topdepends[pkg] = topdepends[pkg] " " pkgpat " " ;
+           if (debug) {
+               printf("Appending %s to topdepends[%s] (%s)\n",
+                      pkgpat, pkg, topdepends[pkg]);
+           }
+       }
+       else {
+           if (debug) {
+               printf("Appending %s to topbuilddepends[%s] (%s)\n",
+                      pkgpat, pkg, topbuilddepends[pkg]);
+           }
+           topbuilddepends[pkg] = topbuilddepends[pkg] " " pkgpat " " ;
        }
+    }
 
-       next;
+    next;
 }
 
 /^categories /{
-       # note:  we pick out the categories slightly differently than the comment
-       # and homepage because the category name will be included in the directory
-       # name and hence the index() call points to the wrong location
-       categories[$2] = $3;
-       for(i = 4; i <= NF; i = i + 1) {
-               categories[$2] = categories[$2] " " $i;
-       }
-       next;
+    # note:  we pick out the categories slightly differently than the comment
+    # and homepage because the category name will be included in the directory
+    # name and hence the index() call points to the wrong location
+    categories[$2] = $3;
+    for(i = 4; i <= NF; i = i + 1) {
+       categories[$2] = categories[$2] " " $i;
+    }
+    next;
 }
 
 /^comment /{
-       comment[$2] = substr($0, index($0, $3));
-       next;
+    comment[$2] = substr($0, index($0, $3));
+    next;
 }
 
 /^descr /{
-       descr[$2] = substr($0, index($0, $3));
-       next;
+    descr[$2] = substr($0, index($0, $3));
+    next;
 }
 
 /^homepage /{
-       if( NF>=3 ) {
-               homepage[$2] = substr($0, index($0, $3));
-       } else {
-               homepage[$2] = "";
-       }
-       next;
+    if( NF>=3 ) {
+       homepage[$2] = substr($0, index($0, $3));
+    } else {
+       homepage[$2] = "";
+    }
+    next;
 }
 
 /^index / {
@@ -158,39 +158,39 @@ BEGIN {
 #
 #      pkgname2dir[$3] = fulldir2pkgdir($2);
 #      pkgdir2name[fulldir2pkgdir($2)] = $3;
-       pkgname2dir[$3] = $2;
-       pkgdir2name[$2] = $3;
-       next;
+    pkgname2dir[$3] = $2;
+    pkgdir2name[$2] = $3;
+    next;
 }
 
 /^license /{
-       license[$2] = substr($0, index($0, $3));
-       next;
+    license[$2] = substr($0, index($0, $3));
+    next;
 }
 
 /^maintainer /{
-       maintainer[$2] = substr($0, index($0, $3));
-       next;
+    maintainer[$2] = substr($0, index($0, $3));
+    next;
 }
 
 /^notfor /{
-       notfor[$2] = substr($0, index($0, $3));
-       next;
+    notfor[$2] = substr($0, index($0, $3));
+    next;
 }
 
 /^onlyfor /{
-       onlyfor[$2] = substr($0, index($0, $3));
-       next;
+    onlyfor[$2] = substr($0, index($0, $3));
+    next;
 }
 
 /^prefix /{
-       prefix[$2] = substr($0, index($0, $3));
-       next;
+    prefix[$2] = substr($0, index($0, $3));
+    next;
 }
 
 /^wildcard /{
-       wildcard[$2] = substr($0, index($0, $3));
-       next;
+    wildcard[$2] = substr($0, index($0, $3));
+    next;
 }
 
 #
@@ -198,71 +198,71 @@ BEGIN {
 #
 
 END {
-       if( SORT == "" ) { SORT = "sort"; }
-        indexf = SORT " > INDEX";
-       if ( dependsfile == "" ) dependsfile = "/dev/null";
-       if ( builddependsfile == "" ) builddependsfile = "/dev/null";
-
-       printf("Flattening dependencies\n");
-       printf("") > dependsfile;
-       for (toppkg in topdepends){
-               if (debug) printf("calling find_all_depends(%s, run)\n", toppkg);
-               find_all_depends(toppkg, "run");
-               if (debug) printf("%s depends on: %s, topdepends on %s\n",
-                                 toppkg, alldepends[toppkg],
-                                 topdepends[toppkg]);
-               printf("%s depends on: %s\n",
-                      toppkg, alldepends[toppkg]) >> dependsfile;
-               flatdepends[toppkg] = alldepends[toppkg];
-       }
-       close(dependsfile);
+    if( SORT == "" ) { SORT = "sort"; }
+    indexf = SORT " > INDEX";
+    if ( dependsfile == "" ) dependsfile = "/dev/null";
+    if ( builddependsfile == "" ) builddependsfile = "/dev/null";
+
+    printf("Flattening dependencies\n");
+    printf("") > dependsfile;
+    for (toppkg in topdepends){
+       if (debug) printf("calling find_all_depends(%s, run)\n", toppkg);
+       find_all_depends(toppkg, "run");
+       if (debug) printf("%s depends on: %s, topdepends on %s\n",
+                         toppkg, alldepends[toppkg],
+                         topdepends[toppkg]);
+       printf("%s depends on: %s\n",
+              toppkg, alldepends[toppkg]) >> dependsfile;
+       flatdepends[toppkg] = alldepends[toppkg];
+    }
+    close(dependsfile);
 
 
 # clear out the flattened depends list and repeat for the build depends
-       for( pkg in alldepends) {
-               delete alldepends[pkg];
-       }
+    for( pkg in alldepends) {
+       delete alldepends[pkg];
+    }
+
+    printf("Flattening build dependencies\n");
+    printf("") > builddependsfile;
+    for (toppkg in topbuilddepends){
+       find_all_depends(toppkg, "build");
+       printf("%s build_depends on: %s\n",
+              toppkg, alldepends[toppkg]) >> builddependsfile;
+    }
+    close(builddependsfile);
 
-       printf("Flattening build dependencies\n");
-       printf("") > builddependsfile;
-       for (toppkg in topbuilddepends){
-               find_all_depends(toppkg, "build");
-               printf("%s build_depends on: %s\n",
-                      toppkg, alldepends[toppkg]) >> builddependsfile;
-       }
-       close(builddependsfile);
-
-       printf("Generating INDEX file\n");
+    printf("Generating INDEX file\n");
 
 # Output format:
 #  package-name|package-path|installation-prefix|comment| \
 #  description-file|maintainer|categories|build deps|run deps|for arch| \
 #  not for opsys|homepage
 
-       pkgcnt = 0;
-       for (toppkg in topdepends){
-               pkgcnt++;
-               printf("%s|", pkgdir2name[toppkg]) | indexf;
-               printf("%s|", toppkg) | indexf;
-               printf("%s|", prefix[toppkg]) | indexf;
-               printf("%s|", comment[toppkg]) | indexf;
-               printf("%s|", descr[toppkg]) | indexf;
-               printf("%s|", maintainer[toppkg]) | indexf;
-               printf("%s|", categories[toppkg]) | indexf;
-               gsub(/^ /, "", alldepends[toppkg]);
-               gsub(/ $/, "", alldepends[toppkg]);
-               printf("%s|", alldepends[toppkg]) | indexf;
-               gsub(/^ /, "", flatdepends[toppkg]);
-               gsub(/ $/, "", flatdepends[toppkg]);
-               printf("%s|", flatdepends[toppkg]) | indexf;
-               printf("%s|", onlyfor[toppkg]) | indexf;
-               printf("%s|", notfor[toppkg]) | indexf;
-               printf("%s", homepage[toppkg]) | indexf;
-               printf("\n") | indexf;
-       }
-       close(indexf);
-       printf("Indexed %d packages\n", pkgcnt);
-       exit 0;
+    pkgcnt = 0;
+    for (toppkg in topdepends){
+       pkgcnt++;
+       printf("%s|", pkgdir2name[toppkg]) | indexf;
+       printf("%s|", toppkg) | indexf;
+       printf("%s|", prefix[toppkg]) | indexf;
+       printf("%s|", comment[toppkg]) | indexf;
+       printf("%s|", descr[toppkg]) | indexf;
+       printf("%s|", maintainer[toppkg]) | indexf;
+       printf("%s|", categories[toppkg]) | indexf;
+       gsub(/^ /, "", alldepends[toppkg]);
+       gsub(/ $/, "", alldepends[toppkg]);
+       printf("%s|", alldepends[toppkg]) | indexf;
+       gsub(/^ /, "", flatdepends[toppkg]);
+       gsub(/ $/, "", flatdepends[toppkg]);
+       printf("%s|", flatdepends[toppkg]) | indexf;
+       printf("%s|", onlyfor[toppkg]) | indexf;
+       printf("%s|", notfor[toppkg]) | indexf;
+       printf("%s", homepage[toppkg]) | indexf;
+       printf("\n") | indexf;
+    }
+    close(indexf);
+    printf("Indexed %d packages\n", pkgcnt);
+    exit 0;
 }
 
 function find_all_depends(pkg, type, pkgreg, i, deps, depdir, topdep){
@@ -271,40 +271,40 @@ function find_all_depends(pkg, type, pkg
 #    printf("find_all_depends(%s, %s)\n", pkg, type);
 # if we find the package already has been fully depended
 # then return the depends list
-       if (pkg in alldepends){
-               if (debug) printf("\t%s is already depended.  Returning %s\n",
-                                 pkg, alldepends[pkg]);
-               return(alldepends[pkg]);
-       }
+    if (pkg in alldepends){
+       if (debug) printf("\t%s is already depended.  Returning %s\n",
+                         pkg, alldepends[pkg]);
+       return(alldepends[pkg]);
+    }
 
 # if this package has no top dependencies, enter an empty flat dependency
 # list for it.
-       if( type == "run" ) {
+    if( type == "run" ) {
 # we only want DEPENDS
-               topdep = topdepends[pkg];
-       } else {
+       topdep = topdepends[pkg];
+    } else {
 # we want BUILD_DEPENDS and DEPENDS
-               topdep = topdepends[pkg] " " topbuilddepends[pkg];
-       }
-       if (topdep ~ "^[ \t]*$") {
-               alldepends[pkg] = " ";
-               if (debug) printf("\t%s has no depends(%s).  Returning %s\n",
-                                 pkg, topdep, alldepends[pkg]);
-               return(alldepends[pkg]);
-       }
+       topdep = topdepends[pkg] " " topbuilddepends[pkg];
+    }
+    if (topdep ~ "^[ \t]*$") {
+       alldepends[pkg] = " ";
+       if (debug) printf("\t%s has no depends(%s).  Returning %s\n",
+                         pkg, topdep, alldepends[pkg]);
+       return(alldepends[pkg]);
+    }
 
 # recursively gather depends that each of the depends has
-       pkgreg = reg2str(pkg);
-       split(topdep, deps);
-       i = 1;
-       alldepends[pkg] = " ";
-       while ( i in deps ) {
+    pkgreg = reg2str(pkg);
+    split(topdep, deps);
+    i = 1;
+    alldepends[pkg] = " ";
+    while ( i in deps ) {
 
 # figure out the directory name associated with the package hame
 # in (wild card/dewey) version form
-               depdir = pat2dir[deps[i]];
-               if (debug) printf("\tadding dependency #%d on \"%s\" (%s)\n",
-                                 i, deps[i], depdir);
+       depdir = pat2dir[deps[i]];
+       if (debug) printf("\tadding dependency #%d on \"%s\" (%s)\n",
+                         i, deps[i], depdir);
 
 # do not add ourselves to the list (should not happen, but
 # we would like to not get stuck in a loop if one exists)
@@ -314,23 +314,23 @@ function find_all_depends(pkg, type, pkg
 # it.  However, we may have already added it because another package
 # we depend on may also have depended on
 # deps[i].
-               if (alldepends[pkg] !~ reg2str(deps[i])){
-                 alldepends[pkg] = alldepends[pkg] " " deps[i] " " find_all_depends(depdir, type);
-               }
-               else {
-                 if (debug) printf("\t%s is already listed in %s\n",
-                                   deps[i], alldepends[pkg]);
-               }
-
-               i = i + 1;
-       } # while i
-
-       if (debug) printf("\tcalling uniq() on alldepends[%s] = %s\n",
-                         pkg, alldepends[pkg]);
-       alldepends[pkg] = uniq(alldepends[pkg]);
-       if (debug) printf("\tuniq() output alldepends[%s] = %s\n",
-                         pkg, alldepends[pkg]);
-       return(alldepends[pkg]);
+       if (alldepends[pkg] !~ reg2str(deps[i])){
+           alldepends[pkg] = alldepends[pkg] " " deps[i] " " find_all_depends(depdir, type);
+       }
+       else {
+           if (debug) printf("\t%s is already listed in %s\n",
+                             deps[i], alldepends[pkg]);
+       }
+
+       i = i + 1;
+    } # while i
+
+    if (debug) printf("\tcalling uniq() on alldepends[%s] = %s\n",
+                     pkg, alldepends[pkg]);
+    alldepends[pkg] = uniq(alldepends[pkg]);
+    if (debug) printf("\tuniq() output alldepends[%s] = %s\n",
+                     pkg, alldepends[pkg]);
+    return(alldepends[pkg]);
 }
 
 #
@@ -339,14 +339,14 @@ function find_all_depends(pkg, type, pkg
 # we'll distinguish things like gnome from gnome-libs
 #
 function reg2str(reg){
-       gsub(/\./, "\\.", reg);
-       gsub(/\+/, "\\+", reg);
-       gsub(/\*/, "\\*", reg);
-       gsub(/\?/, "\\?", reg);
-       gsub(/\[/, "\\[", reg);
-       gsub(/\]/, "\\]", reg);
-       reg = " "reg" ";
-       return(reg);
+    gsub(/\./, "\\.", reg);
+    gsub(/\+/, "\\+", reg);
+    gsub(/\*/, "\\*", reg);
+    gsub(/\?/, "\\?", reg);
+    gsub(/\[/, "\\[", reg);
+    gsub(/\]/, "\\]", reg);
+    reg = " "reg" ";
+    return(reg);
 }
 
 #
@@ -354,8 +354,8 @@ function reg2str(reg){
 # and returns just the last 2 directories, like "math/scilab"
 #
 function fulldir2pkgdir(d, i){
-       i = match(d, /\/[^\/]+\/[^\/]+$/);
-       return substr(d, i + 1);
+    i = match(d, /\/[^\/]+\/[^\/]+$/);
+    return substr(d, i + 1);
 }
 
 #
@@ -364,19 +364,19 @@ function fulldir2pkgdir(d, i){
 function uniq(list, deps, i, ulist){
 
 # split out the depends
-       split(list, deps);
+    split(list, deps);
 
-       i = 1;
-       ulist = " ";
-       while (i in deps){
+    i = 1;
+    ulist = " ";
+    while (i in deps){
 #      printf("uniq():  Checking \"%s\"\n", ulist);
 #      printf("         for \"%s\"\n", reg2str(deps[i]));
-               if (ulist !~reg2str(deps[i])){
-                       ulist = ulist deps[i]" ";
-               }
-               i++;
+       if (ulist !~reg2str(deps[i])){
+           ulist = ulist deps[i]" ";
        }
-       return(ulist);
+       i++;
+    }
+    return(ulist);
 }