- Add OPTIONS for xdvik, dvipsk, and X11 support

- dvipsk is no longer installed by default
- Add dependency: devel/t1lib
- cleanup pkg-plist

Approved by:	demon (in concept)
Approved by:	linimon (mentor)

8 files changed, 432 insertions, 118 deletions

diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index 0d2e4bcc692d..ecb175da97ba 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -7,30 +7,25 @@
 
 PORTNAME=	teTeX
 PORTVERSION=	2.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
-		${MASTER_SITE_TEX_CTAN}
+		${MASTER_SITE_TEX_CTAN} \
+		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
 MASTER_SITE_SUBDIR=	systems/unix/teTeX/2.0/distrib/
-DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF}
-EXTRACT_ONLY=	${TETEX_SRC}
+DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF} dvipsk-jpatch-p1.6${EXTRACT_SUFX}:1
+DIST_SUBDIR=	teTeX
+EXTRACT_ONLY=	${TETEX_SRC} dvipsk-jpatch-p1.6${EXTRACT_SUFX}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Thomas Esser's distribution of TeX & friends
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		wwwcore.1:${PORTSDIR}/www/libwww
+		wwwcore.1:${PORTSDIR}/www/libwww \
+		t1.5:${PORTSDIR}/devel/t1lib
 
-CONFLICTS=	ja-ptex-*
-.if !defined(WITHOUT_X11)
-USE_XLIB=	yes
-PLIST_SUB+=	X11BITS=""
-CONFLICTS+=	xdvi-*
-.else
-PLIST_SUB+=	X11BITS="@comment "
-.endif
-DIST_SUBDIR=	teTeX
 WRKSRC=		${WRKDIR}/tetex-src-${PORTVERSION}
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-multiplatform \
@@ -39,15 +34,20 @@ CONFIGURE_ARGS=	--disable-multiplatform \
 		--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
 		--with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \
 		--with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \
-		--with-pnglib-include=${LIBPNG_PREFIX}/include
-CONFIGURE_ENV=	INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}"
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--without-x11 --without-oxdvik --without-xdvik \
-			--with-mfw=no
-.endif
-MAN1=		MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allneeded.1 \
+		--with-pnglib-include=${LIBPNG_PREFIX}/include \
+		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
+		--with-t1lib-include=${LIBT1_PREFIX}/include
+CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+PLIST_SUB=	MKTEXLSR=${MKTEXLSR} TEXMFCNF=${TEXMFCNF}
+PKGINSTALL=	${WRKDIR}/pkg-install.sh
+PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
+CONFLICTS=	ja-ptex-base*
+
+MAN1=		MakeTeXPK.1 access.1 allcm.1 allneeded.1 \
 		amstex.1 bibtex.1 cont-de.1 cont-en.1 cont-nl.1 dmp.1 \
-		dvicopy.1 dvilj.1 dvips.1 dvired.1 dvitype.1 einitex.1 \
+		dvicopy.1 dvilj.1 dvired.1 dvitype.1 einitex.1 \
 		elatex.1 eplain.1 etex.1 fontexport.1 fontimport.1 \
 		gftodvi.1 gftopk.1 gftype.1 gsftopk.1 inimf.1 inimpost.1 \
 		iniomega.1 initex.1 kpsepath.1 kpsestat.1 kpsewhich.1 \
@@ -58,7 +58,7 @@ MAN1=		MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allneeded.1 \
 		pktogf.1 pktype.1 pltotf.1 pooltype.1 ps2frag.1 ps2pk.1 \
 		readlink.1 tangle.1 tex.1 texconfig.1 texi2html.1 \
 		tftopl.1 tie.1 vftovp.1 vptovf.1 weave.1 pdfetex.1 fontinst.1 \
-		cweb.1 dvihp.1 dvipdfm.1 mkindex.1 dvi2fax.1 e2pall.1 \
+		cweb.1 dvihp.1 mkindex.1 dvi2fax.1 e2pall.1 \
 		epstopdf.1 kpsetool.1 pslatex.1 \
 		rubibtex.1 rumakeindex.1 texdoc.1 texexec.1 texi2pdf.1 \
 		texshow.1 texutil.1 thumbpdf.1 texdoctk.1 updmap.1 dvitomp.1
@@ -67,42 +67,106 @@ MAN8=		fmtutil.8 texlinks.8 mkfontdesc.8
 MLINKS=		allcm.1 allec.1 mktexlsr.1 texhash.1 tex.1 virtex.1 \
 		etex.1 evirtex.1 mf.1 virmf.1 mpost.1 virmpost.1 \
 		omega.1 viromega.1 pdftex.1 pdfvirtex.1
-INFO=		dvips kpathsea latex web2c
+INFO=		kpathsea latex web2c
+
+OPTIONS=	DVIPSK "Build and install dvipsk" off \
+		XDVIK "Build and install xdvik" off \
+		X11 "Build with X Window System support" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DVIPSK)
+FLAVOR+=	dvipsk
+PLIST_SUB+=	DVIPSK=""
+MAN1+=		afm2tfm.1 dvips.1
+INFO+=		dvips
+CONFLICTS+=	dvips* ja-dvips*
+.else
+CONFIGURE_ARGS+=	--without-dvipsk
+PLIST_SUB+=	DVIPSK="@comment "
+.endif
+
+.if defined(WITH_XDVIK) && !defined(WITHOUT_X11)
+FLAVOR+=	xdvik
+PLIST_SUB+=	XDVIK=""
+MAN1+=		xdvi.1 t1mapper.1 xdvizilla.1
+CONFLICTS+=	xdvi* ja-xdvi*
+.else
+USE_XLIB=	yes
+CONFIGURE_ARGS+=	 --without-xdvik
+PLIST_SUB+=	XDVIK="@comment "
+.endif
 
 .if !defined(WITHOUT_X11)
