4 files changed, 13 insertions, 55 deletions

diff --git a/japanese/teTeX/Makefile b/japanese/teTeX/Makefile
index 77648e7110a9..aa76826c4f37 100644
--- a/japanese/teTeX/Makefile
+++ b/japanese/teTeX/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	teTeX
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	japanese print
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	ja-
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A meta port for teTeX suite for Japanese (including pTeX and JTeX)
 
-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 \
 		tex:${PORTSDIR}/print/teTeX-base \
 		ptex:${PORTSDIR}/japanese/ptex-tetex \
@@ -24,47 +24,19 @@ RUN_DEPENDS=	${TETEX_MODESW}:${PORTSDIR}/print/tex-texmflocal \
 		jtex:${PORTSDIR}/japanese/texfamily \
 		${JTEXVF}:${PORTSDIR}/japanese/texfamily-vfn2a
 
-TETEX_MODESW=	${LOCALBASE}/bin/tetex-modesw
 JTEXVF=		${LOCALBASE}/share/texmf-local/fonts/vf/n2a/dmjsy5.vf
-
-PKGINSTALL=	${WRKDIR}/pkg-install.sh
-PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
-PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
-		MODE=${DEFAULT_MODE}
+TEXMFLOCAL_LSR=	${LOCALBASE}/share/texmf-local/ls-R
 
 # XXX: We always build in batch mode to disable OPTIONS
 #      in print/teTeX-base.
 DEPENDS_ARGS+=	BATCH=yes
 
-#OPTIONS=	LETTERSIZE "Use letter size by default" off
-
 .include <bsd.port.pre.mk>
 
-#.if defined(WITH_LETTERSIZE)
-#FLAVOR+=	letter
-#DEPENDS_ARGS+=	WITH_LETTERSIZE=true
-#DEFAULT_MODE=	tetex-letter
-#.else
-DEFAULT_MODE=	ptex-tetex
-#.endif
-
-# 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/japanese/teTeX/files/pkg-install.in b/japanese/teTeX/files/pkg-install.in
deleted file mode 100644
index b08090eb9afe..000000000000
--- a/japanese/teTeX/files/pkg-install.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-MODE=%%MODE%%
-TETEX_MODESW=%%TETEX_MODESW%%
-
-case $2 in
-POST-INSTALL)
-	${TETEX_MODESW} default dvipdfm     forceinstall
-	;;
-DEINSTALL)
-	${TETEX_MODESW} default dvipdfm    forceinstall
-	;;
-esac
diff --git a/japanese/texfamily-vfn2a/Makefile b/japanese/texfamily-vfn2a/Makefile
index 3bb71ca31f6c..3815d5b01a97 100644
--- a/japanese/texfamily-vfn2a/Makefile
+++ b/japanese/texfamily-vfn2a/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	texfamily-vfn2a
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/
 DISTNAME=	vftool-${PORTVERSION}
@@ -13,12 +14,12 @@ DISTNAME=	vftool-${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Virtual fonts for NTT JTeX
 
-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 \
 		${LOCALBASE}/${TEXMF}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex \
 		jtex:${PORTSDIR}/japanese/texfamily
-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 \
 		${LOCALBASE}/${TEXMF}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex \
diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile
index 7135c335781d..747492a7ba24 100644
--- a/japanese/texfamily/Makefile
+++ b/japanese/texfamily/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	texfamily
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/
 PKGNAMEPREFIX=	ja-
@@ -24,10 +25,10 @@ EXTRACT_ONLY=	teTeX-src-1.0.7${EXTRACT_SUFX} \
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A Japanese TeX, NTT JTeX (TeXfamily)
 
-BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMFDIR}/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}/${TEXMFDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
@@ -49,15 +50,15 @@ ALL_TARGET=	default
 PLIST_SUB=	MKTEXLSR=${MKTEXLSR} \
 		TEXMFDIR=${TEXMFDIR} \
 		TEXMFLOCAL=${TEXMFLOCAL}
-CONFLICTS=	ja-ptex-base*
+CONFLICTS=	ja-ptex-base-[0-9]*
 
 INSTALL_WRKSRC=	${WRKDIR}/teTeX-1.0/texk/web2c-j
 WRKSRC=		${WRKDIR}/teTeX-1.0
 
-TETEX_MODESW=	${LOCALBASE}/bin/tetex-modesw
-
 KANJICODE?=	euc
 TEXMFDIR?=	share/texmf
+TEXMFLOCAL?=	share/texmf-local
+TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
 TEXMFCNF_SRC=	${WRKDIR}/teTeX-1.0/texk/kpathsea/texmf.cnf
 TEXMFCNF_DST=	${PREFIX}/${TEXMFDIR}/web2c-jtex/texmf.cnf
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
@@ -67,10 +68,8 @@ LIBT1_PREFIX?=	${LOCALBASE}
 
 INSTDIRS=	doc fonts jbibtex jtex source tex
 DOC_FILES=	COPYRIGHT COPYRIGHT.jis Changes.txt README.txt
-TEXMFLOCAL=	share/texmf-local
 
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--enable-local-texmf=${TEXMFLOCAL} \
+CONFIGURE_ARGS=	--enable-local-texmf=${TEXMFLOCAL} \
 		--disable-multiplatform \
 		--without-texinfo --without-dialog \
 		--with-system-ncurses --with-system-zlib \