6 files changed, 39 insertions, 57 deletions

diff --git a/print/xtem/Makefile b/print/xtem/Makefile
index adb1363f18a9..cba51e991924 100644
--- a/print/xtem/Makefile
+++ b/print/xtem/Makefile
@@ -6,37 +6,37 @@
 #
 
 PORTNAME=	xtem
-PORTVERSION=	7.00
+PORTVERSION=	8.00
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.iwd.uni-bremen.de/pub/tex/xtem.v7/
-DISTFILES=	xtem_texmenu.${PORTVERSION}.tar.gz
+MASTER_SITES=	ftp://ftp.iwd.uni-bremen.de/pub/tex/xtem.v8/
+DISTNAME=	${PORTNAME}_texmenu.${PORTVERSION}
 
-MAINTAINER=     ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	wishx:${PORTSDIR}/lang/tclX80
+RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 .if defined(BUILD_IT_ALL)
 RUN_DEPENDS+=	gv:${PORTSDIR}/print/gv \
 		tex:${PORTSDIR}/print/teTeX
 .endif
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 MAN1=		hyphen_show.1 xtem.1
 
-pre-extract:
+pre-everything:
 	@${CAT} ${FILESDIR}/makemsg.txt
 
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${FILESDIR}/exclude-list ${WRKSRC}
 
 post-patch:
-	@/usr/bin/perl -pi.bak -e "s|\@WISHX\@|${PREFIX}/bin/wishx|; \
-		s|\@TCLSH\@|${PREFIX}/bin/tclsh8.0|; \
-		s|\@XTEMPATH\@|${PREFIX}/share/xtem|" \
-		${WRKSRC}/xtem
+	@${PERL} -pi.bak -e \
+		"s|%%TCLSH%%|${PREFIX}/bin/tclsh8.2|g; \
+		 s|%%WISH%%|${PREFIX}/bin/wish8.2|g; \
+		 s|%%XTEMPATH%%|${PREFIX}/share/xtem|g" ${WRKSRC}/xtem
 
 post-install:
 	@${CP} ${FILESDIR}/xtem_locals_german/[a-z]* \
 		${PREFIX}/share/xtem_locals_german
-# clean up left-overs...
-	@${RM} -f ${PREFIX}/share/xtem_locals_*/.nfs*
 
 .include <bsd.port.mk>
diff --git a/print/xtem/distinfo b/print/xtem/distinfo
index 2cd07a64d21d..bd8eabcf5ae4 100644
--- a/print/xtem/distinfo
+++ b/print/xtem/distinfo
@@ -1 +1 @@
-MD5 (xtem_texmenu.7.00.tar.gz) = 10fc4b4518441eb93c0090bc667484cf
+MD5 (xtem_texmenu.8.00.tar.gz) = 2fa68f36059590fa63ee991070d3d89c
diff --git a/print/xtem/files/exclude-list b/print/xtem/files/exclude-list
index 63048784c0d3..66cb2fd61fac 100644
--- a/print/xtem/files/exclude-list
+++ b/print/xtem/files/exclude-list
@@ -1,3 +1,4 @@
+COPYING
 *.orig
 *.bak
 changecode*
diff --git a/print/xtem/files/patch-aa b/print/xtem/files/patch-aa
index c8659348a888..493572f1d52d 100644
--- a/print/xtem/files/patch-aa
+++ b/print/xtem/files/patch-aa
@@ -1,29 +1,28 @@
---- xtem.orig	Mon Jun 21 14:00:27 1999
-+++ xtem	Fri Sep  3 10:43:14 1999
+--- xtem.orig	Tue Dec  5 22:56:05 2000
++++ xtem	Wed Dec 13 01:19:04 2000
 @@ -10,21 +10,21 @@
  #      touch xtemInstalled
  
- #####  command to call wishx (must include Tcl, Tk and TclX)
--wishcall="/usr/local/bin/wishx"
-+wishcall=@WISHX@
+ #####  command to call wish (must include Tcl and Tk)
+-wishcall="/usr/local/bin/wish"
++wishcall="%%WISH%%"
  
  #####  command to call tcl (pure Tcl, without Tk)
 -tclcall="/usr/local/bin/tclsh"
-+tclcall=@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-/misc/local/xtem/xtem}}
-+: ${XTEMPATH=${XTEMPATH-@XTEMPATH@}}
++: ${XTEMPATH=${XTEMPATH-%%XTEMPATH%%}}
  #####  (i.e. files      /misc/local/xtem/xtem/*.tcl     will be found)
  
  #####  one of the following language defining lines must be made active! 
  #defaultlanguage="german"
--#defaultlanguage="english"
+ #defaultlanguage="english"
 -defaultlanguage="german"
 +defaultlanguage="english"
-+#defaultlanguage="german"
  
  if [ ! -d "$XTEMPATH" ]
  then
diff --git a/print/xtem/files/patch-ab b/print/xtem/files/patch-ab
deleted file mode 100644
index 87874421dfbf..000000000000
--- a/print/xtem/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 873ab69ffed6..7966dfb2c228 100644
--- a/print/xtem/pkg-plist
+++ b/print/xtem/pkg-plist
@@ -2,14 +2,12 @@ bin/changecode
 bin/hyphen_show
 bin/pages_show
 bin/xtem
