3 files changed, 20 insertions, 17 deletions
diff --git a/slackware64/ap/maketag b/slackware64/ap/maketag
index c49ab3c1..0155925a 100644
--- a/slackware64/ap/maketag
+++ b/slackware64/ap/maketag
@@ -17,7 +17,6 @@ done." 22 72 12 \
 "amp" "A command-line MP3 player" "on" \
 "ash" "A small /bin/sh type shell" "on" \
 "at" "Schedule commands to execute at a later time" "on" \
-"aumix" "Audio mixer for the console or X" "on" \
 "bc" "GNU bc - arbitrary precision math language" "on" \
 "bpe" "Binary Patch (file) Editor" "on" \
 "cdparanoia" "Cdparanoia CD audio ripper" "on" \
@@ -33,7 +32,7 @@ done." 22 72 12 \
 "enscript" "A text to PostScript utility" "on" \
 "flac" "Free Lossless Audio Codec" "on" \
 "foomatic-filters" "Print filter for gutenprint and hplip" "on" \
-"ghostscript" "GPL Ghostscript PS/PDF interpreter" "on" \
+"ghostscript" "Ghostscript PS/PDF interpreter" "on" \
 "ghostscript-fonts-std" "Ghostscript Type1 fonts" "on" \
 "gphoto2" "A command-line camera client for libgphoto2" "on" \
 "groff" "GNU groff document formatting system" "on" \
@@ -41,6 +40,7 @@ done." 22 72 12 \
 "hplip" "HP printing and scanning software" "on" \
 "htop" "An ncurses-based process viewer" "on" \
 "ispell" "The International version of ispell" "on" \
+"itstool" "Translate XML documents with PO files" "on" \
 "jed" "JED programmer's editor" "on" \
 "joe" "joe text editor" "on" \
 "jove" "Jonathan's Own Version of Emacs text editor" "on" \
@@ -54,17 +54,16 @@ done." 22 72 12 \
 "madplay" "MPEG audio player" "on" \
 "man" "Primary tool for reading online documentation" "on" \
 "man-pages" "Online documentation (requires groff)" "on" \
+"mariadb" "An enhanced, drop-in replacement for MySQL" "on" \
 "mc" "The Midnight Commander file manager" "on" \
 "moc" "A music player for the console" "on" \
 "most" "A pager, like 'more' or 'less'" "on" \
 "mpg123" "A command-line MP3 player" "on" \
-"mysql" "MySQL database server" "on" \
 "nano" "A simple editor with the look and feel of Pico" "on" \
 "normalize" "Normalize audio file volume" "on" \
 "pm-utils" "Power management utilities" "on" \
 "powertop" "PowerTOP system energy usage utility" "on" \
 "radeontool" "Utility for laptops with a Radeon chipset" "on" \
-"rexima" "Small console audio mixer" "on" \
 "rpm" "RPM package tool (unsupported)" "on" \
 "rzip" "A large file compression utility" "on" \
 "sc" "The 'sc' spreadsheet" "on" \
@@ -76,7 +75,9 @@ done." 22 72 12 \
 "sqlite" "A small SQL database server and library" "on" \
 "sudo" "Allow special users limited root access" "on" \
 "sysstat" "System performance monitoring tools" "on" \
+"terminus-font" "a clean fixed width font" "on" \
 "texinfo" "GNU texinfo documentation system" "on" \
+"tmux" "terminal multiplexer" "on" \
 "vbetool" "Video BIOS execution tool" "on" \
 "vim" "Improved vi clone" "on" \
 "vorbis-tools" "Ogg Vorbis encoder, player, and utilities" "on" \
@@ -88,7 +89,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell itstool jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mariadb mc moc most mpg123 nano normalize pm-utils powertop radeontool rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat terminus-font texinfo tmux vbetool vim vorbis-tools workbone xfsdump zsh \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -96,9 +97,9 @@ a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd dd
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell itstool jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mariadb mc moc most mpg123 nano normalize pm-utils powertop radeontool rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat terminus-font texinfo tmux vbetool vim vorbis-tools workbone xfsdump zsh \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/ap/maketag.ez b/slackware64/ap/maketag.ez
index c49ab3c1..0155925a 100644
--- a/slackware64/ap/maketag.ez
+++ b/slackware64/ap/maketag.ez
@@ -17,7 +17,6 @@ done." 22 72 12 \
 "amp" "A command-line MP3 player" "on" \
 "ash" "A small /bin/sh type shell" "on" \
 "at" "Schedule commands to execute at a later time" "on" \
-"aumix" "Audio mixer for the console or X" "on" \
 "bc" "GNU bc - arbitrary precision math language" "on" \
 "bpe" "Binary Patch (file) Editor" "on" \
 "cdparanoia" "Cdparanoia CD audio ripper" "on" \
@@ -33,7 +32,7 @@ done." 22 72 12 \
 "enscript" "A text to PostScript utility" "on" \
 "flac" "Free Lossless Audio Codec" "on" \
 "foomatic-filters" "Print filter for gutenprint and hplip" "on" \
