- Remove tetex-modesw dependency.

- Bump PORTREVISION.

10 files changed, 142 insertions, 335 deletions

diff --git a/print/dvipsk-tetex/Makefile b/print/dvipsk-tetex/Makefile
index e1c195cc9474..fb4a96626b29 100644
--- a/print/dvipsk-tetex/Makefile
+++ b/print/dvipsk-tetex/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	dvipsk-tetex
 PORTVERSION=	5.92b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -17,10 +17,10 @@ DIST_SUBDIR=	teTeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Convert a TeX DVI file to PostScript
 
-BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base
-RUN_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
@@ -45,23 +45,38 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-pnglib-include=${LIBPNG_PREFIX}/include \
 		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
 		--with-t1lib-include=${LIBT1_PREFIX}/include
-CONFLICTS=	*-teTeX* ja-ptex-base* *-*dvips* *dvips-*
+CONFLICTS=	*-teTeX-[0-9]* ja-ptex-base-[0-9]* *-*dvips* *dvips-*
 
 MAN1=		dvips.1 afm2tfm.1
 INFO=		dvips
 
+.if defined(WITH_LETTERSIZE)
+FLAVOR+=	letter
+PAPERSIZE=	letter
+.else
+PAPERSIZE=	a4
+.endif
+
 TETEX_VER=	2.0.2
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 TEXMF?=		share/texmf
+TEXMFLOCAL?=	share/texmf-local
+TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
+TEXCONFIG?=	${LOCALBASE}/bin/texconfig
+DVIPSDIR=	${LOCALBASE}/${TEXMF}/dvips/config
+DVIPSVARDIR=	${LOCALBASE}/${TEXMF}-var/dvips/config
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 
 PKGINSTALL=	${WRKDIR}/pkg-install.sh
 PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
-TETEX_MODESW=	${PREFIX}/bin/tetex-modesw
-PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
-		MKTEXLSR=${MKTEXLSR}
+PKGINSTALL_SUB=	PAPERSIZE=${PAPERSIZE} \
+		MKTEXLSR=${MKTEXLSR} \
+		DVIPSDIR=${DVIPSDIR} \
+		DVIPSVARDIR=${DVIPSVARDIR} \
+		TEXCONFIG=${TEXCONFIG} \
+		LOCALBASE=${LOCALBASE}
 
 pre-build:
 	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
diff --git a/print/dvipsk-tetex/files/pkg-install.in b/print/dvipsk-tetex/files/pkg-install.in
index be92a3c27cab..fcfb27f8e255 100644
--- a/print/dvipsk-tetex/files/pkg-install.in
+++ b/print/dvipsk-tetex/files/pkg-install.in
@@ -1,20 +1,34 @@
 #!/bin/sh
 # $FreeBSD$
 
-GREP=/usr/bin/grep
-SED=/usr/bin/sed
-MODE=default
-
+PAPERSIZE=%%PAPERSIZE%%
+DVIPSDIR=%%DVIPSDIR%%
+DVIPSVARDIR=%%DVIPSVARDIR%%
 MKTEXLSR=%%MKTEXLSR%%
-TETEX_MODESW=%%TETEX_MODESW%%
+TEXCONFIG=%%TEXCONFIG%%
+PATH=${PATH}:%%LOCALBASE%%/bin
 
 case $2 in
 POST-INSTALL)
-	${TETEX_MODESW} ${MODE} dvips force
-	${MKTEXLSR}
+	if [ -f ${DVIPSVARDIR}/config.ps ]; then
+		echo "======"
+		echo "NOTICE: you have to merge "\
+			"${DVIPSVARDIR}/config.ps from ${DVIPSDIR}/config.ps."
+		echo "======"
+	fi
+	case ${PAPERSIZE} in
+	letter)
+		${TEXCONFIG} dvips paper letter
+	;;
+	*)
+		${TEXCONFIG} dvips paper a4
 	;;
+	esac
+	${MKTEXLSR}
+;;
 DEINSTALL)
-	${TETEX_MODESW} uninstall dvips
+	rm -f ${DVIPSVARDIR}/config.ps
+	cp -v ${DVIPSDIR}/config.ps.tetex ${DVIPSDIR}/config.ps
 	${MKTEXLSR}
-	;;
+;;
 esac
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index 24123ab21b4b..20773b5e0416 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	teTeX-base
 PORTVERSION=	2.0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -18,10 +18,10 @@ DIST_SUBDIR=	teTeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Thomas Esser's distribution of TeX & friends (binaries)
 
