7 files changed, 89 insertions, 38 deletions

diff --git a/print/xtem/Makefile b/print/xtem/Makefile
index 87dd1bbcd0cf..9ba6ae1412f6 100644
--- a/print/xtem/Makefile
+++ b/print/xtem/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:   xtem
-# Version required:     6.18
+# Version required:     7.00
 # Date created:         01 June 1997
 # Whom:                 Peter Cornelius <pc@inr.fzk.de>
 #
 # $FreeBSD$
 
-DISTNAME=	xtem_texmenu.6.18
-PKGNAME=	xtem-6.18
+DISTNAME=	xtem_texmenu.7.00
+PKGNAME=	xtem-7.00
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.iwd.uni-bremen.de/pub/tex/xtem/xtem.v6/
+MASTER_SITES=	ftp://ftp.iwd.uni-bremen.de/pub/tex/xtem.v7/
 
 MAINTAINER=     ports@FreeBSD.org
 
@@ -19,13 +19,13 @@ RUN_DEPENDS+=	gv:${PORTSDIR}/print/gv \
 .endif
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
-MAN1=		xtem.1
+MAN1=		hyphen_show.1 xtem.1
 
 pre-extract:
 	@${CAT} ${FILESDIR}/makemsg.txt
 
 post-extract:
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	@${CP} ${FILESDIR}/Makefile ${FILESDIR}/exclude-list ${WRKSRC}
 
 post-patch:
 	@/usr/bin/perl -pi.bak -e "s|\@WISHX\@|${PREFIX}/bin/wishx|; \
diff --git a/print/xtem/distinfo b/print/xtem/distinfo
index 0c0e07716661..2cd07a64d21d 100644
--- a/print/xtem/distinfo
+++ b/print/xtem/distinfo
@@ -1 +1 @@
-MD5 (xtem_texmenu.6.18.tar.gz) = b90d58368c7b2dd81dbad3fcae5bb388
+MD5 (xtem_texmenu.7.00.tar.gz) = 10fc4b4518441eb93c0090bc667484cf
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
diff --git a/print/xtem/pkg-plist b/print/xtem/pkg-plist
index 430dec454c91..873ab69ffed6 100644
--- a/print/xtem/pkg-plist
+++ b/print/xtem/pkg-plist
@@ -1,4 +1,6 @@
 bin/changecode
+bin/hyphen_show
+bin/pages_show
 bin/xtem
 share/xtem/COPYING
 share/xtem/Changelog
@@ -14,7 +16,6 @@ share/xtem/SyntaxHelp_htx.tex
 share/xtem/ak.tcl
 share/xtem/bibliogr.tcl
 share/xtem/bv.tcl
-share/xtem/changecode.c
 share/xtem/dm.tcl
 share/xtem/ds.tcl
 share/xtem/dv.tcl
@@ -59,6 +60,7 @@ share/xtem/help_english/ev_h.hlp
 share/xtem/help_english/ev_syntaxhlp.hlp
 share/xtem/help_english/fs_chgmenu2.hlp
 share/xtem/help_english/fs_chgmenu3.hlp
+share/xtem/help_english/fs_edigrep.hlp
 share/xtem/help_english/fs_dirdisp2.hlp
 share/xtem/help_english/fs_dirdisp3.hlp
 share/xtem/help_english/fs_diredi3.hlp
@@ -351,6 +353,7 @@ share/xtem/help_english/latex/verse.dvi
 share/xtem/help_english/latex/verse.htx
 share/xtem/help_english/latex/verse.tex
 share/xtem/help_english/latex/verse.xbm.gz
+share/xtem/help_english/le_konflikt.hlp
 share/xtem/help_english/lv_filesel.hlp
 share/xtem/help_english/lv_grund.hlp
 share/xtem/help_english/lv_h.hlp
@@ -416,6 +419,7 @@ share/xtem/help_english/tv_loganlyz.hlp
 share/xtem/help_english/tv_maxlines.hlp
 share/xtem/help_english/tv_overfull.hlp
 share/xtem/help_english/tv_speich.hlp
