Upgrade to 7.00.

4 files changed, 37 insertions, 24 deletions

diff --git a/print/xtem/files/Makefile b/print/xtem/files/Makefile
index 98f82d1a7d91..ea5fd8f25f04 100644
--- a/print/xtem/files/Makefile
+++ b/print/xtem/files/Makefile
@@ -1,13 +1,18 @@
-all: changecode
+DIR=	${.CURDIR}
+
+all: changecode hyphen_show pages_show
 
 install: all
-	install -c -s -g bin -o bin -m 755 changecode ${PREFIX}/bin
-	install -c -g bin -o bin -m 755 xtem ${PREFIX}/bin
-	install -c -g bin -o bin -m 644 xtem.1 ${PREFIX}/man/man1
+	${BSD_INSTALL_PROGRAM} changecode ${PREFIX}/bin
+	${BSD_INSTALL_PROGRAM} hyphen_show ${PREFIX}/bin
+	${BSD_INSTALL_PROGRAM} pages_show ${PREFIX}/bin
+	${BSD_INSTALL_SCRIPT} xtem ${PREFIX}/bin
+	${BSD_INSTALL_MAN} hyphen_show.1 ${PREFIX}/man/man1
+	${BSD_INSTALL_MAN} xtem.1 ${PREFIX}/man/man1
 	@echo "Installing files into ${PREFIX}/share/xtem..."
 	@mkdir -p ${PREFIX}/share/xtem
 	@tar -cf - . | (cd ${PREFIX}/share/xtem; \
-	    tar -x --exclude *.orig --exclude *.bak --exclude changecode -f -)
+	    tar -x --exclude-from=${DIR}/exclude-list -f -)
 	@echo "Installing local files..."
 	@rm -rf ${PREFIX}/share/xtem_locals_english
 	@mv -f ${PREFIX}/share/xtem/locals_english.LRW ${PREFIX}/share/xtem_locals_english
diff --git a/print/xtem/files/exclude-list b/print/xtem/files/exclude-list
new file mode 100644
index 000000000000..63048784c0d3
--- /dev/null
+++ b/print/xtem/files/exclude-list
@@ -0,0 +1,9 @@
+*.orig
+*.bak
+changecode*
+exclude-list
+hyphen_show
+hyphen_show.1
+hyphen_show.c
+pages_show*
+xtem.1
diff --git a/print/xtem/files/patch-aa b/print/xtem/files/patch-aa
index f92d543795a3..c8659348a888 100644
--- a/print/xtem/files/patch-aa
+++ b/print/xtem/files/patch-aa
@@ -1,5 +1,5 @@
---- xtem.orig	Mon Nov 10 15:04:09 1997
-+++ xtem	Thu Nov 20 18:17:51 1997
+--- xtem.orig	Mon Jun 21 14:00:27 1999
++++ xtem	Fri Sep  3 10:43:14 1999
 @@ -10,21 +10,21 @@
  #      touch xtemInstalled
  
@@ -8,15 +8,15 @@
 +wishcall=@WISHX@
  
  #####  command to call tcl (pure Tcl, without Tk)
--tclcall="/usr/local/bin/tcl"
+-tclcall="/usr/local/bin/tclsh"
 +tclcall=@TCLSH@
  
  #####  path in which xtem is installed:
  #####  can be set by the environment variable XTEMPATH; 
  #####  if XTEMPATH doesn't exist, it will be set to the following default value:
--: ${XTEMPATH=${XTEMPATH-/usr/local/lib/tex/xtem}}
+-: ${XTEMPATH=${XTEMPATH-/misc/local/xtem/xtem}}
 +: ${XTEMPATH=${XTEMPATH-@XTEMPATH@}}
- #####  (i.e. files      /usr/local/lib/tex/xtem/*.tcl     will be found)
+ #####  (i.e. files      /misc/local/xtem/xtem/*.tcl     will be found)
  
  #####  one of the following language defining lines must be made active! 
  #defaultlanguage="german"