-BUILD_DEPENDS=	${TEXMF_TREE}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
-		tetex-modesw:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	${TEXMF_TREE}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
-		tetex-modesw:${PORTSDIR}/print/tex-texmflocal
+BUILD_DEPENDS=	${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+RUN_DEPENDS=	${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
@@ -44,10 +44,9 @@ CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 PLIST_SUB=	MKTEXLSR=${MKTEXLSR} TEXMFCNF=${TEXMFCNF}
-PKGINSTALL=	${WRKDIR}/pkg-install.sh
-PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
 PKGMESSAGE=	${WRKDIR}/pkg-message
-CONFLICTS=	ja-ptex-base* latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
+CONFLICTS=	ja-ptex-base-[0-9]* latex2e-[0-9]* \
+		tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
 
 MAN1=		MakeTeXPK.1 access.1 allcm.1 allneeded.1 \
 		amstex.1 bibtex.1 cont-de.1 cont-en.1 cont-nl.1 dmp.1 \
@@ -125,32 +124,23 @@ LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 
-TEXMF_TREE=	${PREFIX}/share/texmf
+TEXMF=		share/texmf
+TEXMFLOCAL=	share/texmf-local
+TEXMFLOCAL_LSR=	${PREFIX}/${TEXMFLOCAL}/ls-R
 TEXMFVAR=	share/texmf-var
-TETEX_MODESW=	${LOCALBASE}/bin/tetex-modesw
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
-PLIST_SUB+=	TEXMF_TREE=${TEXMF_TREE:S,^${PREFIX}/,,} \
+PLIST_SUB+=	TEXMF=${TEXMF} \
 		TEXMFVAR=${TEXMFVAR}
-PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
-		MKTEXLSR=${MKTEXLSR}
-PKGMESSAGE_SUB=	TEXMF_TREE=${TEXMF_TREE}
-
-pre-configure:
-	@${ECHO_MSG}
-	@${ECHO_MSG} "It will be ok if configure will complain about a missing texmf tree!"
-	@${ECHO_MSG}
+PKGMESSAGE_SUB=	TEXMF=${TEXMF} \
+		PREFIX=${PREFIX}
 
 post-configure:
-	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-	${CHMOD} 0755 ${PKGINSTALL}
 	${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		< ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/texinfo/util/texi2dvi ${PREFIX}/bin
-	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/print/teTeX-base/files/pkg-install.in b/print/teTeX-base/files/pkg-install.in
deleted file mode 100644
index 5ccde1215a0c..000000000000
--- a/print/teTeX-base/files/pkg-install.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-TETEX_MODESW=%%TETEX_MODESW%%
-MKTEXLSR=%%MKTEXLSR%%
-
-case $2 in
-POST-INSTALL)
-	${TETEX_MODESW} default dvips forceinstall
-	${TETEX_MODESW} default dvipdfm forceinstall
-	${TETEX_MODESW} default xdvi forceinstall
-	${MKTEXLSR}
-	;;
-DEINSTALL)
-	${TETEX_MODESW} uninstall dvips
-	${TETEX_MODESW} uninstall dvipdfm
-	${TETEX_MODESW} uninstall xdvi
-	;;
-esac
diff --git a/print/teTeX-base/files/pkg-message.in b/print/teTeX-base/files/pkg-message.in
index bfa4ac2eb7b6..555be4fab3dd 100644
--- a/print/teTeX-base/files/pkg-message.in
+++ b/print/teTeX-base/files/pkg-message.in
@@ -1,3 +1,3 @@
 You may want to run texconfig to configure teTeX for your
 local environment. You will find teTeX's local documentation
-in %%TEXMF_TREE%%/doc/.
+in %%PREFIX%%/%%TEXMF%%/doc/.
diff --git a/print/teTeX-base/pkg-plist b/print/teTeX-base/pkg-plist
index 91736211fb3d..3e5de7215343 100644
--- a/print/teTeX-base/pkg-plist
+++ b/print/teTeX-base/pkg-plist
@@ -189,35 +189,35 @@ include/kpathsea/variable.h
 include/kpathsea/xopendir.h
 include/kpathsea/xstat.h
 lib/libkpathsea.a
-%%TEXMF_TREE%%/doc/tetex/TETEXDOC.dvi
-%%TEXMF_TREE%%/doc/tetex/TETEXDOC.pdf
-%%TEXMF_TREE%%/doc/tetex/TETEXDOC.ps
-%%TEXMF_TREE%%/doc/tetex/teTeX-FAQ
-%%TEXMF_TREE%%/dvips/gsftopk/render.ps
-%%TEXMF_TREE%%/texconfig/README
-%%TEXMF_TREE%%/texconfig/g/generic
-%%TEXMF_TREE%%/texconfig/generic
-%%TEXMF_TREE%%/texconfig/v/vt100
-%%TEXMF_TREE%%/texconfig/x/xterm
-%%TEXMF_TREE%%/web2c/etex-pl.pool
-%%TEXMF_TREE%%/web2c/etex.pool
-%%TEXMF_TREE%%/web2c/fmtutil.cnf
-%%TEXMF_TREE%%/web2c/mf.pool
-%%TEXMF_TREE%%/web2c/mktex.opt
-%%TEXMF_TREE%%/web2c/mktexdir
-%%TEXMF_TREE%%/web2c/mktexdir.opt
-%%TEXMF_TREE%%/web2c/mktexnam
-%%TEXMF_TREE%%/web2c/mktexnam.opt
-%%TEXMF_TREE%%/web2c/mktexupd
-%%TEXMF_TREE%%/web2c/mp.pool
-%%TEXMF_TREE%%/web2c/omega.pool
-%%TEXMF_TREE%%/web2c/pdfetex-pl.pool
-%%TEXMF_TREE%%/web2c/pdfetex.pool
-%%TEXMF_TREE%%/web2c/pdftex-pl.pool
-%%TEXMF_TREE%%/web2c/pdftex.pool
-%%TEXMF_TREE%%/web2c/tex-pl.pool
-%%TEXMF_TREE%%/web2c/tex.pool
-%%TEXMF_TREE%%/web2c/texmf.cnf
+%%TEXMF%%/doc/tetex/TETEXDOC.dvi
+%%TEXMF%%/doc/tetex/TETEXDOC.pdf
+%%TEXMF%%/doc/tetex/TETEXDOC.ps
+%%TEXMF%%/doc/tetex/teTeX-FAQ
+%%TEXMF%%/dvips/gsftopk/render.ps
+%%TEXMF%%/texconfig/README
+%%TEXMF%%/texconfig/g/generic
+%%TEXMF%%/texconfig/generic
+%%TEXMF%%/texconfig/v/vt100
+%%TEXMF%%/texconfig/x/xterm
+%%TEXMF%%/web2c/etex-pl.pool
+%%TEXMF%%/web2c/etex.pool
+%%TEXMF%%/web2c/fmtutil.cnf
+%%TEXMF%%/web2c/mf.pool
+%%TEXMF%%/web2c/mktex.opt
+%%TEXMF%%/web2c/mktexdir
+%%TEXMF%%/web2c/mktexdir.opt
+%%TEXMF%%/web2c/mktexnam
+%%TEXMF%%/web2c/mktexnam.opt
+%%TEXMF%%/web2c/mktexupd
+%%TEXMF%%/web2c/mp.pool
+%%TEXMF%%/web2c/omega.pool
+%%TEXMF%%/web2c/pdfetex-pl.pool
+%%TEXMF%%/web2c/pdfetex.pool
+%%TEXMF%%/web2c/pdftex-pl.pool
+%%TEXMF%%/web2c/pdftex.pool
+%%TEXMF%%/web2c/tex-pl.pool
+%%TEXMF%%/web2c/tex.pool
+%%TEXMF%%/web2c/texmf.cnf
 %%TEXMFVAR%%/web2c/cont-en.log
 %%TEXMFVAR%%/web2c/cont-en.efmt
 %%TEXMFVAR%%/web2c/elatex.efmt
@@ -253,35 +253,35 @@ lib/libkpathsea.a
 %%TEXMFVAR%%/web2c/plain.mem
 %%TEXMFVAR%%/web2c/tex.fmt
 %%TEXMFVAR%%/web2c/tex.log
-%%XDVIK%%%%TEXMF_TREE%%/xdvi/xdvi.cfg
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/afm/hoekwater
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/bh
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/bh/lucidabr
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/bh/lumath
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ofm/public/ommincho
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ofm/uhc
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ofm/uhc/gothic
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ofm/uhc/myoungjo
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ofm/uhc/taza
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ovf/public/ommincho
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ovf/uhc
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ovf/uhc/gothic
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ovf/uhc/myoungjo
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ovf/uhc/taza
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/ovp/public/ommincho
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/pk
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/tfm/monotype
-@exec mkdir -p %D/%%TEXMF_TREE%%/fonts/vf/monotype
-@exec mkdir -p %D/%%TEXMF_TREE%%/omega/generic
-@exec mkdir -p %D/%%TEXMF_TREE%%/omega/generic/config
-@exec mkdir -p %D/%%TEXMF_TREE%%/omega/ocp/omegajapanese
-@exec mkdir -p %D/%%TEXMF_TREE%%/omega/otp/omega-j
-@exec mkdir -p %D/%%TEXMF_TREE%%/omega/otp/omegajapanese
-@exec mkdir -p %D/%%TEXMF_TREE%%/xdvi
+%%XDVIK%%%%TEXMF%%/xdvi/xdvi.cfg
+@exec mkdir -p %D/%%TEXMF%%/fonts/afm/hoekwater
+@exec mkdir -p %D/%%TEXMF%%/fonts/bh
+@exec mkdir -p %D/%%TEXMF%%/fonts/bh/lucidabr
+@exec mkdir -p %D/%%TEXMF%%/fonts/bh/lumath
+@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/public/ommincho
+@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/uhc
+@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/uhc/gothic
+@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/uhc/myoungjo
+@exec mkdir -p %D/%%TEXMF%%/fonts/ofm/uhc/taza
+@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/public/ommincho
+@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/uhc
+@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/uhc/gothic
+@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/uhc/myoungjo
+@exec mkdir -p %D/%%TEXMF%%/fonts/ovf/uhc/taza
+@exec mkdir -p %D/%%TEXMF%%/fonts/ovp/public/ommincho
+@exec mkdir -p %D/%%TEXMF%%/fonts/pk
+@exec mkdir -p %D/%%TEXMF%%/fonts/tfm/monotype
+@exec mkdir -p %D/%%TEXMF%%/fonts/vf/monotype
+@exec mkdir -p %D/%%TEXMF%%/omega/generic
+@exec mkdir -p %D/%%TEXMF%%/omega/generic/config
+@exec mkdir -p %D/%%TEXMF%%/omega/ocp/omegajapanese
+@exec mkdir -p %D/%%TEXMF%%/omega/otp/omega-j
+@exec mkdir -p %D/%%TEXMF%%/omega/otp/omegajapanese
+@exec mkdir -p %D/%%TEXMF%%/xdvi
 @dirrm include/kpathsea
-@dirrm %%TEXMF_TREE%%/texconfig/x
-@dirrm %%TEXMF_TREE%%/texconfig/v
-@dirrm %%TEXMF_TREE%%/texconfig/g
-@dirrm %%TEXMF_TREE%%/texconfig
-@dirrm %%TEXMF_TREE%%/dvips/gsftopk
+@dirrm %%TEXMF%%/texconfig/x
+@dirrm %%TEXMF%%/texconfig/v
+@dirrm %%TEXMF%%/texconfig/g
+@dirrm %%TEXMF%%/texconfig
+@dirrm %%TEXMF%%/dvips/gsftopk
 @exec %%MKTEXLSR%%
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index dc22c3cbdfa3..2a1d4be82ae9 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	teTeX
 PORTVERSION=	2.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -16,20 +16,13 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A meta port for teTeX suite
 
-RUN_DEPENDS=	${TETEX_MODESW}:${PORTSDIR}/print/tex-texmflocal \
+RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/share/texmf/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		latex:${PORTSDIR}/print/teTeX-base \
 		${LOCALBASE}/share/texmf-local/tex/latex/base/latex.ltx:${PORTSDIR}/print/teTeX-latex2e \
 		dvips:${PORTSDIR}/print/dvipsk-tetex \
 		xdvi:${PORTSDIR}/print/xdvik
 
-TETEX_MODESW=	${LOCALBASE}/bin/tetex-modesw
-
-PKGINSTALL=	${WRKDIR}/pkg-install.sh
-PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
-PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
-		MODE=${DEFAULT_MODE}
-
 # XXX: We always build in batch mode to disable OPTIONS
 #      in print/teTeX-base.
 DEPENDS_ARGS+=	BATCH=yes
@@ -43,28 +36,22 @@ CONFLICTS=	latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]*
 .if defined(WITH_LETTERSIZE)
 FLAVOR+=	letter
 DEPENDS_ARGS+=	WITH_LETTERSIZE=true