-MAN1+=		t1mapper.1 xdvi.1 xdvizilla.1
+PLIST_SUB+=	X11BITS=""
+USE_XLIB=	yes
+.else
+FLAVOR+=	nox11
+CONFIGURE_ARGS+=--without-x11 \
+		--without-oxdvik \
+		--without-xdvik \
+		--with-mfw=no
+PLIST_SUB+=	X11BITS="@comment "
 .endif
 
+# XXX: this does not work
+#.if defined(FLAVOR)
+#PKGNAMESUFFIX=	${FLAVOR:S,^,-,:Q:S,\\ ,,g:S,\\-,-,g}
+#.endif
+
 TETEX_SRC=	tetex-src-${PORTVERSION}.tar.gz
 TETEX_TEXMF=	tetex-texmf-${PORTVERSION}.tar.gz
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
+LIBT1_PREFIX?=	${LOCALBASE}
 TEXMF_TREE=	${PREFIX}/share/texmf
+MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
+TEXMFCNF=	${TEXMF_TREE}/web2c/texmf.cnf
+DVIPSKCNF=	${TEXMF_TREE}/dvips/config/config.ps
 
 pre-configure:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "It will be ok if configure will complain about a missing texmf tree!"
 	@${ECHO_MSG}
 
-pre-install:
-	@${MKDIR} ${TEXMF_TREE}
-	@cd ${TEXMF_TREE}; tar xfz ${_DISTDIR}/${TETEX_TEXMF}
-	@${INSTALL_DATA} ${FILESDIR}/listings.sty ${TEXMF_TREE}/tex/latex/listings/
+post-configure:
+	${SED} -e 's,%%TEXMFCNF%%,${TEXMFCNF},g;s,%%DVIPSKCNF%%,${DVIPSKCNF},g;s,%%WITH_DVIPSK%%,${WITH_DVIPSK},g;s,%%MKTEXLSR%%,${MKTEXLSR},g' \
+		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
+	${CHMOD} 0755 ${PKGINSTALL}
 
-post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/utils/texinfo/util/texi2dvi ${PREFIX}/bin
-	@${SED} -e "s|^TEXMFMAIN = .*|TEXMFMAIN = ${TEXMF_TREE}|g" \
+pre-install:
+	${MKDIR} ${TEXMF_TREE}
+	cd ${TEXMF_TREE} && \
+		${TAR} xUfz ${DISTDIR}/${DIST_SUBDIR}/${TETEX_TEXMF}
+	${INSTALL_DATA} ${FILESDIR}/listings.sty ${TEXMF_TREE}/tex/latex/listings/
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/texinfo/util/texi2dvi ${PREFIX}/bin
+	${SED} -e "s|^TEXMFMAIN = .*|TEXMFMAIN = ${TEXMF_TREE}|g" \
 		< ${WRKSRC}/texk/kpathsea/texmf.cnf \
 		> ${TEXMF_TREE}/web2c/texmf.cnf
-	@${CHMOD} 644 ${TEXMF_TREE}/web2c/texmf.cnf
-	@${SETENV} TEXMFMAIN=${TEXMF_TREE} \
-		${PREFIX}/bin/texconfig font ro > /dev/null 2>&1
-	@${SETENV} TEXMFMAIN=${TEXMF_TREE} \
-		${PREFIX}/bin/texconfig font options appendonlydir varfonts
+	${CHMOD} 644 ${TEXMF_TREE}/web2c/texmf.cnf
+
+post-install:
+	${SETENV} TEXMFMAIN=${TEXMF_TREE} \
+		${WRKSRC}/texk/tetex/texconfig font ro > /dev/null 2>&1
+	${SETENV} TEXMFMAIN=${TEXMF_TREE} \
+		${WRKSRC}/texk/tetex/texconfig font options appendonlydir varfonts
+.if !defined(WITH_XDVIK)
+	${RM} -f ${TEXMF_TREE}/xdvi/XDvi
+.endif
+	cd ${TEXMF_TREE}/dvips/pstricks && \
+		${PATCH} --quiet < ${WRKDIR}/PSTricks.patch && \
+		${RM} -f pst-text.pro.orig
+	${SED} -e 's,^\(o*\),%\1,' \
+		< ${TEXMF_TREE}/dvips/config/config.ps \
+		> ${TEXMF_TREE}/dvips/config/config.ps.tetex
+	${RM} -f ${TEXMF_TREE}/dvips/config/config.ps
+	cd ${TEXMF_TREE}/web2c && \
+		${MV} texmf.cnf texmf.cnf.tetex
+	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You may want to run texconfig to configure teTeX for your"
 	@${ECHO_MSG} "local environment. You will find teTeX's local documentation"
 	@${ECHO_MSG} "in ${TEXMF_TREE}/doc/."
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/teTeX-base/distinfo b/print/teTeX-base/distinfo
index 990aae7c6e89..e3030dc9c5a1 100644
--- a/print/teTeX-base/distinfo
+++ b/print/teTeX-base/distinfo
@@ -2,3 +2,5 @@ MD5 (teTeX/tetex-src-2.0.2.tar.gz) = a16f6bba227d55e79aeee46fbbd82d28
 SIZE (teTeX/tetex-src-2.0.2.tar.gz) = 11745933
 MD5 (teTeX/tetex-texmf-2.0.2.tar.gz) = d3bdb96f9077e43b2115d3cc471743b3
 SIZE (teTeX/tetex-texmf-2.0.2.tar.gz) = 52424280
