4 files changed, 58 insertions, 15 deletions
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index bbf11edc0221..53ba1ca653c9 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	dotfile-2.2
 CATEGORIES=	misc tk82
 MASTER_SITES=	ftp://ftp.imada.ou.dk/pub/dotfile/
 
-MAINTAINER=	oly@world.std.com
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/misc/dotfile/files/patch-ae b/misc/dotfile/files/patch-ae
index 23c3700f67d8..c80f05f3f37f 100644
--- a/misc/dotfile/files/patch-ae
+++ b/misc/dotfile/files/patch-ae
@@ -1,14 +1,39 @@
-*** configure.orig	Sun Feb 22 10:05:56 1998
---- configure	Sun Feb 22 10:06:13 1998
-***************
-*** 1427,1435 ****
-  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 ----------------------------------------------------------------------
---- 1427,1429 ----
+--- 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 ----------------------------------------------------------------------
diff --git a/misc/dotfile/files/patch-af b/misc/dotfile/files/patch-af
new file mode 100644
index 000000000000..4d47e3855499
--- /dev/null
+++ b/misc/dotfile/files/patch-af
@@ -0,0 +1,10 @@
+--- dotfile.orig	Sun Dec 21 05:40:27 1997
++++ dotfile	Sun Jan 30 19:31:01 2000
+@@ -23,6 +23,6 @@
+ 	echo "http://www.imada.ou.dk/~blackie/dotfile/"
+ 	echo ""
+ else
+-	exec /usr/local/bin/wish -f Generator/dotfile.tcl Generator Modules/$1 $2
++	exec /usr/local/bin/wish8.2 -f Generator/dotfile.tcl Generator Modules/$1 $2
+ fi
+ 
diff --git a/misc/dotfile/files/patch-ag b/misc/dotfile/files/patch-ag
new file mode 100644
index 000000000000..b504f1f9e803
--- /dev/null
+++ b/misc/dotfile/files/patch-ag
@@ -0,0 +1,8 @@
+--- Generator/makeHelp.orig	Sun Dec 21 05:40:27 1997
++++ Generator/makeHelp	Sun Jan 30 19:31:42 2000
+@@ -3,4 +3,4 @@
+ cp $1/help.html helpfile.data
+ echo "\n\n<h1>---------------</h1>" >> helpfile.data
+ cat $2 >> helpfile.data
+-wish $1/makeHelp.tcl helpfile.data generatedHelp $1
++wish8.2 $1/makeHelp.tcl helpfile.data generatedHelp $1