-DEFAULT_MODE=	tetex-letter
+PAPERSIZE=	letter
 .else
-DEFAULT_MODE=	tetex
+PAPERSIZE=	a4
 .endif
 
+TEXMFLOCAL_LSR=	${LOCALBASE}/share/texmf-local/ls-R
+
 # XXX: this does not work
 #.if defined(FLAVOR)
 #PKGNAMESUFFIX=	${FLAVOR:S,^,-,:Q:S,\\ ,,g:S,\\-,-,g}
 #.endif
 
-do-configure:
-	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-	${CHMOD} 0755 ${PKGINSTALL}
-
 do-build:
 	@${DO_NADA}
 
 do-install: #emtpy
 	@${DO_NADA}
 
-post-install:
-	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .include <bsd.port.post.mk>
diff --git a/print/teTeX/files/pkg-install.in b/print/teTeX/files/pkg-install.in
deleted file mode 100644
index 3733255fd501..000000000000
--- a/print/teTeX/files/pkg-install.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-MODE=%%MODE%%
-TETEX_MODESW=%%TETEX_MODESW%%
-
-case $2 in
-POST-INSTALL)
-	case ${MODE} in
-	tetex)	;;
-	*)	${TETEX_MODESW} changedefault ${MODE} ;;
-	esac
-
-	${TETEX_MODESW} default dvips  forceinstall
-	${TETEX_MODESW} default dvipdfm forceinstall
-	${TETEX_MODESW} default xdvi forceinstall
-	;;
-DEINSTALL)
-	;;
-esac
diff --git a/print/tex-texmflocal/Makefile b/print/tex-texmflocal/Makefile
index 63a08ed8e67b..bdfb8697182f 100644
--- a/print/tex-texmflocal/Makefile
+++ b/print/tex-texmflocal/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	tex-texmflocal
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -26,23 +26,6 @@ TEXMFVAR=	share/texmf-var
 TEXMFVAR_LSR=	${LOCALBASE}/${TEXMFVAR}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 