+MD5 (teTeX/dvipsk-jpatch-p1.6.tar.gz) = a072a2196015caa15834522728a91a78
+SIZE (teTeX/dvipsk-jpatch-p1.6.tar.gz) = 28637
diff --git a/print/teTeX-base/files/pkg-install.in b/print/teTeX-base/files/pkg-install.in
new file mode 100644
index 000000000000..d40fbb640ace
--- /dev/null
+++ b/print/teTeX-base/files/pkg-install.in
@@ -0,0 +1,66 @@
+# $FreeBSD$
+
+GREP=/usr/bin/grep
+SED=/usr/bin/sed
+WITH_DVIPSK="%%WITH_DVIPSK%%"
+SUFFIX=tetex
+MKTEXLSR=%%MKTEXLSR%%
+
+case $2 in
+POST-INSTALL)
+	if [ ! -f %%TEXMFCNF%% ]; then
+		cp %%TEXMFCNF%%.${SUFFIX} %%TEXMFCNF%%
+		echo "Notice: installing %%TEXMFCNF%%.${SUFFIX} -> %%TEXMFCNF%%."
+		%%MKTEXLSR%%
+	elif ${SED} q < %%TEXMFCNF%% | ${GREP} original > /dev/null 2>&1; then
+		cp %%TEXMFCNF%%.${SUFFIX} %%TEXMFCNF%%
+		echo "Notice: installing %%TEXMFCNF%%.${SUFFIX} -> %%TEXMFCNF%%."
+		%%MKTEXLSR%%
+	else
+		echo "Notice: %%TEXMFCNF%% is not installed."
+		echo "        Merge from %%TEXMFCNF%%.${SUFFIX} manually."
+	fi
+
+	case "${WITH_DVIPSK}" in
+	"")	exit 0 ;;
+	esac
+
+	if [ ! -f %%DVIPSKCNF%% ]; then
+		cp %%DVIPSKCNF%%.${SUFFIX} %%DVIPSKCNF%%
+		echo "Notice: installing %%DVIPSKCNF%%.${SUFFIX} -> %%DVIPSKCNF%%."
+		%%MKTEXLSR%%
+	elif ${SED} q < %%TEXMFCNF%% | ${GREP} "public domain" > /dev/null 2>&1; then
+		cp %%DVIPSKCNF%%.${SUFFIX} %%DVIPSKCNF%%
+		echo "Notice: installing %%DVIPSKCNF%%.${SUFFIX} -> %%DVIPSKCNF%%."
+		%%MKTEXLSR%%
+	else
+		echo "Notice: %%DVIPSKCNF%% is not installed."
+		echo "        Merge from %%DVIPSKCNF%%.${SUFFIX} manually."
+	fi
+;;
+DEINSTALL)
+	if [ -f %%TEXMFCNF%% ]; then
+		if ${SED} q < %%TEXMFCNF%% | ${GREP} original > /dev/null 2>&1; then
+			rm -f %%TEXMFCNF%%
+			echo "Notice: %%TEXMFCNF%% is removed."
+		else
+			echo "Notice: %%TEXMFCNF%% is NOT removed."
+			echo "        Remove manually."
+		fi
+	fi
+
+	case "${WITH_DVIPSK}" in
+	"")	exit 0 ;;
+	esac
+
+	if [ -f %%DVIPSKCNF%% ]; then
+		if ${SED} q < %%DVIPSKCNF%% | ${GREP} "public domain" > /dev/null 2>&1; then
+			rm -f %%DVIPSKCNF%%
+			echo "Notice: %%DVIPSKCNF%% is removed."
+		else
+			echo "Notice: %%DVIPSKCNF%% is NOT removed."
+			echo "        Remove manually."
+		fi
+	fi
+;;
+esac
diff --git a/print/teTeX-base/pkg-plist b/print/teTeX-base/pkg-plist
index 48a0deeefb12..1ba6f2752a4c 100644
--- a/print/teTeX-base/pkg-plist
+++ b/print/teTeX-base/pkg-plist
@@ -1,6 +1,6 @@
 bin/MakeTeXPK
 bin/access
-bin/afm2tfm
+%%DVIPSK%%bin/afm2tfm
 bin/allcm
 bin/allec
 bin/allneeded
@@ -18,7 +18,7 @@ bin/dvilj4l
 bin/dvilj6
 bin/dvipdfm
 bin/dvipdft
-bin/dvips
+%%DVIPSK%%bin/dvips
 bin/dvired
 bin/dvitomp
 bin/dvitype
@@ -106,7 +106,7 @@ bin/pslatex
 bin/readlink
 bin/rubibtex
 bin/rumakeindex
-%%X11BITS%%bin/t1mapper
+%%XDVIK%%bin/t1mapper
 bin/tangle
 bin/tex
 bin/texconfig
@@ -133,9 +133,9 @@ bin/virmpost
 bin/viromega
 bin/virtex
 bin/vptovf
-%%X11BITS%%bin/xdvi
-%%X11BITS%%bin/xdvi.bin
-%%X11BITS%%bin/xdvizilla
+%%XDVIK%%bin/xdvi
+%%XDVIK%%bin/xdvi.bin
+%%XDVIK%%bin/xdvizilla
 bin/weave
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
@@ -3282,26 +3282,26 @@ share/texmf/dvips/base/EC.enc
 share/texmf/dvips/base/ad.enc
 share/texmf/dvips/base/asex.enc
 share/texmf/dvips/base/asexp.enc
-share/texmf/dvips/base/color.pro
+%%DVIPSK%%share/texmf/dvips/base/color.pro
 share/texmf/dvips/base/cork.enc
-share/texmf/dvips/base/crop.pro
+%%DVIPSK%%share/texmf/dvips/base/crop.pro
 share/texmf/dvips/base/dc.enc
 share/texmf/dvips/base/dvips.enc
 share/texmf/dvips/base/extex.enc
-share/texmf/dvips/base/finclude.pro
+%%DVIPSK%%share/texmf/dvips/base/finclude.pro
 share/texmf/dvips/base/funky.enc
-share/texmf/dvips/base/hps.pro
+%%DVIPSK%%share/texmf/dvips/base/hps.pro
 share/texmf/dvips/base/mh2scr.enc
 share/texmf/dvips/base/psfonts.map
