From bd2d8af56a5639aa3d6565670ac940ce5391839e Mon Sep 17 00:00:00 2001 From: gdr-ftp Date: Sat, 3 Jul 1999 16:55:42 +0000 Subject: [PATCH] Makefile: nulib is dumping an extraneous "-^H" to stdout, so dump stdout to /dev/null mkgen, mkindex, view.html: added "productivity" as a category mkindex: added a concheck for .index.src entries that aren't using the describe(1) info --- doc/describe/.cvsignore | 3 +++ doc/describe/Makefile | 10 +++++++--- doc/describe/mkgen | 4 +++- doc/describe/mkindex | 27 ++++++++++++++++++++++++++- doc/describe/view.html | 4 +++- 5 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 doc/describe/.cvsignore diff --git a/doc/describe/.cvsignore b/doc/describe/.cvsignore new file mode 100644 index 0000000..c0af534 --- /dev/null +++ b/doc/describe/.cvsignore @@ -0,0 +1,3 @@ +xref.db +README.src +tmp diff --git a/doc/describe/Makefile b/doc/describe/Makefile index e245987..1300bed 100644 --- a/doc/describe/Makefile +++ b/doc/describe/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.6 1999/01/29 07:03:56 gdr-ftp Exp $ +# $Id: Makefile,v 1.7 1999/07/03 16:55:41 gdr-ftp Exp $ # # Devin Reade, January 1998 # @@ -72,6 +72,8 @@ MODE_X = -m775 $(RELDIR)/$(RELEASE_README): $(README_OUT) install $(OWNER) $(MODE_F) $(README_OUT) $@ +# We redirect nulib stdout to /dev/null because for some reason +# it's printing out a "-^H". $(RELDIR)/$(RELEASE_SRC): $(DB_SRC) @echo "installing $@"; \ cp $(DB_SRC) $(TDIR); \ @@ -79,9 +81,11 @@ $(RELDIR)/$(RELEASE_SRC): $(DB_SRC) rm -f $@; \ cd $(TDIR); \ rm -f $(RELEASE_SRC); \ - nulib cf $(RELEASE_SRC) $(DB_SRC); \ + nulib cf $(RELEASE_SRC) $(DB_SRC) > /dev/null; \ install $(OWNER) $(MODE_F) $(RELEASE_SRC) $@ +# We redirect nulib stdout to /dev/null because for some reason +# it's printing out a "-^H". $(RELDIR)/$(RELEASE_DB): $(DB_SRC) @echo "installing $@"; \ /usr/local/sbin/descc $(DB_SRC); \ @@ -89,7 +93,7 @@ $(RELDIR)/$(RELEASE_DB): $(DB_SRC) cd $(TDIR); \ NULIBOPT=type=BIN; export NULIBOPT; \ rm -f $(RELEASE_DB); \ - nulib cf $(RELEASE_DB) describe.db; \ + nulib cf $(RELEASE_DB) describe.db > /dev/null; \ install $(OWNER) $(MODE_F) $(RELEASE_DB) $@ web: setup diff --git a/doc/describe/mkgen b/doc/describe/mkgen index de8b069..49a8456 100755 --- a/doc/describe/mkgen +++ b/doc/describe/mkgen @@ -5,7 +5,7 @@ # # Devin Reade, January 1998. # -# $Id: mkgen,v 1.4 1999/01/29 07:03:57 gdr-ftp Exp $ +# $Id: mkgen,v 1.5 1999/07/03 16:55:42 gdr-ftp Exp $ # $gnohome_internal = "/home/gno/public_html"; @@ -53,6 +53,7 @@ $categoryMap{"gno/mail"} = "mail"; $categoryMap{"gno/network"} = "network"; $categoryMap{"gno/news"} = "news"; $categoryMap{"gno/patches"} = "patch"; +$categoryMap{"gno/productivity"} = "productivity"; $categoryMap{"gno/programming"} = "prog"; $categoryMap{"gno/scripting"} = "script"; $categoryMap{"gno/shells"} = "shells"; @@ -81,6 +82,7 @@ $categoryNames{"mail"} = "Mail Readers"; $categoryNames{"network"} = "Networking Utilities"; $categoryNames{"news"} = "News Readers"; $categoryNames{"patch"} = "Patch Programs"; +$categoryNames{"productivity"} = "Productivity"; $categoryNames{"prog"} = "Programming Utilities"; $categoryNames{"script"} = "Scripting Utilities"; $categoryNames{"shells"} = "Shells"; diff --git a/doc/describe/mkindex b/doc/describe/mkindex index a0b4bb2..c625110 100755 --- a/doc/describe/mkindex +++ b/doc/describe/mkindex @@ -6,11 +6,12 @@ # # Devin Reade, January 1998 # -# $Id: mkindex,v 1.3 1999/04/05 19:56:02 gdr-ftp Exp $ +# $Id: mkindex,v 1.4 1999/07/03 16:55:42 gdr-ftp Exp $ # $dirroot = "/ftp/pub/apple2/gs.specific"; $dirlist = "gno orca"; +$describe = '/usr/local/bin/describe'; # This is a list of describe entries which we want to force into a # given category. This should only be used when a utility doesn't have @@ -41,6 +42,7 @@ $fudgelist{"binprint"} = "gno/editors"; $fudgelist{"blist"} = "gno/editors"; $fudgelist{"cal"} = "gno/games"; $fudgelist{"cat"} = "gno/editors"; +$fudgelist{"center"} = "gno/text.utils"; $fudgelist{"chtyp"} = "gno/file.manip"; $fudgelist{"cksum"} = "gno/archive"; $fudgelist{"cmp"} = "gno/text.utils"; @@ -78,6 +80,21 @@ $fudgelist{"removerez"} = "gno/file.convert"; $fudgelist{"rlogin"} = "gno/network"; $fudgelist{"rsh"} = "gno/network"; $fudgelist{"rtf2text"} = "gno/file.convert"; +$fudgelist{"sed"} = "gno/editors"; +$fudgelist{"sendmail"} = "gno/mail"; +$fudgelist{"sleep"} = "gno/scripting"; +$fudgelist{"su"} = "gno/sysadmin"; +$fudgelist{"syslogd"} = "gno/daemons"; +$fudgelist{"sz"} = "gno/comm"; +# $fudgelist{"tr"} = "gno/text.utils"; +# $fudgelist{"trek"} = "gno/games"; +$fudgelist{"true"} = "gno/scripting"; +$fudgelist{"uniq"} = "gno/text.utils"; +$fudgelist{"uptimed"} = "gno/daemons"; +$fudgelist{"wc"} = "gno/text.utils"; +$fudgelist{"who"} = "gno/sys"; +$fudgelist{"whois"} = "gno/sys"; +$fudgelist{"yes"} = "gno/scripting"; # # Get the list of .index.src files. We will look in here for references @@ -139,6 +156,14 @@ foreach $k (@keylist) { $s = ':' . $fudgelist{$k} . ':'; } else { $s = ':unsorted:'; + $result = system("$describe $k > /dev/null") / 256; + if ($result == 0) { + printf(stderr + "WARNING: '$k' is showing up as 'unsorted', but has ". + "a describe(1) entry.\n\tThis probably means that the ". + ".index.src file is not using an\n\texisting". + "describe entry.\n", $k); + } } } elsif (defined($fudgelist{$k})) { printf(stderr diff --git a/doc/describe/view.html b/doc/describe/view.html index 2b584b5..3677ee6 100644 --- a/doc/describe/view.html +++ b/doc/describe/view.html @@ -1,4 +1,4 @@ - + Back to the Describe Database PageNetworking Utilities.
  • News Readers.
  • Patch Programs. +
  • Personal Productivity + (calculators, calendars, etc)
  • Programming Utilities.
  • Scripting Utilities.
  • Shells.