-DEFAULT_MODE=	tetex
-TEXMFCNF=	web2c/texmf.cnf
-DVIPSKCNF=	dvips/config/config.ps
-XDVIKCNF=	xdvi/XDvi
-DVIPDFMCNF=	dvipdfm/config/config
-
-TETEX_MODESW_SUB= \
-		DEFAULT_MODE=${DEFAULT_MODE} \
-		TEXMFCNF=${TEXMFCNF} \
-		DVIPSKCNF=${DVIPSKCNF} \
-		XDVIKCNF=${XDVIKCNF} \
-		DVIPDFMCNF=${DVIPDFMCNF} \
-		PREFIX=${PREFIX} \
-		TEXMF=${TEXMF} \
-		TEXMFVAR=${TEXMFVAR} \
-		TEXMFLOCAL=${TEXMFLOCAL}
-
 DIRS=	bibtex/bib bibtex/bst bibtex\
 	context/config context \
 	dvipdfm/config dvipdfm dvips/config dvips \
@@ -61,31 +44,25 @@ DIRS=	bibtex/bib bibtex/bst bibtex\
 LSRMAGIC=${ECHO_CMD} "% ls-R -- filename database for kpathsea; do not change this line."
 
 pre-install:
-	${SED} ${TETEX_MODESW_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/tetex-modesw.in > ${WRKDIR}/tetex-modesw
 	(${ECHO_CMD} "bin/tetex-modesw"; \
-		for dir in ${DIRS}; do \
-			${ECHO_CMD} "@unexec ${RMDIR} %D/${TEXMFLOCAL}/$${dir} > /dev/null 2>&1 || true"; \
-			${ECHO_CMD} "@unexec ${RMDIR} %D/${TEXMFVAR}/$${dir} > /dev/null 2>&1 || true"; \
-			${ECHO_CMD} "@exec ${MKDIR} %D/${TEXMFLOCAL}/$${dir}"; \
-			${ECHO_CMD} "@exec ${MKDIR} %D/${TEXMFVAR}/$${dir}"; \
-		done; \
-		${ECHO_CMD} '@exec ${LSRMAGIC:S,%,%%,g} > ${TEXMFLOCAL_LSR} && ${CHMOD} 0644 ${TEXMFLOCAL_LSR}'; \
-		${ECHO_CMD} '@exec ${LSRMAGIC:S,%,%%,g} > ${TEXMFVAR_LSR} && ${CHMOD} 0644 ${TEXMFVAR_LSR}'; \
-		${ECHO_CMD} '@exec ${TOUCH} ${PREFIX}/etc/tetex-modesw.conf'; \
-		${ECHO_CMD} '@unexec ${RM} -f ${PREFIX}/etc/tetex-modesw.conf > /dev/null 2>&1 || true'; \
-		${ECHO_CMD} '@unexec ${RM} -f ${TEXMFLOCAL_LSR} > /dev/null 2>&1 || true'; \
-		${ECHO_CMD} '@unexec ${RM} -f ${TEXMFVAR_LSR} > /dev/null 2>&1 || true'; \
-		${ECHO_CMD} "@unexec ${RMDIR} %D/${TEXMFLOCAL} > /dev/null 2>&1 || true"; \
-		${ECHO_CMD} "@unexec ${RMDIR} %D/${TEXMFVAR} > /dev/null 2>&1 || true"; \
-		${ECHO_CMD} '@exec if [ -x ${MKTEXLSR} ]; then ${MKTEXLSR}; fi'; \
-		${ECHO_CMD} '@unexec if [ -x ${MKTEXLSR} ]; then ${MKTEXLSR}; fi'; \
-		) > ${PLIST}
+	for dir in ${DIRS}; do \
+		${ECHO_CMD} "@unexec ${RMDIR} %D/${TEXMFLOCAL}/$${dir} > /dev/null 2>&1 || true"; \
+		${ECHO_CMD} "@unexec ${RMDIR} %D/${TEXMFVAR}/$${dir} > /dev/null 2>&1 || true"; \
+		${ECHO_CMD} "@exec ${MKDIR} %D/${TEXMFLOCAL}/$${dir}"; \
+		${ECHO_CMD} "@exec ${MKDIR} %D/${TEXMFVAR}/$${dir}"; \
+	done; \
+	${ECHO_CMD} '@exec ${LSRMAGIC:S,%,%%,g} > ${TEXMFLOCAL_LSR} && ${CHMOD} 0644 ${TEXMFLOCAL_LSR}'; \
+	${ECHO_CMD} '@exec ${LSRMAGIC:S,%,%%,g} > ${TEXMFVAR_LSR} && ${CHMOD} 0644 ${TEXMFVAR_LSR}'; \
+	${ECHO_CMD} '@unexec ${RM} -f ${TEXMFLOCAL_LSR} > /dev/null 2>&1 || true'; \
+	${ECHO_CMD} '@unexec ${RM} -f ${TEXMFVAR_LSR} > /dev/null 2>&1 || true'; \
+	${ECHO_CMD} "@unexec ${RMDIR} %D/${TEXMFLOCAL} > /dev/null 2>&1 || true"; \
+	${ECHO_CMD} "@unexec ${RMDIR} %D/${TEXMFVAR} > /dev/null 2>&1 || true"; \
+	${ECHO_CMD} '@exec if [ -x ${MKTEXLSR} ]; then ${MKTEXLSR}; fi'; \
+	${ECHO_CMD} '@unexec if [ -x ${MKTEXLSR} ]; then ${MKTEXLSR}; fi'; \
+	) > ${PLIST}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/tetex-modesw ${PREFIX}/bin
-	${TOUCH} ${PREFIX}/etc/tetex-modesw.conf
-	${CHMOD} 644 ${PREFIX}/etc/tetex-modesw.conf
+	${INSTALL_SCRIPT} ${FILESDIR}/tetex-modesw.in ${PREFIX}/bin/tetex-modesw
 	${MKDIR} ${DIRS:S,^,${PREFIX}/${TEXMFLOCAL}/,}
 	${MKDIR} ${DIRS:S,^,${PREFIX}/${TEXMFVAR}/,}
 	${LSRMAGIC} > ${TEXMFLOCAL_LSR}