-share/texmf/dvips/base/special.pro
-share/texmf/dvips/base/tex.pro
+%%DVIPSK%%share/texmf/dvips/base/special.pro
+%%DVIPSK%%share/texmf/dvips/base/tex.pro
 share/texmf/dvips/base/tex256.enc
-share/texmf/dvips/base/texc.pro
+%%DVIPSK%%share/texmf/dvips/base/texc.pro
 share/texmf/dvips/base/texmext.enc
 share/texmf/dvips/base/texmital.enc
 share/texmf/dvips/base/texmsym.enc
 share/texmf/dvips/base/texnansx.enc
-share/texmf/dvips/base/texps.pro
+%%DVIPSK%%share/texmf/dvips/base/texps.pro
 share/texmf/dvips/base/xl2.enc
 share/texmf/dvips/base/xt2.enc
 share/texmf/dvips/bluesky/config.ams
@@ -3315,7 +3315,7 @@ share/texmf/dvips/bluesky/psfonts.cmz
 share/texmf/dvips/cc-pl/cc-pl.enc
 share/texmf/dvips/cc-pl/ccpl.map
 share/texmf/dvips/config/builtin35.map
-share/texmf/dvips/config/config.ps
+share/texmf/dvips/config/config.ps.tetex
 share/texmf/dvips/config/context.map
 share/texmf/dvips/config/download35.map
 share/texmf/dvips/config/dvipdfm.map
@@ -9165,7 +9165,6 @@ share/texmf/fonts/vf/yandy/times/ptmbc8y.vf
 share/texmf/fonts/vf/yandy/times/ptmrc8y.vf
 share/texmf/fonts/vf/yandy/times/tibsc.vf
 share/texmf/fonts/vf/yandy/times/tirsc.vf
-share/texmf/ls-R
 share/texmf/makeindex/gglo.ist
 share/texmf/makeindex/gind.ist
 share/texmf/makeindex/nomencl.ist
@@ -11691,10 +11690,34 @@ share/texmf/web2c/tex-pl.pool
 share/texmf/web2c/tex.fmt
 share/texmf/web2c/tex.log
 share/texmf/web2c/tex.pool
-share/texmf/web2c/texmf.cnf
+share/texmf/web2c/texmf.cnf.tetex
 share/texmf/web2c/updmap.cfg
-share/texmf/xdvi/XDvi
-%%X11BITS%%share/texmf/xdvi/xdvi.cfg
+%%XDVIK%%share/texmf/xdvi/XDvi
+%%XDVIK%%share/texmf/xdvi/xdvi.cfg
+@exec mkdir -p %D/share/texmf/fonts/afm/hoekwater
+@exec mkdir -p %D/share/texmf/fonts/bh
+@exec mkdir -p %D/share/texmf/fonts/bh/lucidabr
+@exec mkdir -p %D/share/texmf/fonts/bh/lumath
+@exec mkdir -p %D/share/texmf/fonts/ofm/public/ommincho
+@exec mkdir -p %D/share/texmf/fonts/ofm/uhc
+@exec mkdir -p %D/share/texmf/fonts/ofm/uhc/gothic
+@exec mkdir -p %D/share/texmf/fonts/ofm/uhc/myoungjo
+@exec mkdir -p %D/share/texmf/fonts/ofm/uhc/taza
+@exec mkdir -p %D/share/texmf/fonts/ovf/public/ommincho
+@exec mkdir -p %D/share/texmf/fonts/ovf/uhc
+@exec mkdir -p %D/share/texmf/fonts/ovf/uhc/gothic
+@exec mkdir -p %D/share/texmf/fonts/ovf/uhc/myoungjo
+@exec mkdir -p %D/share/texmf/fonts/ovf/uhc/taza
+@exec mkdir -p %D/share/texmf/fonts/ovp/public/ommincho
+@exec mkdir -p %D/share/texmf/fonts/pk
+@exec mkdir -p %D/share/texmf/fonts/tfm/monotype
+@exec mkdir -p %D/share/texmf/fonts/vf/monotype
+@exec mkdir -p %D/share/texmf/omega/generic
+@exec mkdir -p %D/share/texmf/omega/generic/config
+@exec mkdir -p %D/share/texmf/omega/ocp/omegajapanese
+@exec mkdir -p %D/share/texmf/omega/otp/omega-j
+@exec mkdir -p %D/share/texmf/omega/otp/omegajapanese
+@exec mkdir -p %D/share/texmf/xdvi
 @dirrm include/kpathsea
 @dirrm share/texmf/xdvi
 @dirrm share/texmf/web2c
@@ -11863,9 +11886,9 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/omega/plain
 @dirrm share/texmf/omega/otp/uni2char
 @dirrm share/texmf/omega/otp/otibet
-@dirrm share/texmf/omega/otp/omegajapanese
 @dirrm share/texmf/omega/otp/omega-j
 @dirrm share/texmf/omega/otp/omega
+@dirrm share/texmf/omega/otp/omegajapanese
 @dirrm share/texmf/omega/otp/ocherokee
 @dirrm share/texmf/omega/otp/misc
 @dirrm share/texmf/omega/otp/ethiop
@@ -11873,8 +11896,8 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/omega/otp
 @dirrm share/texmf/omega/ocp/uni2char
 @dirrm share/texmf/omega/ocp/otibet
-@dirrm share/texmf/omega/ocp/omegajapanese
 @dirrm share/texmf/omega/ocp/omega
+@dirrm share/texmf/omega/ocp/omegajapanese
 @dirrm share/texmf/omega/ocp/ocherokee
 @dirrm share/texmf/omega/ocp/misc
 @dirrm share/texmf/omega/ocp/ethiop
@@ -12433,4 +12456,6 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/bibtex/bib/ams
 @dirrm share/texmf/bibtex/bib
 @dirrm share/texmf/bibtex
