- Remove tetex-modesw dependency.

- Fix a problem of lambda with LaTeX2e 2003/12/01[*]

Reported by:	Stijn Hoop (stijn at win dot tue dot nl)[*]
PR:		ports/74837

9 files changed, 13 insertions, 375 deletions

diff --git a/print/teTeX-texmf/Makefile b/print/teTeX-texmf/Makefile
index 897745a68f4c..f4bcd778010a 100644
--- a/print/teTeX-texmf/Makefile
+++ b/print/teTeX-texmf/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	teTeX-texmf
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
 		${MASTER_SITE_TEX_CTAN} \
@@ -19,35 +19,19 @@ EXTRACT_ONLY=	dvipsk-jpatch-p1.6a${EXTRACT_SUFX}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Thomas Esser's distribution of TeX & friends (texmf tree)
 
-BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal
-
-OPTIONS=	LETTERSIZE "Use letter size by default" off
+BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 CONFLICTS=	latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_LETTERSIZE)
-FLAVOR+=	letter
-DEFAULT_MODE=	tetex-letter
-.else
-DEFAULT_MODE=	tetex
-.endif
-
-# XXX: this does not work
-#.if defined(FLAVOR)
-#PKGNAMESUFFIX=	${FLAVOR:S,^,-,:Q:S,\\ ,,g:S,\\-,-,g}
-#.endif
-
 NO_WRKSUBDIR=	YES
 NO_BUILD=	YES
 PLIST_SUB=	TEXMF=${TEXMF} \
 		MKTEXLSR=${MKTEXLSR} \
 		TEXMF_LSR=${TEXMF_LSR}
-PKGINSTALL=	${WRKDIR}/pkg-install.sh
-PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
-CONFLICTS=	ja-ptex-base*
+CONFLICTS=	ja-ptex-base-[0-9]*
 
 TETEX_TEXMF=	tetex-texmf-${PORTVERSION}.tar.gz
 TEXMF=		share/texmf
@@ -58,26 +42,13 @@ TEXMFVAR=	share/texmf-var
 TEXMFVAR_LSR=	${LOCALBASE}/${TEXMFVAR}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
-TETEX_MODESW=	${LOCALBASE}/bin/tetex-modesw
-PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
-		DEFAULT_MODE=${DEFAULT_MODE}
-TETEX_MODES=	tetex tetex-letter
-
 CNFFILES=	DVIPSKCNF XDVIKCNF DVIPDFMCNF
 DVIPSKCNF=	dvips/config/config.ps
-DVIPSKCNF_IN=	dvips.config.ps
 XDVIKCNF=	xdvi/XDvi
-XDVIKCNF_IN=	XDvi
 DVIPDFMCNF=	dvipdfm/config/config
-DVIPDFMCNF_IN=	dvipdfm.config
 
 TEXMF_IN_SUB=	TEXMF=${TEXMF} PREFIX=${PREFIX}
 
-post-configure:
-	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-	${CHMOD} 0755 ${PKGINSTALL}
-
 # XXX: when OPTIONS is set NO_BUILD does not work
 do-build:
 	@${DO_NADA}
@@ -85,7 +56,10 @@ do-build:
 do-install:
 	${MKDIR} ${PREFIX}/${TEXMF}
 	cd ${PREFIX}/${TEXMF} && \
-		${TAR} xzUf ${DISTDIR}/${DIST_SUBDIR}/${TETEX_TEXMF} --exclude "*/texmf.cnf"
+		${TAR} xzUf ${DISTDIR}/${DIST_SUBDIR}/${TETEX_TEXMF} \
+			--exclude "*/texmf.cnf"
+	${MV} ${PREFIX}/${TEXMF}/omega/lambda/omegabook/ltpatch.ltx \
+		${PREFIX}/${TEXMF}/omega/lambda/omegabook/NOUSE_ltpatch.ltx_
 	${INSTALL_DATA} \
 		${FILESDIR}/listings.sty \
 		${PREFIX}/${TEXMF}/tex/latex/listings/
@@ -93,11 +67,7 @@ do-install:
 		${PATCH} --quiet < ${WRKDIR}/PSTricks.patch && \
 		${RM} -f pst-text.pro.orig
 .for F in ${CNFFILES}