-share/xtem/COPYING
 share/xtem/Changelog
 share/xtem/Installation.Reply
 share/xtem/Installation.tex
 share/xtem/Makefile
 share/xtem/README
 share/xtem/README.Tcl-version
-share/xtem/README.Tk4.2p2
 share/xtem/README.Upgrading
 share/xtem/README.hyphen_show
 share/xtem/SyntaxHelp_htx.tex
@@ -57,14 +55,15 @@ share/xtem/help_english/dv_optedi.hlp
 share/xtem/help_english/ev_edisel.hlp
 share/xtem/help_english/ev_grund.hlp
 share/xtem/help_english/ev_h.hlp
+share/xtem/help_english/ev_optedi.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
 share/xtem/help_english/fs_dirsel3.hlp
+share/xtem/help_english/fs_edigrep.hlp
 share/xtem/help_english/fs_edirdisp2.hlp
 share/xtem/help_english/fs_editdisp2.hlp
 share/xtem/help_english/fs_editdisp3.hlp
@@ -422,6 +421,7 @@ 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/tv_warnings.hlp
 share/xtem/help_english/ut_createdir.hlp
 share/xtem/help_english/ut_saven.hlp
 share/xtem/help_english/xt_abbruch.hlp
@@ -434,6 +434,7 @@ share/xtem/help_english/xt_filesel.hlp
 share/xtem/help_english/xt_grund.hlp
 share/xtem/help_english/xt_help.hlp
 share/xtem/help_english/xt_index.hlp
+share/xtem/help_english/xt_letters.hlp
 share/xtem/help_english/xt_localnews.hlp
 share/xtem/help_english/xt_mkcmd.hlp
 share/xtem/help_english/xt_preview.hlp
@@ -448,7 +449,6 @@ share/xtem/help_english/xt_syntxhlp.hlp
 share/xtem/help_english/xt_tex.hlp
 share/xtem/help_english/xt_voreinst3.hlp
 share/xtem/help_english/xt_xtem.hlp
-share/xtem/help_english/xt_xtemold.hlp
 share/xtem/help_english/xv_bell.hlp
 share/xtem/help_english/xv_grund.hlp
 share/xtem/help_english/xv_h.hlp
@@ -496,6 +496,7 @@ share/xtem/help_german/dv_optedi.hlp
 share/xtem/help_german/ev_edisel.hlp
 share/xtem/help_german/ev_grund.hlp
 share/xtem/help_german/ev_h.hlp
+share/xtem/help_german/ev_optedi.hlp
 share/xtem/help_german/ev_syntaxhlp.hlp
 share/xtem/help_german/fs_chgmenu2.hlp
 share/xtem/help_german/fs_chgmenu3.hlp
@@ -861,6 +862,7 @@ 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/tv_warnings.hlp
 share/xtem/help_german/ut_createdir.hlp
 share/xtem/help_german/ut_saven.hlp
 share/xtem/help_german/xt_abbruch.hlp
@@ -873,6 +875,7 @@ share/xtem/help_german/xt_filesel.hlp
 share/xtem/help_german/xt_grund.hlp
 share/xtem/help_german/xt_help.hlp
 share/xtem/help_german/xt_index.hlp
+share/xtem/help_german/xt_letters.hlp
 share/xtem/help_german/xt_localnews.hlp
 share/xtem/help_german/xt_mkcmd.hlp
 share/xtem/help_german/xt_preview.hlp
@@ -887,7 +890,6 @@ share/xtem/help_german/xt_syntxhlp.hlp
 share/xtem/help_german/xt_tex.hlp
 share/xtem/help_german/xt_voreinst3.hlp
 share/xtem/help_german/xt_xtem.hlp
-share/xtem/help_german/xt_xtemold.hlp
 share/xtem/help_german/xv_bell.hlp
 share/xtem/help_german/xv_grund.hlp
 share/xtem/help_german/xv_h.hlp
@@ -908,21 +910,14 @@ share/xtem/letter.tcl
 share/xtem/logfile.tcl
 share/xtem/lv.tcl
 share/xtem/mkcommand.0
-share/xtem/mkcommand.1
-share/xtem/mkcommand.2
-share/xtem/mkcommand.3
 share/xtem/mkcommand.4
 share/xtem/mkcommand.5
 share/xtem/mkcommand.6
-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/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
@@ -953,16 +948,16 @@ share/xtem/xtem.tcl
 share/xtem/xtem_async
 share/xtem/xtem_prog
 share/xtem/xteminstall
+share/xtem/xtemlettersdemo/ScriptAppendLine
+share/xtem/xtemlettersdemo/ScriptDay
+share/xtem/xtemlettersdemo/ScriptDayMonthYear
+share/xtem/xtemlettersdemo/ScriptMonth
+share/xtem/xtemlettersdemo/ScriptMonthYear
+share/xtem/xtemlettersdemo/ScriptNameSpecifics
+share/xtem/xtemlettersdemo/br_IWD.vst
+share/xtem/xtemlettersdemo/br_QuickDirty.vst
+share/xtem/xtemlettersdemo/letterhead.tex
 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
@@ -1037,7 +1032,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/xtemlettersdemo
 @dirrm share/xtem/help_german/miscellaneous
 @dirrm share/xtem/help_german/latex
 @dirrm share/xtem/help_german