5 files changed, 94 insertions, 16 deletions
diff --git a/slackware64/xfce/install-packages b/slackware64/xfce/install-packages
new file mode 100755
index 000000000..3232fb680
--- /dev/null
+++ b/slackware64/xfce/install-packages
@@ -0,0 +1,73 @@
+#!/bin/sh
+# Copyright 2002  Slackware Linux, Inc., Concord, CA, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This is a simple script to install a package series from the command line.
+# If you're already running Slackware, you can just run this script to install
+# the packages.
+#
+# I originally got the idea for this tool because Slackware with both KDE and
+# GNOME doesn't fit on a single CD-ROM anymore, so I wanted to provide a quick
+# way to add a series later on with the same ease as the initial installation.
+#
+# To use this script, just run it as root in the current directory like this:
+#
+# ./install-packages
+#
+# Note that this script does not make any attempt to remove or upgrade existing
+# packages.  If you want to upgrade an existing installation, you will be better
+# served using the pkgtools directly.  Here's how to upgrade all the packages in
+# this series:
+#
+# upgradepkg *.t?z  (upgrades already installed packages)
+# installpkg *.t?z  (installs all packages, to make sure new ones are installed)
+#
+# If you upgrade a series like this, afterwards you might need to merge over any
+# required changes in the new config files, which will have the suffix .new.
+# These can be found like this:
+#
+# find / -name "*.new"
+#
+# OK, on with the show!  Enjoy!  :-)
+#
+# Patrick Volkerding <volkerdi@slackware.com>
+
+# Use the existing maketag script to provide a package selection menu:
+sh maketag
+
+# Quick bail if nothing was requested:
+if grep ADD /var/log/setup/tmp/SeTnewtag 1> /dev/null 2> /dev/null ; then
+  true
+else
+  rm -f /var/log/setup/tmp/SeTnewtag
+  exit
+fi
+
+# Install the selected packages:
+for PKG in *.t?z ; do
+  if [ ! "$ROOT" = "" ]; then
+    installpkg -root $ROOT -infobox -tagfile /var/log/setup/tmp/SeTnewtag $PKG
+  else
+    installpkg -infobox -tagfile /var/log/setup/tmp/SeTnewtag $PKG
+  fi
+done
+rm -f /var/log/setup/tmp/SeTnewtag
+echo
+echo "Done installing packages."
diff --git a/slackware64/xfce/install.end b/slackware64/xfce/install.end
new file mode 100644
index 000000000..67eb307dd
--- /dev/null
+++ b/slackware64/xfce/install.end
@@ -0,0 +1,14 @@
+#SERIES_LAST_DIRECTORY
+
+This file must be present to signal to 'setup' that this is the last
+directory in this package series.  It serves no other purpose, other than
+to make you curious enough to use rot13 to read the rest of it (_at your
+own risk!_ :)
+
+Sbe vasbezngvba nobhg trggvat "Obo" va lbhe yvsr, cyrnfr ivfvg:
+
+        Puhepu bs gur FhoTravhf
+        uggc://jjj.fhotravhf.pbz
+
+Qba'g fnl lbh jrer abg jnearq jura gur Kvfgf pbzr sbe lbh.
+
diff --git a/slackware64/xfce/maketag b/slackware64/xfce/maketag
index e284e1e70..e59e13843 100644
--- a/slackware64/xfce/maketag
+++ b/slackware64/xfce/maketag
@@ -17,35 +17,32 @@ Press ENTER when you are done." \
 "gtk-xfce-engine" "Xfce Gtk+ engines" "on" \
 "libxfce4ui" "Xfce widget library" "on" \
 "libxfce4util" "basic utility library for Xfce" "on" \
-"libxfcegui4" "old Xfce widget library" "on" \
 "orage" "Xfce's calendar" "on" \
 "thunar-volman" "Thunar Volume Manager for Xfce" "on" \
 "tumbler" "thumbnail generator" "on" \
 "xfce4-appfinder" "Application finder" "on" \
 "xfce4-clipman-plugin" "clipman plugin for the Xfce panel" "on" \
 "xfce4-dev-tools" "Xfce development tools" "on" \
-"xfce4-mixer" "Sound mixer applet for Xfce" "on" \
 "xfce4-notifyd" "xfce libnotify daemon" "on" \
 "xfce4-panel" "panel for Xfce" "on" \
 "xfce4-power-manager" "Power Management daemon for Xfce" "on" \
+"xfce4-pulseaudio-plugin" "PulseAudio plugin for Xfce panel" "on" \
 "xfce4-screenshooter" "screenshooter plugin for Xfce" "on" \
 "xfce4-session" "Xfce session manager" "on" \
 "xfce4-settings" "Xfce settings manager" "on" \
 "xfce4-systemload-plugin" "systemload plugin for the Xfce panel" "on" \
 "xfce4-taskmanager" "running apps / task manager application" "on" \
 "xfce4-terminal" "Xfce's Terminal Emulator" "on" \
-"xfce4-volumed" "audio volume management daemon" "on" \
 "xfce4-weather-plugin" "weather plugin for the Xfce panel" "on" \
 "xfconf" "Xfce configuration storage system" "on" \
 "xfdesktop" "Xfce desktop manager" "on" \
 "xfwm4" "Xfce Window Manager" "on" \
-"xfwm4-themes" "themes for the Xfce window manager" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
+Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-pulseaudio-plugin xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-weather-plugin xfconf xfdesktop xfwm4 \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -53,7 +50,7 @@ Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thun
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
+Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-pulseaudio-plugin xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-weather-plugin xfconf xfdesktop xfwm4 \
  ; do
  if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/xfce/maketag.ez b/slackware64/xfce/maketag.ez