-	${RM} -f ${PREFIX}/${TEXMF}/${${F}}
-.for M in ${TETEX_MODES}
-	${INSTALL_DATA} ${FILESDIR}/${${F}_IN}.${M} ${PREFIX}/${TEXMF}/${${F}}.${M}
-.endfor
+	${CP} ${PREFIX}/${TEXMF}/${${F}} ${PREFIX}/${TEXMF}/${${F}}.tetex
 .endfor
-	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/print/teTeX-texmf/files/XDvi.tetex b/print/teTeX-texmf/files/XDvi.tetex
deleted file mode 100644
index 569f2ca93e3c..000000000000
--- a/print/teTeX-texmf/files/XDvi.tetex
+++ /dev/null
@@ -1,6 +0,0 @@
-XDvi*mfMode: ljfour
-XDvi*pixelsPerInch: 600
-XDvi*shrinkFactor: 8
-XDvi*paper: a4
-XDvi*wwwBrowser: netscape
-XDvi*thorough: true
diff --git a/print/teTeX-texmf/files/XDvi.tetex-letter b/print/teTeX-texmf/files/XDvi.tetex-letter
deleted file mode 100644
index 209677e57cad..000000000000
--- a/print/teTeX-texmf/files/XDvi.tetex-letter
+++ /dev/null
@@ -1,6 +0,0 @@
-XDvi*mfMode: ljfour
-XDvi*pixelsPerInch: 600
-XDvi*shrinkFactor: 8
-XDvi*paper: us
-XDvi*wwwBrowser: netscape
-XDvi*thorough: true
diff --git a/print/teTeX-texmf/files/dvipdfm.config.tetex b/print/teTeX-texmf/files/dvipdfm.config.tetex
deleted file mode 100644
index 109599bfa0df..000000000000
--- a/print/teTeX-texmf/files/dvipdfm.config.tetex
+++ /dev/null
@@ -1,23 +0,0 @@
-% config file for dvipdfm, prepared for teTeX by Thomas Esser.
-% For more info, read the dvipdfm manual (texdoc dvipdfm) and
-% the original file which is provided as README.config.
-
-% Distiller config. Uses ghostscript and works on compressed and
-% uncompressed files.
-D "zcat -f %i | gs -q -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.2 -dUseFlateCompression=true -dSAFER -sOutputFile=%o - -c quit"
-
-% Set default paper size here
-p a4
-
-% The "g" option specifies the amount to "grow" annotations by
-% Many TeX macro pages set the annotation bounding box equal
-% to the TeX box that encloses the material.  That's not always
-% what you want
-g 1
-
-% PDF version stamp to use in output file and max version of files
-% allowed to be included (2 for 1.2, 3 for 1.3)
-V 2
-
-% Font map files; maintained by updmap(1)
-f dvipdfm.map
diff --git a/print/teTeX-texmf/files/dvipdfm.config.tetex-letter b/print/teTeX-texmf/files/dvipdfm.config.tetex-letter
deleted file mode 100644
index b744bf90a55c..000000000000
--- a/print/teTeX-texmf/files/dvipdfm.config.tetex-letter
+++ /dev/null
@@ -1,23 +0,0 @@
-% config file for dvipdfm, prepared for teTeX by Thomas Esser.
-% For more info, read the dvipdfm manual (texdoc dvipdfm) and
-% the original file which is provided as README.config.
-
-% Distiller config. Uses ghostscript and works on compressed and
-% uncompressed files.
-D "zcat -f %i | gs -q -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.2 -dUseFlateCompression=true -dSAFER -sOutputFile=%o - -c quit"
-
-% Set default paper size here
-p letter
-
-% The "g" option specifies the amount to "grow" annotations by
-% Many TeX macro pages set the annotation bounding box equal
-% to the TeX box that encloses the material.  That's not always
-% what you want
-g 1
-
-% PDF version stamp to use in output file and max version of files
-% allowed to be included (2 for 1.2, 3 for 1.3)
-V 2
-
-% Font map files; maintained by updmap(1)
-f dvipdfm.map
diff --git a/print/teTeX-texmf/files/dvips.config.ps.tetex b/print/teTeX-texmf/files/dvips.config.ps.tetex
deleted file mode 100644
index 05f62fa521a3..000000000000
--- a/print/teTeX-texmf/files/dvips.config.ps.tetex
+++ /dev/null
@@ -1,128 +0,0 @@
-% teTeX's config.ps. Thomas Esser, 1998, public domain.
-
-% Memory available. Download the three-line PostScript file:
-%   %! Hey, we're PostScript
-%   /Times-Roman findfont 30 scalefont setfont 144 432 moveto
-%   vmstatus exch sub 40 string cvs show pop showpage
-% to determine this number. (It will be the only thing printed.)
-m 3500000
-
-% Execution of external programs is disabled by default. Set
-% to z0 if you want backticks in \special commands enabled.
-z1
-
-% How to print, maybe with lp instead lpr, etc. If commented-out, output
-% will go into a file by default.
-%o |lpr
-
-% Default resolution of this device, in dots per inch.
-D 600
-X 600
-Y 600
-
-% Metafont mode.  (This is completely different from the -M
-% command-line option, which controls whether mktexpk is invoked.)
-% See ../../metafont/misc/modes.mf for a list of mode names.  This mode
-% and the D number above must agree, or mktexpk will get confused.
-M ljfour
-
-% Also look for this list of resolutions.
-R 300 600
-
-% Correct printer offset. You can use testpage.tex from the LaTeX
-% distribution to find these numbers.
-O 0pt,0pt
-
-% With a high resolution and a RISC cpu, better to compress the bitmaps.
-% PS files are much more compact, but can sometimes cause trouble.
-Z
-
-% Partially download Type 1 fonts by default.  Only reason not to do
-% this is if you encounter bugs.  (Please report them to
-% @email{tex-k@@mail.tug.org} if you do.)
-j
-
-% This shows how to add your own map file.
-% Remove the comment and adjust the name:
-% p +myfonts.map
-
-@ A4size 210mm 297mm
-@+ %%PaperSize: A4
-
-@ letterSize 8.5in 11in
-
-@ letter 8.5in 11in
-@+ %%BeginPaperSize: Letter
-@+ letter
-@+ %%EndPaperSize
-
-@ legal 8.5in 14in
-@+ ! %%DocumentPaperSizes: Legal
-@+ %%BeginPaperSize: Legal
-@+ legal
-@+ %%EndPaperSize
-
-@ ledger 17in 11in
-@+ ! %%DocumentPaperSizes: Ledger
-@+ %%BeginPaperSize: Ledger
-@+ ledger
-@+ %%EndPaperSize
-
-@ tabloid 11in 17in
-@+ ! %%DocumentPaperSizes: Tabloid
-@+ %%BeginPaperSize: Tabloid
-@+ 11x17
-@+ %%EndPaperSize
-
-@ a6 105mm 148mm
-@+ ! %%DocumentPaperSizes: a6
-@+ %%BeginPaperSize: a6
-@+ a6
-@+ %%EndPaperSize
-
-@ a5 148mm 210mm
-@+ ! %%DocumentPaperSizes: a5
-@+ %%BeginPaperSize: a5
-@+ a5
-@+ %%EndPaperSize
-
-@ a4 210mm 297mm
-@+ ! %%DocumentPaperSizes: a4
-@+ %%BeginPaperSize: a4
-@+ a4
-@+ %%EndPaperSize
-
-@ a3 297mm 420mm
-@+ ! %%DocumentPaperSizes: a3
-@+ %%BeginPaperSize: a3
-@+ a3
-@+ %%EndPaperSize
-
-@ b6 128mm 182mm
-@+ ! %%DocumentPaperSizes: b6
-@+ %%BeginPaperSize: b6
-@+ b6
-@+ %%EndPaperSize
-
-@ b5 182mm 257mm
-@+ ! %%DocumentPaperSizes: b5
-@+ %%BeginPaperSize: b5
-@+ b5
-@+ %%EndPaperSize
-
-@ b4 257mm 364mm
-@+ ! %%DocumentPaperSizes: b4
-@+ %%BeginPaperSize: b4
-@+ b4
-@+ %%EndPaperSize
-
-@ b3 364mm 515mm
-@+ ! %%DocumentPaperSizes: b3
-@+ %%BeginPaperSize: b3
-@+ b3
-@+ %%EndPaperSize
-
-@ unknown 0in 0in
-@+ statusdict /setpageparams known { hsize vsize 0 1 statusdict begin {
-@+ setpageparams } stopped end } { true } ifelse { statusdict /setpage known
-@+ { hsize vsize 1 statusdict begin { setpage } stopped pop end } if } if
diff --git a/print/teTeX-texmf/files/dvips.config.ps.tetex-letter b/print/teTeX-texmf/files/dvips.config.ps.tetex-letter
deleted file mode 100644
index 580b34628304..000000000000
--- a/print/teTeX-texmf/files/dvips.config.ps.tetex-letter
+++ /dev/null
@@ -1,128 +0,0 @@
-% teTeX's config.ps. Thomas Esser, 1998, public domain.
-
-% Memory available. Download the three-line PostScript file:
-%   %! Hey, we're PostScript
-%   /Times-Roman findfont 30 scalefont setfont 144 432 moveto
-%   vmstatus exch sub 40 string cvs show pop showpage
-% to determine this number. (It will be the only thing printed.)
-m 3500000
-
-% Execution of external programs is disabled by default. Set
-% to z0 if you want backticks in \special commands enabled.
-z1
-
-% How to print, maybe with lp instead lpr, etc. If commented-out, output
-% will go into a file by default.
-%o |lpr
-
-% Default resolution of this device, in dots per inch.
-D 600
-X 600
-Y 600
-
-% Metafont mode.  (This is completely different from the -M
-% command-line option, which controls whether mktexpk is invoked.)
-% See ../../metafont/misc/modes.mf for a list of mode names.  This mode
-% and the D number above must agree, or mktexpk will get confused.
-M ljfour
-
-% Also look for this list of resolutions.
-R 300 600
-
-% Correct printer offset. You can use testpage.tex from the LaTeX
-% distribution to find these numbers.
-O 0pt,0pt
-
-% With a high resolution and a RISC cpu, better to compress the bitmaps.
-% PS files are much more compact, but can sometimes cause trouble.
-Z
-
-% Partially download Type 1 fonts by default.  Only reason not to do
-% this is if you encounter bugs.  (Please report them to
-% @email{tex-k@@mail.tug.org} if you do.)
-j
-
-% This shows how to add your own map file.
-% Remove the comment and adjust the name:
-% p +myfonts.map
-
-@ letterSize 8.5in 11in
-
-@ A4size 210mm 297mm
-@+ %%PaperSize: A4
-
-@ letter 8.5in 11in
-@+ %%BeginPaperSize: Letter
-@+ letter
-@+ %%EndPaperSize
-
-@ legal 8.5in 14in
-@+ ! %%DocumentPaperSizes: Legal
-@+ %%BeginPaperSize: Legal
-@+ legal
-@+ %%EndPaperSize
-
-@ ledger 17in 11in
-@+ ! %%DocumentPaperSizes: Ledger
-@+ %%BeginPaperSize: Ledger
-@+ ledger
-@+ %%EndPaperSize
-
-@ tabloid 11in 17in
-@+ ! %%DocumentPaperSizes: Tabloid
-@+ %%BeginPaperSize: Tabloid
-@+ 11x17
-@+ %%EndPaperSize
-
-@ a6 105mm 148mm
-@+ ! %%DocumentPaperSizes: a6
-@+ %%BeginPaperSize: a6
-@+ a6
-@+ %%EndPaperSize
-
-@ a5 148mm 210mm
-@+ ! %%DocumentPaperSizes: a5
-@+ %%BeginPaperSize: a5
-@+ a5
-@+ %%EndPaperSize
-
-@ a4 210mm 297mm
-@+ ! %%DocumentPaperSizes: a4
-@+ %%BeginPaperSize: a4
-@+ a4
-@+ %%EndPaperSize
-
-@ a3 297mm 420mm
-@+ ! %%DocumentPaperSizes: a3
-@+ %%BeginPaperSize: a3
-@+ a3
-@+ %%EndPaperSize
-
-@ b6 128mm 182mm
-@+ ! %%DocumentPaperSizes: b6
-@+ %%BeginPaperSize: b6
-@+ b6
-@+ %%EndPaperSize
-
-@ b5 182mm 257mm
-@+ ! %%DocumentPaperSizes: b5
-@+ %%BeginPaperSize: b5
-@+ b5
-@+ %%EndPaperSize
-
-@ b4 257mm 364mm
-@+ ! %%DocumentPaperSizes: b4
-@+ %%BeginPaperSize: b4
-@+ b4
-@+ %%EndPaperSize
-
-@ b3 364mm 515mm
-@+ ! %%DocumentPaperSizes: b3
-@+ %%BeginPaperSize: b3
-@+ b3
-@+ %%EndPaperSize
-
-@ unknown 0in 0in
-@+ statusdict /setpageparams known { hsize vsize 0 1 statusdict begin {
-@+ setpageparams } stopped end } { true } ifelse { statusdict /setpage known
-@+ { hsize vsize 1 statusdict begin { setpage } stopped pop end } if } if
diff --git a/print/teTeX-texmf/files/pkg-install.in b/print/teTeX-texmf/files/pkg-install.in
deleted file mode 100644
index 8cfde89da5b2..000000000000
--- a/print/teTeX-texmf/files/pkg-install.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-TETEX_MODESW=%%TETEX_MODESW%%
-DEFAULT_MODE=%%DEFAULT_MODE%%
-
-case $2 in
-POST-INSTALL)
-	${TETEX_MODESW} changedefault ${DEFAULT_MODE}
-	${TETEX_MODESW} default dvips forceinstall
-	${TETEX_MODESW} default dvipdfm forceinstall
-	${TETEX_MODESW} default xdvi forceinstall
-	;;
-DEINSTALL)
-	${TETEX_MODESW} uninstall dvips
-	${TETEX_MODESW} uninstall dvipdfm
-	${TETEX_MODESW} uninstall xdvi
-	;;
-esac
diff --git a/print/teTeX-texmf/pkg-plist b/print/teTeX-texmf/pkg-plist
index e504181cbb33..fee11c7c19f6 100644
--- a/print/teTeX-texmf/pkg-plist
+++ b/print/teTeX-texmf/pkg-plist
@@ -3077,8 +3077,8 @@
 %%TEXMF%%/doc/tetex/eurotex98-te.pdf
 %%TEXMF%%/doc/texdoctk/README
 %%TEXMF%%/dvipdfm/config/README.config