+@unexec rm -f %D/share/texmf/ls-R
 @dirrm share/texmf
+@exec %%MKTEXLSR%%
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 0d2e4bcc692d..ecb175da97ba 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -7,30 +7,25 @@
 
 PORTNAME=	teTeX
 PORTVERSION=	2.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
-		${MASTER_SITE_TEX_CTAN}
+		${MASTER_SITE_TEX_CTAN} \
+		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
 MASTER_SITE_SUBDIR=	systems/unix/teTeX/2.0/distrib/
-DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF}
-EXTRACT_ONLY=	${TETEX_SRC}
+DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF} dvipsk-jpatch-p1.6${EXTRACT_SUFX}:1
+DIST_SUBDIR=	teTeX
+EXTRACT_ONLY=	${TETEX_SRC} dvipsk-jpatch-p1.6${EXTRACT_SUFX}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Thomas Esser's distribution of TeX & friends
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		wwwcore.1:${PORTSDIR}/www/libwww
+		wwwcore.1:${PORTSDIR}/www/libwww \
+		t1.5:${PORTSDIR}/devel/t1lib
 
-CONFLICTS=	ja-ptex-*
-.if !defined(WITHOUT_X11)
-USE_XLIB=	yes
-PLIST_SUB+=	X11BITS=""
-CONFLICTS+=	xdvi-*
-.else
-PLIST_SUB+=	X11BITS="@comment "
-.endif
-DIST_SUBDIR=	teTeX
 WRKSRC=		${WRKDIR}/tetex-src-${PORTVERSION}
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-multiplatform \
@@ -39,15 +34,20 @@ CONFIGURE_ARGS=	--disable-multiplatform \
 		--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
 		--with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \
 		--with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \
-		--with-pnglib-include=${LIBPNG_PREFIX}/include
-CONFIGURE_ENV=	INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}"
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--without-x11 --without-oxdvik --without-xdvik \
-			--with-mfw=no
-.endif
-MAN1=		MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allneeded.1 \
+		--with-pnglib-include=${LIBPNG_PREFIX}/include \
+		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
+		--with-t1lib-include=${LIBT1_PREFIX}/include
+CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+PLIST_SUB=	MKTEXLSR=${MKTEXLSR} TEXMFCNF=${TEXMFCNF}
+PKGINSTALL=	${WRKDIR}/pkg-install.sh
+PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
+CONFLICTS=	ja-ptex-base*
+
+MAN1=		MakeTeXPK.1 access.1 allcm.1 allneeded.1 \
 		amstex.1 bibtex.1 cont-de.1 cont-en.1 cont-nl.1 dmp.1 \
-		dvicopy.1 dvilj.1 dvips.1 dvired.1 dvitype.1 einitex.1 \
+		dvicopy.1 dvilj.1 dvired.1 dvitype.1 einitex.1 \
 		elatex.1 eplain.1 etex.1 fontexport.1 fontimport.1 \
 		gftodvi.1 gftopk.1 gftype.1 gsftopk.1 inimf.1 inimpost.1 \
 		iniomega.1 initex.1 kpsepath.1 kpsestat.1 kpsewhich.1 \
@@ -58,7 +58,7 @@ MAN1=		MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allneeded.1 \
 		pktogf.1 pktype.1 pltotf.1 pooltype.1 ps2frag.1 ps2pk.1 \
 		readlink.1 tangle.1 tex.1 texconfig.1 texi2html.1 \
 		tftopl.1 tie.1 vftovp.1 vptovf.1 weave.1 pdfetex.1 fontinst.1 \
-		cweb.1 dvihp.1 dvipdfm.1 mkindex.1 dvi2fax.1 e2pall.1 \
+		cweb.1 dvihp.1 mkindex.1 dvi2fax.1 e2pall.1 \
 		epstopdf.1 kpsetool.1 pslatex.1 \
 		rubibtex.1 rumakeindex.1 texdoc.1 texexec.1 texi2pdf.1 \
 		texshow.1 texutil.1 thumbpdf.1 texdoctk.1 updmap.1 dvitomp.1
@@ -67,42 +67,106 @@ MAN8=		fmtutil.8 texlinks.8 mkfontdesc.8
 MLINKS=		allcm.1 allec.1 mktexlsr.1 texhash.1 tex.1 virtex.1 \
 		etex.1 evirtex.1 mf.1 virmf.1 mpost.1 virmpost.1 \
 		omega.1 viromega.1 pdftex.1 pdfvirtex.1
-INFO=		dvips kpathsea latex web2c
+INFO=		kpathsea latex web2c
+
+OPTIONS=	DVIPSK "Build and install dvipsk" off \
+		XDVIK "Build and install xdvik" off \
+		X11 "Build with X Window System support" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DVIPSK)
+FLAVOR+=	dvipsk
+PLIST_SUB+=	DVIPSK=""
+MAN1+=		afm2tfm.1 dvips.1
+INFO+=		dvips
+CONFLICTS+=	dvips* ja-dvips*
+.else
+CONFIGURE_ARGS+=	--without-dvipsk
+PLIST_SUB+=	DVIPSK="@comment "
+.endif
+
+.if defined(WITH_XDVIK) && !defined(WITHOUT_X11)
+FLAVOR+=	xdvik
+PLIST_SUB+=	XDVIK=""
+MAN1+=		xdvi.1 t1mapper.1 xdvizilla.1
+CONFLICTS+=	xdvi* ja-xdvi*
+.else
+USE_XLIB=	yes
+CONFIGURE_ARGS+=	 --without-xdvik
+PLIST_SUB+=	XDVIK="@comment "
+.endif
 
 .if !defined(WITHOUT_X11)