+share/xtem/help_english/tv_texautost.hlp
 share/xtem/help_english/tv_texposth.hlp
 share/xtem/help_english/tv_undrfull.hlp
 share/xtem/help_english/ut_createdir.hlp
@@ -499,6 +503,7 @@ share/xtem/help_german/fs_dirdisp2.hlp
 share/xtem/help_german/fs_dirdisp3.hlp
 share/xtem/help_german/fs_diredi3.hlp
 share/xtem/help_german/fs_dirsel3.hlp
+share/xtem/help_german/fs_edigrep.hlp
 share/xtem/help_german/fs_edirdisp2.hlp
 share/xtem/help_german/fs_editdisp2.hlp
 share/xtem/help_german/fs_editdisp3.hlp
@@ -787,6 +792,7 @@ share/xtem/help_german/latex/verse.dvi
 share/xtem/help_german/latex/verse.htx
 share/xtem/help_german/latex/verse.tex
 share/xtem/help_german/latex/verse.xbm.gz
+share/xtem/help_german/le_konflikt.hlp
 share/xtem/help_german/lv_filesel.hlp
 share/xtem/help_german/lv_grund.hlp
 share/xtem/help_german/lv_h.hlp
@@ -852,6 +858,7 @@ share/xtem/help_german/tv_loganlyz.hlp
 share/xtem/help_german/tv_maxlines.hlp
 share/xtem/help_german/tv_overfull.hlp
 share/xtem/help_german/tv_speich.hlp
+share/xtem/help_german/tv_texautost.hlp
 share/xtem/help_german/tv_texposth.hlp
 share/xtem/help_german/tv_undrfull.hlp
 share/xtem/help_german/ut_createdir.hlp
@@ -893,11 +900,11 @@ share/xtem/help_german/z_loeschetf.hlp
 share/xtem/help_german/z_textfeld.hlp
 share/xtem/help_german/z_voreinst1.hlp
 share/xtem/help_german/z_vstquit.hlp
-share/xtem/hyphen_show.1
-share/xtem/hyphen_show.c
+share/xtem/hyphen_show.sort
 share/xtem/index.tcl
 share/xtem/iv.tcl
 share/xtem/le.tcl
+share/xtem/letter.tcl
 share/xtem/logfile.tcl
 share/xtem/lv.tcl
 share/xtem/mkcommand.0
@@ -911,13 +918,14 @@ share/xtem/mkcommand.7
 share/xtem/mkcommand.9
 share/xtem/mkcommand74ff.a
 share/xtem/mkcommand74ff.b
+share/xtem/mv.tcl
 share/xtem/newsfile.tcl
-share/xtem/pages_show.c
 share/xtem/preview.tcl
 share/xtem/printing.tcl
 share/xtem/process.tcl
 share/xtem/prt_dvijep.tcl
 share/xtem/prt_dvilj.tcl
+share/xtem/prt_dvilj4.tcl
 share/xtem/prt_dvips.tcl
 share/xtem/pv.tcl
 share/xtem/quick.tcl
@@ -937,34 +945,53 @@ share/xtem/tv.tcl
 share/xtem/ut.tcl
 share/xtem/utility.tcl
 share/xtem/xV.tcl
-share/xtem/xi.tcl
+share/xtem/xi1.tcl
+share/xtem/xi2.tcl
+share/xtem/xic.tcl
 share/xtem/xtem
-share/xtem/xtem.1
 share/xtem/xtem.tcl
 share/xtem/xtem_async
 share/xtem/xtem_prog
 share/xtem/xteminstall
 share/xtem/xv.tcl
