Update to 2.4.1

5 files changed, 2 insertions, 232 deletions

diff --git a/misc/dotfile/files/patch-aa b/misc/dotfile/files/patch-aa
index 102657d..8119571 100644
--- a/misc/dotfile/files/patch-aa
+++ b/misc/dotfile/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sun Dec 21 07:40:34 1997
-+++ Makefile.in	Wed Feb 25 20:49:29 1998
+--- Makefile.in.orig	Sat Feb 19 14:15:49 2000
++++ Makefile.in	Sat Jul 13 01:15:12 2002
 @@ -23,26 +23,11 @@
  SHELL = /bin/sh
  
@@ -27,35 +27,3 @@
  
  .PHONY: copydirs
  copydirs:
-@@ -58,7 +43,7 @@
- 	done
- 	cp dotfile.1 $(mandir)
- 	-@RM@ $(bindir)/dotfile
--	-@LN@ -s $(bindir)/dotfile-$(version) $(bindir)/dotfile
-+	-@LN@ -s dotfile-$(version) $(bindir)/dotfile
- 	chmod 755 $(bindir)/dotfile
- 	chmod 755 $(bindir)/dotfile-$(version)
- 
-@@ -68,11 +53,11 @@
- #
- # Targets that requre X (the modules using the fonts widget)
- #
--.PHONY fvwm1 fvwm2:
-+.PHONY: fvwm1 fvwm2
- fvwm1 fvwm2:
- 	@echo "----------------------------------------------------------------------"
- 	@echo "                           Byte compiling $@"
--	@if wish testwish; then \
-+	@if $(WISH) testwish; then \
- 	@WISH@ $(libdir)/Generator/dotfile.tcl $(libdir)/Generator $(libdir)/$@ bytecompile; \
- 	else \
- 	echo "An error should be shown above!"; \
-@@ -83,7 +68,7 @@
- #
- # Targets that may bytecompile without X
- #
--.PHONY emacs tcsh rtin bash elm procmail ipfwadm:
-+.PHONY: emacs tcsh rtin bash elm procmail ipfwadm
- emacs tcsh rtin bash elm procmail ipfwadm:
- 	@echo "----------------------------------------------------------------------"
- 	@echo "                           Byte compiling $@"
diff --git a/misc/dotfile/files/patch-ab b/misc/dotfile/files/patch-ab
deleted file mode 100644
index 97ebeb2..0000000
--- a/misc/dotfile/files/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
-*** configure.in.orig	Sun Dec 21 06:40:27 1997
---- configure.in	Sun Feb 22 09:55:53 1998
-***************
-*** 25,37 ****
-  dnl remove until the next comment line
-  dnl and rerun autoconf (or mail blackie@imada.ou.dk)
-  
-- echo "######################################################################"
-- echo "######################################################################"
-- echo If the configure script does not work, then please report to
-- echo blackie@imada.ou.dk, and edit configure.in.
-- echo "######################################################################"
-- echo "######################################################################"
-- 
-  AC_PATH_PROGS(WISHnew, wish8.0 wish4.2 wish4.1 wish4.0,no)
-  AC_PATH_PROGS(WISHnothing, wish, no)
-  if test "$WISHnew" != "no" -a "$WISHnothing" != "no"; then
---- 25,30 ----
-***************
-*** 53,68 ****
-    AC_PATH_PROGS(WISH, wish8.0 wish4.2 wish4.1 wish4.0 wish, no)
-    if test "$WISH" = no; then
-  	  AC_MSG_ERROR(I couldn't find 'wish' please insert it into your path and try again)
--   else
--     echo "####################################################################"
--     echo "####################################################################"
--     echo "                               WARNING"
--     echo "You do not have a link from wish to \"$WISH\"."
--     echo "This means that the executable dotfile does not work, when you"
--     echo "upgrade wish! In this case edit \"dotfile\" !"
--     echo "####################################################################"
--     echo "####################################################################"
--   fi
-  fi
-  dnl ############################################################
-  dnl The dotfile generator require tclsh, if it can not be found
---- 46,51 ----
-***************
-*** 134,142 ****
-  chmod 755 dotfile
-  chmod 755 Modules/fvwm2/fvwmrc_convert
-  
-- echo ----------------------------------------------------------------------
-- echo ----------------------------------------------------------------------
-- echo please login to your mail host, go to the directory Modules/procmail
-- echo and run ./configure from there.
-- echo ----------------------------------------------------------------------
-- echo ----------------------------------------------------------------------
---- 117,119 ----
diff --git a/misc/dotfile/files/patch-ac b/misc/dotfile/files/patch-ac
deleted file mode 100644
index 5e1ad0b..0000000
--- a/misc/dotfile/files/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-*** Modules/procmail/configure.in.orig	Sun Dec 21 07:40:33 1997
---- Modules/procmail/configure.in	Wed Feb 25 17:24:18 1998
-***************
-*** 13,27 ****
-  echo "----------------------------------------------------------------------"
-  
-  
-! AC_PATH_PROGS(TCLSH, tclsh7.6 tclsh7.5 tclsh7.4 tclsh, no)
-  if test "$TCLSH" = no; then
-          AC_MSG_ERROR(I couldn't find 'tclsh' please insert it into your pa
-  th and try again)
-- fi
-- 
-- AC_PATH_PROGS(FORMAIL, formail,)
-- if test "$FORMAIL" = ""; then
--   AC_MSG_ERROR(I couldn't find the program formail, it should be in the procmail distribution. Please insert it into the path.)
-  fi
-  
-  AC_PATH_PROGS(SED,sed,)
---- 13,22 ----
-  echo "----------------------------------------------------------------------"
-  
-  
-! AC_PATH_PROGS(TCLSH, tclsh8.2 tclsh7.6 tclsh7.5 tclsh7.4 tclsh, no)
-  if test "$TCLSH" = no; then
-          AC_MSG_ERROR(I couldn't find 'tclsh' please insert it into your pa
-  th and try again)
-  fi
-  
-  AC_PATH_PROGS(SED,sed,)
diff --git a/misc/dotfile/files/patch-ad b/misc/dotfile/files/patch-ad
deleted file mode 100644
index d814fa4..0000000
--- a/misc/dotfile/files/patch-ad
+++ /dev/null
@@ -1,80 +0,0 @@
-*** Modules/procmail/configure.orig	Sun Dec 21 07:40:33 1997
---- Modules/procmail/configure	Wed Feb 25 17:27:59 1998
-***************
-*** 519,537 ****
-  
-  
-  
-! echo "----------------------------------------------------------------------"
-! echo "----------------------------------------------------------------------"
-! echo "Please note that the configure script for procmail has to be run on"
-! echo "your mailhost! This is important, since the mailhost may have separate"
-! echo "file systems, and thus have other programs, than your current host!"
-! echo "If this is not your mail host, please rlogin to it and run"
-! echo "Modules/procmail/configure on it, or edit Modules/procmail/system.tcl"
-! echo "accordingly!"
-! echo "----------------------------------------------------------------------"
-! echo "----------------------------------------------------------------------"
-! 
-! 
-! for ac_prog in tclsh7.6 tclsh7.5 tclsh7.4 tclsh
-  do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-  set dummy $ac_prog; ac_word=$2
---- 519,525 ----
-  
-  
-  
-! for ac_prog in tclsh8.2 tclsh7.6 tclsh7.5 tclsh7.4 tclsh
-  do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-  set dummy $ac_prog; ac_word=$2
-***************
-*** 571,616 ****
-  if test "$TCLSH" = no; then
-          { echo "configure: error: I couldn't find 'tclsh' please insert it into your pa
-  th and try again" 1>&2; exit 1; }
-- fi
-- 
-- for ac_prog in formail
-- do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
-- set dummy $ac_prog; ac_word=$2
-- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-- echo "configure:582: checking for $ac_word" >&5
-- if eval "test \"`echo '$''{'ac_cv_path_FORMAIL'+set}'`\" = set"; then
--   echo $ac_n "(cached) $ac_c" 1>&6
-- else
--   case "$FORMAIL" in
--   /*)
--   ac_cv_path_FORMAIL="$FORMAIL" # Let the user override the test with a path.
--   ;;
--   *)
--   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--   for ac_dir in $PATH; do
--     test -z "$ac_dir" && ac_dir=.
--     if test -f $ac_dir/$ac_word; then
--       ac_cv_path_FORMAIL="$ac_dir/$ac_word"
--       break
--     fi
--   done
--   IFS="$ac_save_ifs"
--   ;;
-- esac
-- fi
-- FORMAIL="$ac_cv_path_FORMAIL"
-- if test -n "$FORMAIL"; then
--   echo "$ac_t""$FORMAIL" 1>&6
-- else
--   echo "$ac_t""no" 1>&6
-- fi
-- 
-- test -n "$FORMAIL" && break
-- done
-- 
-- if test "$FORMAIL" = ""; then
--   { echo "configure: error: I couldn't find the program formail" 1>&2; exit 1; }
-  fi
-  
-  for ac_prog in sed
---- 559,564 ----
diff --git a/misc/dotfile/files/patch-ae b/misc/dotfile/files/patch-ae
deleted file mode 100644
index c80f05f..0000000
--- a/misc/dotfile/files/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig	Sun Dec 21 05:40:27 1997
-+++ configure	Sun Jan 30 19:30:22 2000
-@@ -538,7 +538,7 @@
- echo "######################################################################"
- echo "######################################################################"
- 
--for ac_prog in wish8.0 wish4.2 wish4.1 wish4.0
-+for ac_prog in wish8.2 wish8.0 wish4.2 wish4.1 wish4.0
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -660,7 +660,7 @@
- fi
- 
- if test "$WISH" = ""; then
--  for ac_prog in wish8.0 wish4.2 wish4.1 wish4.0 wish
-+  for ac_prog in wish8.2 wish8.0 wish4.2 wish4.1 wish4.0 wish
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -710,7 +710,7 @@
-     echo "####################################################################"
-   fi
- fi
--for ac_prog in tclsh8.0 tclsh7.6 tclsh7.5 tclsh7.4 tclsh
-+for ac_prog in tclsh8.2 tclsh8.0 tclsh7.6 tclsh7.5 tclsh7.4 tclsh
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -1427,9 +1427,3 @@
- chmod 755 dotfile
- chmod 755 Modules/fvwm2/fvwmrc_convert
- 
--echo ----------------------------------------------------------------------
--echo ----------------------------------------------------------------------
--echo please login to your mail host, go to the directory Modules/procmail
--echo and run ./configure from there.
--echo ----------------------------------------------------------------------
--echo ----------------------------------------------------------------------