-MAN1+=		t1mapper.1 xdvi.1 xdvizilla.1
+PLIST_SUB+=	X11BITS=""
+USE_XLIB=	yes
+.else
+FLAVOR+=	nox11
+CONFIGURE_ARGS+=--without-x11 \
+		--without-oxdvik \
+		--without-xdvik \
+		--with-mfw=no
+PLIST_SUB+=	X11BITS="@comment "
 .endif
 
+# XXX: this does not work
+#.if defined(FLAVOR)
+#PKGNAMESUFFIX=	${FLAVOR:S,^,-,:Q:S,\\ ,,g:S,\\-,-,g}
+#.endif
+
 TETEX_SRC=	tetex-src-${PORTVERSION}.tar.gz
 TETEX_TEXMF=	tetex-texmf-${PORTVERSION}.tar.gz
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
+LIBT1_PREFIX?=	${LOCALBASE}
 TEXMF_TREE=	${PREFIX}/share/texmf
+MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
+TEXMFCNF=	${TEXMF_TREE}/web2c/texmf.cnf
+DVIPSKCNF=	${TEXMF_TREE}/dvips/config/config.ps
 
 pre-configure:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "It will be ok if configure will complain about a missing texmf tree!"
 	@${ECHO_MSG}
 
-pre-install:
-	@${MKDIR} ${TEXMF_TREE}
-	@cd ${TEXMF_TREE}; tar xfz ${_DISTDIR}/${TETEX_TEXMF}
-	@${INSTALL_DATA} ${FILESDIR}/listings.sty ${TEXMF_TREE}/tex/latex/listings/
+post-configure:
+	${SED} -e 's,%%TEXMFCNF%%,${TEXMFCNF},g;s,%%DVIPSKCNF%%,${DVIPSKCNF},g;s,%%WITH_DVIPSK%%,${WITH_DVIPSK},g;s,%%MKTEXLSR%%,${MKTEXLSR},g' \
+		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
+	${CHMOD} 0755 ${PKGINSTALL}
 
-post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/utils/texinfo/util/texi2dvi ${PREFIX}/bin
-	@${SED} -e "s|^TEXMFMAIN = .*|TEXMFMAIN = ${TEXMF_TREE}|g" \
+pre-install:
+	${MKDIR} ${TEXMF_TREE}
+	cd ${TEXMF_TREE} && \
+		${TAR} xUfz ${DISTDIR}/${DIST_SUBDIR}/${TETEX_TEXMF}
+	${INSTALL_DATA} ${FILESDIR}/listings.sty ${TEXMF_TREE}/tex/latex/listings/
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/texinfo/util/texi2dvi ${PREFIX}/bin
+	${SED} -e "s|^TEXMFMAIN = .*|TEXMFMAIN = ${TEXMF_TREE}|g" \
 		< ${WRKSRC}/texk/kpathsea/texmf.cnf \
 		> ${TEXMF_TREE}/web2c/texmf.cnf
-	@${CHMOD} 644 ${TEXMF_TREE}/web2c/texmf.cnf
-	@${SETENV} TEXMFMAIN=${TEXMF_TREE} \
-		${PREFIX}/bin/texconfig font ro > /dev/null 2>&1
-	@${SETENV} TEXMFMAIN=${TEXMF_TREE} \
-		${PREFIX}/bin/texconfig font options appendonlydir varfonts
+	${CHMOD} 644 ${TEXMF_TREE}/web2c/texmf.cnf
+
+post-install:
+	${SETENV} TEXMFMAIN=${TEXMF_TREE} \
+		${WRKSRC}/texk/tetex/texconfig font ro > /dev/null 2>&1
+	${SETENV} TEXMFMAIN=${TEXMF_TREE} \
+		${WRKSRC}/texk/tetex/texconfig font options appendonlydir varfonts
+.if !defined(WITH_XDVIK)
+	${RM} -f ${TEXMF_TREE}/xdvi/XDvi
+.endif
+	cd ${TEXMF_TREE}/dvips/pstricks && \
+		${PATCH} --quiet < ${WRKDIR}/PSTricks.patch && \
+		${RM} -f pst-text.pro.orig
+	${SED} -e 's,^\(o*\),%\1,' \
+		< ${TEXMF_TREE}/dvips/config/config.ps \
+		> ${TEXMF_TREE}/dvips/config/config.ps.tetex
+	${RM} -f ${TEXMF_TREE}/dvips/config/config.ps
+	cd ${TEXMF_TREE}/web2c && \
+		${MV} texmf.cnf texmf.cnf.tetex
+	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You may want to run texconfig to configure teTeX for your"
 	@${ECHO_MSG} "local environment. You will find teTeX's local documentation"
 	@${ECHO_MSG} "in ${TEXMF_TREE}/doc/."
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/teTeX/distinfo b/print/teTeX/distinfo
index 990aae7c6e89..e3030dc9c5a1 100644
--- a/print/teTeX/distinfo
+++ b/print/teTeX/distinfo
@@ -2,3 +2,5 @@ MD5 (teTeX/tetex-src-2.0.2.tar.gz) = a16f6bba227d55e79aeee46fbbd82d28
 SIZE (teTeX/tetex-src-2.0.2.tar.gz) = 11745933
 MD5 (teTeX/tetex-texmf-2.0.2.tar.gz) = d3bdb96f9077e43b2115d3cc471743b3
 SIZE (teTeX/tetex-texmf-2.0.2.tar.gz) = 52424280