diff --git a/print/xtem/files/patch-ab b/print/xtem/files/patch-ab
index 84f0bf24e569..87874421dfbf 100644
--- a/print/xtem/files/patch-ab
+++ b/print/xtem/files/patch-ab
@@ -1,14 +1,13 @@
---- locals_english.LRW/mkcommand.vst.orig	Tue Jan 13 13:52:13 1998
-+++ locals_english.LRW/mkcommand.vst	Wed Feb  4 11:52:40 1998
-@@ -1,9 +1,8 @@
-                                                                @ Tcl_7.3     @ Tcl_7.4     @ Tcl_7.5     @ Tcl_7.6     @ Tcl_8.0
--*** delete this line, rearrange following lines (see Installation.tex) @ mkcommand.9 @ mkcommand.9 @ mkcommand.9 @ mkcommand.9 @ mkcommand.9
-+high performancy (Tcl command used: pipe)                      @             @ mkcommand.7 @ mkcommand.7 @ mkcommand.7 @ mkcommand.7
-+high performancy (Tcl command used: open "|...|& cat" )        @             @ mkcommand.6 @ mkcommand.6 @ mkcommand.6 @ mkcommand.6
- high performancy (does not work under BSD based Unix)          @ mkcommand.3 @             @             @             @
- high performancy                                               @             @ mkcommand.3 @             @             @
--high performancy (Tcl command used: open "|...|& cat" )        @             @ mkcommand.6 @ mkcommand.6 @ mkcommand.6 @ mkcommand.6
--high performancy (Tcl command used: pipe)                      @             @ mkcommand.7 @ mkcommand.7 @ mkcommand.7 @ mkcommand.7
- efficient    (does not work under BSD based unix)              @ mkcommand.2 @ mkcommand.2 @             @             @
- less efficient if much output is to be displayed (all systems) @ mkcommand.1 @ mkcommand.1 @ mkcommand.1 @ mkcommand.1 @
- a permanent xterm window will be generated   (most systems)    @ mkcommand.4 @ mkcommand.4 @ mkcommand.4 @ mkcommand.4 @ mkcommand.4
+--- locals_english.LRW/mkcommand.vst.orig	Mon Jun 21 14:00:36 1999
++++ locals_english.LRW/mkcommand.vst	Fri Sep  3 10:44:24 1999
+@@ -1,8 +1,8 @@
+                                                                  @ Tcl_7.3     @ Tcl_7.4     @ Tcl_7.5     @ Tcl_7.6     @ Tcl_8.0     @ Tcl_8.1
++high performancy (Tcl command used: pipe)                        @             @ mkcommand.7 @ mkcommand.7 @ mkcommand.7 @ mkcommand.7 @ mkcommand.7
++high performancy (Tcl command used: open "|...|& cat" )          @             @ mkcommand.6 @ mkcommand.6 @ mkcommand.6 @ mkcommand.6 @ mkcommand.6
+ high performancy (does not work with BSD based Unix)             @ mkcommand.3 @             @             @             @             @
+ high performancy                                                 @             @ mkcommand.3 @             @             @             @
+-high performancy (Tcl command used: open "|...|& cat" )          @             @ mkcommand.6 @ mkcommand.6 @ mkcommand.6 @ mkcommand.6 @ mkcommand.6
+-high performancy (Tcl command used: pipe)                        @             @ mkcommand.7 @ mkcommand.7 @ mkcommand.7 @ mkcommand.7 @ mkcommand.7
+ efficient    (does not work under BSD based unix)                @ mkcommand.2 @ mkcommand.2 @             @             @             @
+ less efficient if much output is to be displayed (all systems)   @ mkcommand.1 @ mkcommand.1 @ mkcommand.1 @ mkcommand.1 @             @
+ a permanent xterm window will be generated   (most systems)      @ mkcommand.4 @ mkcommand.4 @ mkcommand.4 @ mkcommand.4 @ mkcommand.4 @ mkcommand.4