index e284e1e70..e59e13843 100644
--- a/slackware64/xfce/maketag.ez
+++ b/slackware64/xfce/maketag.ez
@@ -17,35 +17,32 @@ Press ENTER when you are done." \
 "gtk-xfce-engine" "Xfce Gtk+ engines" "on" \
 "libxfce4ui" "Xfce widget library" "on" \
 "libxfce4util" "basic utility library for Xfce" "on" \
-"libxfcegui4" "old Xfce widget library" "on" \
 "orage" "Xfce's calendar" "on" \
 "thunar-volman" "Thunar Volume Manager for Xfce" "on" \
 "tumbler" "thumbnail generator" "on" \
 "xfce4-appfinder" "Application finder" "on" \
 "xfce4-clipman-plugin" "clipman plugin for the Xfce panel" "on" \
 "xfce4-dev-tools" "Xfce development tools" "on" \
-"xfce4-mixer" "Sound mixer applet for Xfce" "on" \
 "xfce4-notifyd" "xfce libnotify daemon" "on" \
 "xfce4-panel" "panel for Xfce" "on" \
 "xfce4-power-manager" "Power Management daemon for Xfce" "on" \
+"xfce4-pulseaudio-plugin" "PulseAudio plugin for Xfce panel" "on" \
 "xfce4-screenshooter" "screenshooter plugin for Xfce" "on" \
 "xfce4-session" "Xfce session manager" "on" \
 "xfce4-settings" "Xfce settings manager" "on" \
 "xfce4-systemload-plugin" "systemload plugin for the Xfce panel" "on" \
 "xfce4-taskmanager" "running apps / task manager application" "on" \
 "xfce4-terminal" "Xfce's Terminal Emulator" "on" \
-"xfce4-volumed" "audio volume management daemon" "on" \
 "xfce4-weather-plugin" "weather plugin for the Xfce panel" "on" \
 "xfconf" "Xfce configuration storage system" "on" \
 "xfdesktop" "Xfce desktop manager" "on" \
 "xfwm4" "Xfce Window Manager" "on" \
-"xfwm4-themes" "themes for the Xfce window manager" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
+Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-pulseaudio-plugin xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-weather-plugin xfconf xfdesktop xfwm4 \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -53,7 +50,7 @@ Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thun
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util libxfcegui4 orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-mixer xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-volumed xfce4-weather-plugin xfconf xfdesktop xfwm4 xfwm4-themes \
+Thunar exo garcon gtk-xfce-engine libxfce4ui libxfce4util orage thunar-volman tumbler xfce4-appfinder xfce4-clipman-plugin xfce4-dev-tools xfce4-notifyd xfce4-panel xfce4-power-manager xfce4-pulseaudio-plugin xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-taskmanager xfce4-terminal xfce4-weather-plugin xfconf xfdesktop xfwm4 \
  ; do
  if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/xfce/tagfile b/slackware64/xfce/tagfile
index bf3b5efdc..3dcc647ec 100644
--- a/slackware64/xfce/tagfile
+++ b/slackware64/xfce/tagfile
@@ -4,26 +4,23 @@ garcon:REC
 gtk-xfce-engine:REC
 libxfce4ui:REC
 libxfce4util:REC
-libxfcegui4:REC
 orage:REC
 thunar-volman:REC
 tumbler:REC
 xfce4-appfinder:REC
 xfce4-clipman-plugin:REC
 xfce4-dev-tools:REC
-xfce4-mixer:REC
 xfce4-notifyd:REC
 xfce4-panel:REC
 xfce4-power-manager:REC
+xfce4-pulseaudio-plugin:ADD
 xfce4-screenshooter:REC
 xfce4-session:REC
 xfce4-settings:REC
 xfce4-systemload-plugin:REC
 xfce4-taskmanager:REC
 xfce4-terminal:REC
-xfce4-volumed:REC
 xfce4-weather-plugin:REC
 xfconf:REC
 xfdesktop:REC
 xfwm4:REC
-xfwm4-themes:REC