+MD5 (teTeX/dvipsk-jpatch-p1.6.tar.gz) = a072a2196015caa15834522728a91a78
+SIZE (teTeX/dvipsk-jpatch-p1.6.tar.gz) = 28637
diff --git a/print/teTeX/files/pkg-install.in b/print/teTeX/files/pkg-install.in
new file mode 100644
index 000000000000..d40fbb640ace
--- /dev/null
+++ b/print/teTeX/files/pkg-install.in
@@ -0,0 +1,66 @@
+# $FreeBSD$
+
+GREP=/usr/bin/grep
+SED=/usr/bin/sed
+WITH_DVIPSK="%%WITH_DVIPSK%%"
+SUFFIX=tetex
+MKTEXLSR=%%MKTEXLSR%%
+
+case $2 in
+POST-INSTALL)
+	if [ ! -f %%TEXMFCNF%% ]; then
+		cp %%TEXMFCNF%%.${SUFFIX} %%TEXMFCNF%%
+		echo "Notice: installing %%TEXMFCNF%%.${SUFFIX} -> %%TEXMFCNF%%."
+		%%MKTEXLSR%%
+	elif ${SED} q < %%TEXMFCNF%% | ${GREP} original > /dev/null 2>&1; then
+		cp %%TEXMFCNF%%.${SUFFIX} %%TEXMFCNF%%
+		echo "Notice: installing %%TEXMFCNF%%.${SUFFIX} -> %%TEXMFCNF%%."
+		%%MKTEXLSR%%
+	else
+		echo "Notice: %%TEXMFCNF%% is not installed."
+		echo "        Merge from %%TEXMFCNF%%.${SUFFIX} manually."
+	fi
+
+	case "${WITH_DVIPSK}" in
+	"")	exit 0 ;;
+	esac
+
+	if [ ! -f %%DVIPSKCNF%% ]; then
+		cp %%DVIPSKCNF%%.${SUFFIX} %%DVIPSKCNF%%
+		echo "Notice: installing %%DVIPSKCNF%%.${SUFFIX} -> %%DVIPSKCNF%%."
+		%%MKTEXLSR%%
+	elif ${SED} q < %%TEXMFCNF%% | ${GREP} "public domain" > /dev/null 2>&1; then
+		cp %%DVIPSKCNF%%.${SUFFIX} %%DVIPSKCNF%%
+		echo "Notice: installing %%DVIPSKCNF%%.${SUFFIX} -> %%DVIPSKCNF%%."
+		%%MKTEXLSR%%
+	else
+		echo "Notice: %%DVIPSKCNF%% is not installed."
+		echo "        Merge from %%DVIPSKCNF%%.${SUFFIX} manually."
+	fi
+;;
+DEINSTALL)
+	if [ -f %%TEXMFCNF%% ]; then
+		if ${SED} q < %%TEXMFCNF%% | ${GREP} original > /dev/null 2>&1; then
+			rm -f %%TEXMFCNF%%
+			echo "Notice: %%TEXMFCNF%% is removed."
+		else
+			echo "Notice: %%TEXMFCNF%% is NOT removed."
+			echo "        Remove manually."
+		fi
+	fi
+
+	case "${WITH_DVIPSK}" in
+	"")	exit 0 ;;
+	esac
+
+	if [ -f %%DVIPSKCNF%% ]; then
+		if ${SED} q < %%DVIPSKCNF%% | ${GREP} "public domain" > /dev/null 2>&1; then
+			rm -f %%DVIPSKCNF%%
+			echo "Notice: %%DVIPSKCNF%% is removed."
+		else
+			echo "Notice: %%DVIPSKCNF%% is NOT removed."
+			echo "        Remove manually."
+		fi
+	fi
+;;
+esac
diff --git a/print/teTeX/pkg-plist b/print/teTeX/pkg-plist
index 48a0deeefb12..1ba6f2752a4c 100644
--- a/print/teTeX/pkg-plist
+++ b/print/teTeX/pkg-plist
@@ -1,6 +1,6 @@
 bin/MakeTeXPK
 bin/access
-bin/afm2tfm
+%%DVIPSK%%bin/afm2tfm
 bin/allcm
 bin/allec
 bin/allneeded
@@ -18,7 +18,7 @@ bin/dvilj4l
 bin/dvilj6
 bin/dvipdfm
 bin/dvipdft
-bin/dvips
+%%DVIPSK%%bin/dvips
 bin/dvired
 bin/dvitomp
 bin/dvitype
@@ -106,7 +106,7 @@ bin/pslatex
 bin/readlink
 bin/rubibtex
 bin/rumakeindex
-%%X11BITS%%bin/t1mapper
+%%XDVIK%%bin/t1mapper
 bin/tangle
 bin/tex
 bin/texconfig
@@ -133,9 +133,9 @@ bin/virmpost
 bin/viromega
 bin/virtex
 bin/vptovf
-%%X11BITS%%bin/xdvi
-%%X11BITS%%bin/xdvi.bin
-%%X11BITS%%bin/xdvizilla
+%%XDVIK%%bin/xdvi
+%%XDVIK%%bin/xdvi.bin
+%%XDVIK%%bin/xdvizilla
 bin/weave
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
@@ -3282,26 +3282,26 @@ share/texmf/dvips/base/EC.enc
 share/texmf/dvips/base/ad.enc
 share/texmf/dvips/base/asex.enc
 share/texmf/dvips/base/asexp.enc
-share/texmf/dvips/base/color.pro
+%%DVIPSK%%share/texmf/dvips/base/color.pro
 share/texmf/dvips/base/cork.enc
-share/texmf/dvips/base/crop.pro
+%%DVIPSK%%share/texmf/dvips/base/crop.pro
 share/texmf/dvips/base/dc.enc
 share/texmf/dvips/base/dvips.enc
 share/texmf/dvips/base/extex.enc
-share/texmf/dvips/base/finclude.pro
+%%DVIPSK%%share/texmf/dvips/base/finclude.pro
 share/texmf/dvips/base/funky.enc
-share/texmf/dvips/base/hps.pro
+%%DVIPSK%%share/texmf/dvips/base/hps.pro
 share/texmf/dvips/base/mh2scr.enc
 share/texmf/dvips/base/psfonts.map
