4 files changed, 73 insertions, 101 deletions

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%%