+%%TEXMF%%/dvipdfm/config/config
 %%TEXMF%%/dvipdfm/config/config.tetex
-%%TEXMF%%/dvipdfm/config/config.tetex-letter
 %%TEXMF%%/dvips/antp/antp.enc
 %%TEXMF%%/dvips/antp/antp.map
 %%TEXMF%%/dvips/antp/config.antp
@@ -3115,8 +3115,8 @@
 %%TEXMF%%/dvips/cc-pl/cc-pl.enc
 %%TEXMF%%/dvips/cc-pl/ccpl.map
 %%TEXMF%%/dvips/config/builtin35.map
+%%TEXMF%%/dvips/config/config.ps
 %%TEXMF%%/dvips/config/config.ps.tetex
-%%TEXMF%%/dvips/config/config.ps.tetex-letter
 %%TEXMF%%/dvips/config/context.map
 %%TEXMF%%/dvips/config/download35.map
 %%TEXMF%%/dvips/config/dvipdfm.map
@@ -9071,7 +9071,7 @@
 %%TEXMF%%/omega/lambda/oinuit/oinuit.sty
 %%TEXMF%%/omega/lambda/omegabook/grcodes.tex
 %%TEXMF%%/omega/lambda/omegabook/grmhyph.tex
-%%TEXMF%%/omega/lambda/omegabook/ltpatch.ltx
+%%TEXMF%%/omega/lambda/omegabook/NOUSE_ltpatch.ltx_
 %%TEXMF%%/omega/lambda/omegabook/ojapan.sty
 %%TEXMF%%/omega/lambda/omegabook/otibet.tex
 %%TEXMF%%/omega/ocp/char2uni/in646.ocp
@@ -11433,8 +11433,8 @@
 %%TEXMF%%/web2c/il2-t1.tcx
 %%TEXMF%%/web2c/il2-pl.tcx
 %%TEXMF%%/web2c/cp8bit.tcx
+%%TEXMF%%/xdvi/XDvi
 %%TEXMF%%/xdvi/XDvi.tetex
-%%TEXMF%%/xdvi/XDvi.tetex-letter
 @exec mkdir -p %D/%%TEXMF%%/fonts/afm/hoekwater
 @exec mkdir -p %D/%%TEXMF%%/fonts/bh
 @exec mkdir -p %D/%%TEXMF%%/fonts/bh/lucidabr