-share/texmf/dvips/base/special.pro
-share/texmf/dvips/base/tex.pro
+%%DVIPSK%%share/texmf/dvips/base/special.pro
+%%DVIPSK%%share/texmf/dvips/base/tex.pro
 share/texmf/dvips/base/tex256.enc
-share/texmf/dvips/base/texc.pro
+%%DVIPSK%%share/texmf/dvips/base/texc.pro
 share/texmf/dvips/base/texmext.enc
 share/texmf/dvips/base/texmital.enc
 share/texmf/dvips/base/texmsym.enc
 share/texmf/dvips/base/texnansx.enc
-share/texmf/dvips/base/texps.pro
+%%DVIPSK%%share/texmf/dvips/base/texps.pro
 share/texmf/dvips/base/xl2.enc
 share/texmf/dvips/base/xt2.enc
 share/texmf/dvips/bluesky/config.ams
@@ -3315,7 +3315,7 @@ share/texmf/dvips/bluesky/psfonts.cmz
 share/texmf/dvips/cc-pl/cc-pl.enc
 share/texmf/dvips/cc-pl/ccpl.map
 share/texmf/dvips/config/builtin35.map
-share/texmf/dvips/config/config.ps
+share/texmf/dvips/config/config.ps.tetex
 share/texmf/dvips/config/context.map
 share/texmf/dvips/config/download35.map
 share/texmf/dvips/config/dvipdfm.map
@@ -9165,7 +9165,6 @@ share/texmf/fonts/vf/yandy/times/ptmbc8y.vf
 share/texmf/fonts/vf/yandy/times/ptmrc8y.vf
 share/texmf/fonts/vf/yandy/times/tibsc.vf
 share/texmf/fonts/vf/yandy/times/tirsc.vf
-share/texmf/ls-R
 share/texmf/makeindex/gglo.ist
 share/texmf/makeindex/gind.ist
 share/texmf/makeindex/nomencl.ist
@@ -11691,10 +11690,34 @@ share/texmf/web2c/tex-pl.pool
 share/texmf/web2c/tex.fmt
 share/texmf/web2c/tex.log
 share/texmf/web2c/tex.pool
-share/texmf/web2c/texmf.cnf
+share/texmf/web2c/texmf.cnf.tetex
 share/texmf/web2c/updmap.cfg
-share/texmf/xdvi/XDvi
-%%X11BITS%%share/texmf/xdvi/xdvi.cfg
+%%XDVIK%%share/texmf/xdvi/XDvi
+%%XDVIK%%share/texmf/xdvi/xdvi.cfg
+@exec mkdir -p %D/share/texmf/fonts/afm/hoekwater
+@exec mkdir -p %D/share/texmf/fonts/bh
+@exec mkdir -p %D/share/texmf/fonts/bh/lucidabr
+@exec mkdir -p %D/share/texmf/fonts/bh/lumath
+@exec mkdir -p %D/share/texmf/fonts/ofm/public/ommincho
+@exec mkdir -p %D/share/texmf/fonts/ofm/uhc
+@exec mkdir -p %D/share/texmf/fonts/ofm/uhc/gothic
+@exec mkdir -p %D/share/texmf/fonts/ofm/uhc/myoungjo
+@exec mkdir -p %D/share/texmf/fonts/ofm/uhc/taza
+@exec mkdir -p %D/share/texmf/fonts/ovf/public/ommincho
+@exec mkdir -p %D/share/texmf/fonts/ovf/uhc
+@exec mkdir -p %D/share/texmf/fonts/ovf/uhc/gothic
+@exec mkdir -p %D/share/texmf/fonts/ovf/uhc/myoungjo
+@exec mkdir -p %D/share/texmf/fonts/ovf/uhc/taza
+@exec mkdir -p %D/share/texmf/fonts/ovp/public/ommincho
+@exec mkdir -p %D/share/texmf/fonts/pk
+@exec mkdir -p %D/share/texmf/fonts/tfm/monotype
+@exec mkdir -p %D/share/texmf/fonts/vf/monotype
+@exec mkdir -p %D/share/texmf/omega/generic
+@exec mkdir -p %D/share/texmf/omega/generic/config
+@exec mkdir -p %D/share/texmf/omega/ocp/omegajapanese
+@exec mkdir -p %D/share/texmf/omega/otp/omega-j
+@exec mkdir -p %D/share/texmf/omega/otp/omegajapanese
+@exec mkdir -p %D/share/texmf/xdvi
 @dirrm include/kpathsea
 @dirrm share/texmf/xdvi
 @dirrm share/texmf/web2c
@@ -11863,9 +11886,9 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/omega/plain
 @dirrm share/texmf/omega/otp/uni2char
 @dirrm share/texmf/omega/otp/otibet
-@dirrm share/texmf/omega/otp/omegajapanese
 @dirrm share/texmf/omega/otp/omega-j
 @dirrm share/texmf/omega/otp/omega
+@dirrm share/texmf/omega/otp/omegajapanese
 @dirrm share/texmf/omega/otp/ocherokee
 @dirrm share/texmf/omega/otp/misc
 @dirrm share/texmf/omega/otp/ethiop
@@ -11873,8 +11896,8 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/omega/otp
 @dirrm share/texmf/omega/ocp/uni2char
 @dirrm share/texmf/omega/ocp/otibet
-@dirrm share/texmf/omega/ocp/omegajapanese
 @dirrm share/texmf/omega/ocp/omega
+@dirrm share/texmf/omega/ocp/omegajapanese
 @dirrm share/texmf/omega/ocp/ocherokee
 @dirrm share/texmf/omega/ocp/misc
 @dirrm share/texmf/omega/ocp/ethiop
@@ -12433,4 +12456,6 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/bibtex/bib/ams
 @dirrm share/texmf/bibtex/bib
 @dirrm share/texmf/bibtex
+@unexec rm -f %D/share/texmf/ls-R
 @dirrm share/texmf
+@exec %%MKTEXLSR%%