+share/xtem/xtemletters-demo/ScriptAppendLine
+share/xtem/xtemletters-demo/ScriptDay
+share/xtem/xtemletters-demo/ScriptDayMonthYear
+share/xtem/xtemletters-demo/ScriptMonth
+share/xtem/xtemletters-demo/ScriptMonthYear
+share/xtem/xtemletters-demo/ScriptNameSpecifics
+share/xtem/xtemletters-demo/br_IWD.vst
+share/xtem/xtemletters-demo/br_QuickDirty.vst
+share/xtem/xtemletters-demo/letterhead.tex
 share/xtem_locals_english/bibtex.vst
 share/xtem_locals_english/cleanup.vst
 share/xtem_locals_english/editor.vst
 share/xtem_locals_english/hyphen.vst
 share/xtem_locals_english/index.vst
 share/xtem_locals_english/install.vst
+share/xtem_locals_english/letter.vst
 share/xtem_locals_english/local.news
-share/xtem_locals_english/loganalyze.vst
 share/xtem_locals_english/logform.vst
 share/xtem_locals_english/logsuffix.vst
 share/xtem_locals_english/mkcommand.vst
 share/xtem_locals_english/preview.vst
 share/xtem_locals_english/printing.vst
+share/xtem_locals_english/printing.vst-
+share/xtem_locals_english/printing.vst-Comment
+share/xtem_locals_english/printing.vst-Preamble
+share/xtem_locals_english/printing.vst-lp
+share/xtem_locals_english/printing.vst-lpjep
+share/xtem_locals_english/printing.vst-lpjep1
+share/xtem_locals_english/printing.vst-lpr
 share/xtem_locals_english/prt_dvijep.vst
 share/xtem_locals_english/prt_dvilj.vst
+share/xtem_locals_english/prt_dvilj4.vst
 share/xtem_locals_english/prt_dvips.vst
 share/xtem_locals_english/spellcheck.vst
 share/xtem_locals_english/suffix.vst
 share/xtem_locals_english/syntax.vst
 share/xtem_locals_english/texfmt.vst
+share/xtem_locals_english/texopts.vst
 share/xtem_locals_english/texsiz.vst
 share/xtem_locals_english/texsuffix.vst
 share/xtem_locals_english/utility.vst
@@ -975,6 +1002,7 @@ share/xtem_locals_german/editor.vst
 share/xtem_locals_german/hyphen.vst
 share/xtem_locals_german/index.vst
 share/xtem_locals_german/install.vst
+share/xtem_locals_german/letter.vst
 share/xtem_locals_german/letters.vst
 share/xtem_locals_german/local.news
 share/xtem_locals_german/loganalyze.vst
@@ -983,13 +1011,22 @@ share/xtem_locals_german/logsuffix.vst
 share/xtem_locals_german/mkcommand.vst
 share/xtem_locals_german/preview.vst
 share/xtem_locals_german/printing.vst
+share/xtem_locals_german/printing.vst-
+share/xtem_locals_german/printing.vst-Comment
+share/xtem_locals_german/printing.vst-Preamble
+share/xtem_locals_german/printing.vst-lp
+share/xtem_locals_german/printing.vst-lpjep
+share/xtem_locals_german/printing.vst-lpjep1
+share/xtem_locals_german/printing.vst-lpr
 share/xtem_locals_german/prt_dvijep.vst
 share/xtem_locals_german/prt_dvilj.vst
+share/xtem_locals_german/prt_dvilj4.vst
 share/xtem_locals_german/prt_dvips.vst
 share/xtem_locals_german/spellcheck.vst
 share/xtem_locals_german/suffix.vst
 share/xtem_locals_german/syntax.vst
 share/xtem_locals_german/texfmt.vst
+share/xtem_locals_german/texopts.vst
 share/xtem_locals_german/texsiz.vst
 share/xtem_locals_german/texsuffix.vst
 share/xtem_locals_german/utility.vst
@@ -1000,6 +1037,7 @@ share/xtem_locals_german/xtemstart.news
 @unexec rm -f %D/share/xtem/locals_english
 @dirrm share/xtem_locals_german
 @dirrm share/xtem_locals_english
+@dirrm share/xtem/xtemletters-demo
 @dirrm share/xtem/help_german/miscellaneous
 @dirrm share/xtem/help_german/latex
 @dirrm share/xtem/help_german