Update this package to dotfile-2.4.1, and adapt it to tk-8.3.2.

While there, make it no longer be INTERACTIVE, and add a BUILD_DEF,
DOTFILE_LANG, to support making Japanese or English the default language.

4 files changed, 130 insertions, 94 deletions

diff --git a/misc/dotfile/patches/patch-01 b/misc/dotfile/patches/patch-01
deleted file mode 100644
index 0379075dffb..00000000000
--- a/misc/dotfile/patches/patch-01
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-01,v 1.2 1998/08/07 11:10:16 agc Exp $
-
---- Makefile.in.orig	Fri Jan 31 13:10:25 1997
-+++ Makefile.in	Thu Apr  3 19:02:57 1997
-@@ -15,7 +15,7 @@
- bindir = $(exec_prefix)/bin
- 
- # Directory in which to install library files.
--libdir = $(prefix)/lib/dotfile-$(version)
-+libdir = $(prefix)/share/dotfile-$(version)
- # Directory for the manual page
- mandir = $(prefix)/man/man1
- 
-@@ -23,7 +23,6 @@
- SHELL = /bin/sh
- 
- ### Tell the user that there is nothing to be compiled.
--.PHONY: nothing
- nothing:
- 	@echo "The Dotfile Generator does not contain any files which has to be compiled!"
- 	@echo "On the other hand, during installation, all the modules need to be"
-@@ -32,10 +31,8 @@
- #
- # install all the files in the corect places.
- #
--.PHONY:	install
- install: copydirs bytecompile
- 
--.PHONY: copydirs
- copydirs:
- 	$(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(libdir) \
- 	$(libdir)/Generator $(mandir)
-@@ -49,20 +46,18 @@
- 	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)
- 
--.PHONY: bytecompile
- bytecompile: $(MODULES)
- 
- #
- # Targets that requre X (the modules using the fonts widget)
- #
--.PHONY fvwm1 fvwm2:
- fvwm1 fvwm2:
--	@if wish testwish; then \
--	@WISH@ $(libdir)/Generator/dotfile.tcl $(libdir)/Generator $(libdir)/$@ bytecompile; \
-+	@if $(WISH) testwish; then \
-+	$(WISH) $(libdir)/Generator/dotfile.tcl $(libdir)/Generator $(libdir)/$@ bytecompile; \
- 	else \
- 	echo "An error should be shown above!"; \
- 	echo "You need X to bytecompile the $@ module, do this manually after"; \
-@@ -72,13 +67,11 @@
- #
- # Targets that may bytecompile without X
- #
--.PHONY emacs tcsh rtin bash elm:
- emacs tcsh rtin bash elm:
- 	@@TCLSH@ $(libdir)/Generator/dotfile.tcl $(libdir)/Generator $(libdir)/$@ bytecompile
- 
- #
- # Clean
- #
--.PHONY:	clean
- clean :
- 	@echo Nothing to do
diff --git a/misc/dotfile/patches/patch-02 b/misc/dotfile/patches/patch-02
deleted file mode 100644
index 3da107e1cd6..00000000000
--- a/misc/dotfile/patches/patch-02
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-02,v 1.2 1998/08/07 11:10:16 agc Exp $
-
-Change for tcl/tk V8.0 - hubertf
-
---- configure.BAK	Thu Oct 23 20:31:32 1997
-+++ configure	Thu Oct 23 20:31:43 1997
-@@ -399,7 +399,7 @@
- 
- 
- 
--for ac_prog in wish4.2 wish4.1 wish4.0 wish
-+for ac_prog in 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
-@@ -439,7 +439,7 @@
- 	{ echo "configure: error: I couldn't find 'wish' please insert it into your path and try again" 1>&2; exit 1; }
- fi
- 
--for ac_prog in tclsh7.6 tclsh7.5 tclsh7.4 tclsh
-+for ac_prog in 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
diff --git a/misc/dotfile/patches/patch-aa b/misc/dotfile/patches/patch-aa
new file mode 100644
index 00000000000..bce8957f85c
--- /dev/null
+++ b/misc/dotfile/patches/patch-aa
@@ -0,0 +1,85 @@
+$NetBSD: patch-aa,v 1.1 2000/08/31 19:14:05 jwise Exp $
+--- Makefile.in.orig	Sat Feb 19 14:15:49 2000
++++ Makefile.in	Thu Aug 31 14:44:28 2000
+@@ -15,7 +15,7 @@
+ bindir = $(exec_prefix)/bin
+ 
+ # Directory in which to install library files.
+-libdir = $(prefix)/lib/dotfile-$(version)
++libdir = $(prefix)/share/dotfile-$(version)
+ # Directory for the manual page
+ mandir = $(prefix)/man/man1
+ 
+@@ -23,28 +23,13 @@
+ SHELL = /bin/sh
+ 
+ ### Tell the user that there is nothing to be compiled.
+-.PHONY: nothing
+ nothing:
+-	@echo ----------------------------------------------------------------------
+-	@echo ----------------------------------------------------------------------
+-	@echo "The Dotfile Generator does not contain any files which has to be compiled!"
+-	@echo "On the other hand, during installation, all the modules need to be"
+-	@echo "bytecompiled, so now it's time to type: make install"
+-	@echo ----------------------------------------------------------------------
+-	@echo ----------------------------------------------------------------------
+ 
+ #
+ # install all the files in the corect places.
+ #
+-.PHONY:	install
+ install: copydirs bytecompile
+-	@echo "**********************************************************************"
+-	@echo In the directory Doc, three articles in HTML format, concerning
+-	@echo The Dotfile Generator is located. If you want these to be installed
+-	@echo on your system, please do it manually.
+-	@echo "**********************************************************************"
+ 
+-.PHONY: copydirs
+ copydirs:
+ 	$(SHELL) $(srcdir)/mkinstalldirs $(bindir) $(libdir) \
+ 	$(libdir)/Generator $(mandir)
+@@ -62,28 +47,16 @@
+ 	chmod 755 $(bindir)/dotfile
+ 	chmod 755 $(bindir)/dotfile-$(version)
+ 
+-.PHONY: bytecompile
+ bytecompile: $(MODULES)
+ 
+ #
+ # Targets that requre X (the modules using the fonts widget)
+ #
+-.PHONY english/fvwm1 english/fvwm2 japanese/fvwm1 japanese/fvwm2:
+ english/fvwm1 english/fvwm2 japanese/fvwm1 japanese/fvwm2:
+-	@echo "----------------------------------------------------------------------"
+-	@echo "                           Byte compiling $@"
+-	@if wish testwish; then \
+-	@WISH@ $(libdir)/Generator/dotfile.tcl $(libdir)/Generator $(libdir) $@ bytecompile; \
+-	else \
+-	echo "An error should be shown above!"; \
+-	echo "You need X to bytecompile the $@ module, do this manually after"; \
+-	echo "the installation, by starting this module!"; \
+-	fi
+ 
+ #
+ # Targets that may bytecompile without X
+ #
+-.PHONY english/emacs english/tcsh english/rtin english/bash english/elm english/procmail english/ipfwadm japanese/canna:
+ english/emacs english/tcsh english/rtin english/bash english/elm english/procmail english/ipfwadm japanese/canna:
+ 	@echo "----------------------------------------------------------------------"
+ 	@echo "                           Byte compiling $@"
+@@ -93,7 +66,6 @@
+ # Targets that may bytecompile without X, but which requieres
+ # Japanese Tcl/Tk.
+ #
+-#.PHONY japanese/canna japanese/fvwm1 japanese/fvwm2:
+ #japanese/canna japanese/fvwm1 japanese/fvwm2:
+ #	@echo "----------------------------------------------------------------------"
+ #	@echo "                           Byte compiling $@"
+@@ -106,6 +78,5 @@
+ #
+ # Clean
+ #
+-.PHONY:	clean
+ clean :
+ 	@echo Nothing to do
diff --git a/misc/dotfile/patches/patch-ab b/misc/dotfile/patches/patch-ab
new file mode 100644
index 00000000000..5181478b839
--- /dev/null
+++ b/misc/dotfile/patches/patch-ab
@@ -0,0 +1,45 @@
+$NetBSD: patch-ab,v 1.1 2000/08/31 19:14:05 jwise Exp $
+--- configure.orig	Sat Feb 19 14:15:36 2000
++++ configure	Thu Aug 31 14:49:45 2000
+@@ -1224,16 +1224,17 @@
+ 
+ 
+ #### Which language should TDG use?
+-$TCLSH language.tcl
+-res=$?
+-if test "$res" = "1" ; then
+-  LANGUAGE=english;
+-elif test "$res" = "2" ; then
+-  LANGUAGE=japanese;
+-else
+-  { echo "configure: error: Internal error" 1>&2; exit 1; }
+-fi
++#$TCLSH language.tcl
++#res=$?
++#if test "$res" = "1" ; then
++#  LANGUAGE=english;
++#elif test "$res" = "2" ; then
++#  LANGUAGE=japanese;
++#else
++#  { echo "configure: error: Internal error" 1>&2; exit 1; }
++#fi
+ 
++LANGUAGE=$DOTFILE_LANG
+ 
+ trap '' 1 2 15
+ cat > confcache <<\EOF
+@@ -1505,14 +1506,3 @@
+ chmod 755 dotfile
+ chmod 755 Modules/english/fvwm2/fvwmrc_convert
+ chmod 755 Modules/japanese/fvwm2/fvwmrc_convert
+-
+-echo ----------------------------------------------------------------------
+-echo ----------------------------------------------------------------------
+-echo please login to your mail host, go to the directory
+-echo Modules/english/procmail and run ./configure from there.
+-echo At the moment you do also need to install The Dotfile Generator
+-echo at your mailhost for the procmail module to work. You need to install
+-echo it in the same directory as you do on this machine
+-echo This is a bug, which will be fixed in the next version.
+-echo ----------------------------------------------------------------------
+-echo ----------------------------------------------------------------------