-"ghostscript" "GPL Ghostscript PS/PDF interpreter" "on" \
+"ghostscript" "Ghostscript PS/PDF interpreter" "on" \
 "ghostscript-fonts-std" "Ghostscript Type1 fonts" "on" \
 "gphoto2" "A command-line camera client for libgphoto2" "on" \
 "groff" "GNU groff document formatting system" "on" \
@@ -41,6 +40,7 @@ done." 22 72 12 \
 "hplip" "HP printing and scanning software" "on" \
 "htop" "An ncurses-based process viewer" "on" \
 "ispell" "The International version of ispell" "on" \
+"itstool" "Translate XML documents with PO files" "on" \
 "jed" "JED programmer's editor" "on" \
 "joe" "joe text editor" "on" \
 "jove" "Jonathan's Own Version of Emacs text editor" "on" \
@@ -54,17 +54,16 @@ done." 22 72 12 \
 "madplay" "MPEG audio player" "on" \
 "man" "Primary tool for reading online documentation" "on" \
 "man-pages" "Online documentation (requires groff)" "on" \
+"mariadb" "An enhanced, drop-in replacement for MySQL" "on" \
 "mc" "The Midnight Commander file manager" "on" \
 "moc" "A music player for the console" "on" \
 "most" "A pager, like 'more' or 'less'" "on" \
 "mpg123" "A command-line MP3 player" "on" \
-"mysql" "MySQL database server" "on" \
 "nano" "A simple editor with the look and feel of Pico" "on" \
 "normalize" "Normalize audio file volume" "on" \
 "pm-utils" "Power management utilities" "on" \
 "powertop" "PowerTOP system energy usage utility" "on" \
 "radeontool" "Utility for laptops with a Radeon chipset" "on" \
-"rexima" "Small console audio mixer" "on" \
 "rpm" "RPM package tool (unsupported)" "on" \
 "rzip" "A large file compression utility" "on" \
 "sc" "The 'sc' spreadsheet" "on" \
@@ -76,7 +75,9 @@ done." 22 72 12 \
 "sqlite" "A small SQL database server and library" "on" \
 "sudo" "Allow special users limited root access" "on" \
 "sysstat" "System performance monitoring tools" "on" \
+"terminus-font" "a clean fixed width font" "on" \
 "texinfo" "GNU texinfo documentation system" "on" \
+"tmux" "terminal multiplexer" "on" \
 "vbetool" "Video BIOS execution tool" "on" \
 "vim" "Improved vi clone" "on" \
 "vorbis-tools" "Ogg Vorbis encoder, player, and utilities" "on" \
@@ -88,7 +89,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell itstool jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mariadb mc moc most mpg123 nano normalize pm-utils powertop radeontool rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat terminus-font texinfo tmux vbetool vim vorbis-tools workbone xfsdump zsh \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -96,9 +97,9 @@ a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd dd
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-a2ps acct alsa-utils amp ash at aumix bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mc moc most mpg123 mysql nano normalize pm-utils powertop radeontool rexima rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat texinfo vbetool vim vorbis-tools workbone xfsdump zsh \
+a2ps acct alsa-utils amp ash at bc bpe cdparanoia cdrdao cdrtools dc3dd ddrescue diffstat diffutils dmapi dmidecode dvd+rw-tools enscript flac foomatic-filters ghostscript ghostscript-fonts-std gphoto2 groff gutenprint hplip htop ispell itstool jed joe jove ksh93 libx86 linuxdoc-tools lm_sensors lsof lsscsi lxc madplay man man-pages mariadb mc moc most mpg123 nano normalize pm-utils powertop radeontool rpm rzip sc screen seejpeg slackpkg soma sox sqlite sudo sysstat terminus-font texinfo tmux vbetool vim vorbis-tools workbone xfsdump zsh \
  ; do
- if fgrep \"$PACKAGE\" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
+ if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
  else
   echo "$PACKAGE: SKP" >> $TMP/SeTnewtag
diff --git a/slackware64/ap/tagfile b/slackware64/ap/tagfile
index 21b386f5..55155219 100644
--- a/slackware64/ap/tagfile
+++ b/slackware64/ap/tagfile
@@ -4,7 +4,6 @@ alsa-utils:REC
 amp:OPT
 ash:OPT
 at:OPT
-aumix:OPT
 bc:OPT
 bpe:OPT
 cdparanoia:OPT
@@ -28,6 +27,7 @@ gutenprint:OPT
 hplip:REC
 htop:REC
 ispell:OPT
+itstool:REC
 jed:OPT
 joe:OPT
 jove:OPT
@@ -41,17 +41,16 @@ lxc:OPT
 madplay:OPT
 man:ADD
 man-pages:REC
+mariadb:OPT
 mc:OPT
 moc:OPT
 most:OPT
 mpg123:OPT
-mysql:OPT
 nano:REC
 normalize:OPT
 pm-utils:OPT
 powertop:OPT
 radeontool:REC
-rexima:REC
 rpm:OPT
 rzip:OPT
 sc:OPT
@@ -63,7 +62,9 @@ sox:REC
 sqlite:OPT
 sudo:OPT
 sysstat:OPT
+terminus-font:REC
 texinfo:REC
+tmux:REC
 vbetool:REC
 vim:REC
 vorbis-tools:OPT