diff --git a/print/tex-texmflocal/files/tetex-modesw.in b/print/tex-texmflocal/files/tetex-modesw.in
index 95e3d7cf4e72..40a5d1f5f717 100644
--- a/print/tex-texmflocal/files/tetex-modesw.in
+++ b/print/tex-texmflocal/files/tetex-modesw.in
@@ -1,142 +1,4 @@
 #!/bin/sh
 # $FreeBSD$
 
-if [ $# != 0 ]; then MODE=$1; shift; fi
-if [ $# != 0 ]; then FILE=$1; shift; fi
-if [ $# != 0 ]; then OPTIONS=$*; fi
-
-GREP=/usr/bin/grep
-SED=/usr/bin/sed
-
-CONF=%%PREFIX%%/etc/tetex-modesw.conf
-
-DEFAULT_MODE=tetex
-
-PREFIX=%%PREFIX%%
-TEXMF=%%TEXMF%%
-TEXMFLOCAL=%%TEXMFLOCAL%%
-TEXMFVAR=%%TEXMFVAR%%
-
-if [ ! -r ${CONF} ]; then
-    echo "ERROR: ${CONF} not found."
-else
-    . ${CONF}
-fi
-
-case ${FILE} in
-texmf.cnf|tex)
-	CONFIG=%%TEXMFCNF%%
-	DEFAULT_MODE=tetex
-	;;
-config.ps|dvips)
-	CONFIG=%%DVIPSKCNF%%
-	;;
-XDvi|xdvi)
-	CONFIG=%%XDVIKCNF%%
-	;;
-config|dvipdfm)
-	CONFIG=%%DVIPDFMCNF%%
-	;;
-*)
-	CONFIG=${FILE}
-	;;
-esac
-
-FORCEINSTALL=FALSE
-DESTMF=${TEXMFVAR}
-
-set -- ${OPTIONS}
-while [ $# != 0 ]; do
-    case $1 in
-    force*)
-	    FORCEINSTALL=TRUE ;;
-    main)
-	    DESTMF=${TEXMF} ;;
-    var)
-	    DESTMF=${TEXMFVAR} ;;
-    local)
-	    DESTMF=${TEXMFLOCAL} ;;
-    esac
-
-    shift;
-done
-
-usage()
-{
-    echo "Usage: tetex-modesw modename {tex|dvips|dvipdfm|xdvi} [{forceinstall|var|main|local} ...]"
-    exit 1
-}
-
-install_file()
-{
-    _MODE=$1
-    _SRC=$2
-    _DST=$3
-
-    if [ ! -f ${_SRC} ]; then
-	echo "ERROR: invalid mode \"${_MODE}\" is specified."
-	usage
-    fi
-    if [ -f ${_DST} -a "${FORCEINSTALL}" != "TRUE" ]; then
-	echo "WARNING: ${_DST} is not modified because it already exists."
-	echo "         If you want to install ${_SRC} -> ${_DST},"
-	echo "         use \"forceinstall\" option."
-	exit 1
-    fi
-
-    if [ -f ${_DST} ] && cmp -s ${_SRC} ${_DST}; then
-	:
-    else
-	echo "Installing: ${_SRC} -> ${_DST}"
-	cp -p ${_SRC} ${_DST}
-    fi
-}
-
-uninstall_file()
-{
-    for _F in $1; do
-	if [ -f ${_F} ]; then
-	    echo "Uninstalling: ${_F}"
-	    rm -f ${_F}
-	fi
-    done
-}
-
-changedefault()
-{
-    _MODE=$1
-
-    case ${_MODE} in
-    tetex|tetex-letter)
-	    echo "Default mode -> ${_MODE}"
-	    echo "DEFAULT_MODE=${_MODE}" >> ${CONF}
-	    ;;
-    *)
-	    echo "ERROR: Unknown mode ${_MODE} is specified."
-	    usage
-	    exit 1
-	    ;;
-    esac
-}
-
-case ${MODE} in
-default)
-	MODE=${DEFAULT_MODE}
-	install_file \
-	    "${MODE}" \
-	    "${PREFIX}/${TEXMF}/${CONFIG}.${MODE}" \
-	    "${PREFIX}/${DESTMF}/${CONFIG}"
-	;;
-uninstall)
-	uninstall_file ${PREFIX}/${DESTMF}/${CONFIG}
-	;;
-changedefault)
-	changedefault ${CONFIG}
-	;;
-*)
-	install_file \
-	    "${MODE}" \
-	    "${PREFIX}/${TEXMF}/${CONFIG}.${MODE}" \
-	    "${PREFIX}/${DESTMF}/${CONFIG}"
-	;;
-esac
+# DO NOTHING