- Remove dependency on tetex-modesw in print/tex-texmflocal.

- $XDVIETCDIR has been set to $TEXMF/xdvi-ptex by default.
  xdvi(1) now searches the necessary files from the share/texmf/xdvi-ptex
  directory first, and then the share/texmf/xdvi directory.
- Bump PORTREVISION.

7 files changed, 100 insertions, 70 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index b189c5e3724f..14ac09c0f73f 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
@@ -22,10 +22,10 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DVI Previewer(kpathsearch) for X. + freetype support
 
-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 \
 		${LOCALBASE}/${TEXMF}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex \
@@ -43,6 +43,7 @@ CONFIGURE_ARGS=	--datadir=${PREFIX}/${TEXMF:S,texmf$,,} \
 		--enable-a4 --enable-shrink=${SHRINK} \
 		--with-dvifilter=${DVIPS} \
 		--enable-xdviprint=${PREFIX}/libexec/xdviprint \
+		--enable-xdvietcdir=${PREFIX}/${XDVIETCDIR} \
 		--enable-smallpanel --enable-zoombutton \
 		--enable-gf \
 		--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
@@ -60,34 +61,32 @@ CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
 PATCH_STRIP=	-p1
+
 MAN1=		xdvi.1 xdvizilla.1 t1mapper.1
 
+INSTALL_WRKSRC=	${WRKSRC}/texk/xdvik
+PLIST_SUB=	TEXMF=${TEXMF} MKTEXLSR=${MKTEXLSR} \
+		XDVIETCDIR=${XDVIETCDIR}
+
 VERSION_XDVIK=	22.40y1
 VERSION_JPATCH=	1.21
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 
 TEXMF=		share/texmf
-XDVIDIR=	${TEXMF}/xdvi
-TETEX_MODESW=	${LOCALBASE}/bin/tetex-modesw
+TEXMFLOCAL=	share/texmf-local
+TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
+XDVIETCDIR=	${TEXMF}/xdvi-ptex
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 
 CIDFONTDIR=	${TEXMF}/dvipdfm/CIDFont
 TTFMINCHO=	lib/X11/fonts/TrueType/kochi-mincho-subst.ttf
 TTFGOTHIC=	lib/X11/fonts/TrueType/kochi-gothic-subst.ttf
-
 VFONTCAPFT_SRC=	${WRKSRC}/vfontmap.freetype
 VFONTCAPFT_SUB=	CIDFONTDIR=${LOCALBASE}/${CIDFONTDIR} \
 		TTFMINCHO=${X11BASE}/${TTFMINCHO} \
 		TTFGOTHIC=${X11BASE}/${TTFGOTHIC}
 
-PKGINSTALL=	${WRKDIR}/pkg-install.sh
-PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
-PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
-		MKTEXLSR=${MKTEXLSR}
-
-PLIST_SUB=	TEXMF=${TEXMF}
-
 .include <bsd.port.pre.mk>
 
 BDPI?=		600
@@ -122,34 +121,27 @@ DOCS=	FAQ xdvi.icon CHANGES.xdvik-jp.html \
 	READMEs/README.xdvik-22.15-j1.04.patch
 
 pre-build:
-	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-	${CHMOD} 0755 ${PKGINSTALL}
 	@(cd ${WRKSRC} && ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
 	${SED} ${VFONTCAPFT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		< ${FILESDIR}/vfontmap.freetype \
 		> ${VFONTCAPFT_SRC}
 
-do-install:
-	@(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \
-		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
-
 post-install:
-	${RM} -f ${PREFIX}/${XDVIDIR}/vfontmap.freetype
-	${RM} -f ${PREFIX}/${XDVIDIR}/vfontmap.vflib
+	${RM} -f ${PREFIX}/${XDVIETCDIR}/vfontmap.freetype
+	${RM} -f ${PREFIX}/${XDVIETCDIR}/vfontmap.vflib
 	${INSTALL_DATA} \
 		${VFONTCAPFT_SRC} \
-		${PREFIX}/${XDVIDIR}/vfontmap.dist
+		${PREFIX}/${XDVIETCDIR}/vfontmap.dist
 	${INSTALL_DATA} \
 		${VFONTCAPFT_SRC} \
-		${PREFIX}/${XDVIDIR}/vfontmap
+		${PREFIX}/${XDVIETCDIR}/vfontmap
 	${INSTALL_DATA} \
 		${WRKSRC}/texk/xdvik/texmf/XDvi \
-		${PREFIX}/${XDVIDIR}/XDvi.ptex-tetex
+		${PREFIX}/${XDVIETCDIR}/XDvi
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/texk/xdvik/,} ${DOCSDIR}
 .endif
-	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${MKTEXLSR}
 
 .include <bsd.port.post.mk>
diff --git a/japanese/xdvik/files/patch-texk::kpathsea::texmf.in b/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
index 317171b0e05b..f79b202fd691 100644
--- a/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
+++ b/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
@@ -1,11 +1,5 @@
 --- xdvik-22.40w/texk/kpathsea/texmf.in.orig	Sat Feb 22 05:55:05 2003
 +++ xdvik-22.40w/texk/kpathsea/texmf.in	Sat Jun 12 12:34:24 2004
-@@ -1,4 +1,4 @@
--% original texmf.cnf -- runtime path configuration file for kpathsea.
-+% ptex-tetex texmf.cnf -- runtime path configuration file for kpathsea.
- % (If you change or delete `original' on the previous line, the
- % distribution won't install its version over yours.)
- % Public domain.
 @@ -62,7 +62,7 @@
  
  % If defined, teTeX's texconfig stores modifications here (instead of the
@@ -48,16 +42,51 @@
 -TEXPOOL = .;$TEXMF/web2c
 -MFPOOL = .;$TEXMF/web2c
 -MPPOOL = .;$TEXMF/web2c
-+TEXFORMATS = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MFBASES = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MPMEMS = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+TEXPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MFPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MPPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
++TEXFORMATS = .;$TEXMF/web2c{-ptex,}
++MFBASES = .;$TEXMF/web2c{-ptex,}
++MPMEMS = .;$TEXMF/web2c{-ptex,}
++TEXPOOL = .;$TEXMF/web2c{-ptex,}
++MFPOOL = .;$TEXMF/web2c{-ptex,}
++MPPOOL = .;$TEXMF/web2c{-ptex,}
  
  % Device-independent font metric files.
  VFFONTS = .;$TEXMF/fonts/vf//
-@@ -318,7 +325,7 @@
+@@ -240,8 +247,8 @@
+ MFTINPUTS = .;$TEXMF/mft//
+ 
+ % PostScript headers, prologues (.pro), encodings (.enc) and fonts.
+-TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}//
+-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,pdftex,tex,fonts/{type1,truetype}}//
++TEXPSHEADERS = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/type1}//
++TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/{type1,truetype}}//
+ 
+ % PostScript Type 1 outline fonts.
+ T1FONTS = .;$TEXMF/fonts/type1//
+@@ -256,10 +263,10 @@
+ T42FONTS = .;$TEXMF/fonts/type42//
+ 
+ % Dvips' config.* files (this name should not start with `TEX'!).
+-TEXCONFIG = .;$TEXMF/dvips//
++TEXCONFIG = .;$TEXMF/dvips{-ptex,}//
+ 
+ % Makeindex style (.ist) files.
+-INDEXSTYLE = .;$TEXMF/makeindex//
++INDEXSTYLE = .;$TEXMF/makeindex{-ptex,}//
+ 
+ % Used by DMP (ditroff-to-mpx), called by makempx -troff.
+ TRFONTS = /usr/lib/font/devpost
+@@ -296,8 +303,8 @@
+ T4HTINPUTS   = .;$TEXMF/tex4ht//
+ 
+ % xdvik and dvipdfm can share some files with dvips
+-XDVIINPUTS = .;$TEXMF/{xdvi,dvips}//
+-DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}//
++XDVIINPUTS = .;$TEXMF/{xdvi,dvips}{-ptex,}//
++DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}{-ptex,}//
+ 
+ %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
+ % KPSE_DOT = .
+@@ -312,7 +319,7 @@
  %
  % For security reasons, it is better not to have . part of the path.
  % 
@@ -66,7 +95,7 @@
  
  
  
-@@ -483,3 +490,8 @@
+@@ -477,3 +484,8 @@
  error_line = 79
  half_error_line = 50
  max_print_line = 79
diff --git a/japanese/xdvik/files/patch-texk::make::paths.mk b/japanese/xdvik/files/patch-texk::make::paths.mk
index 7494e1d8cfed..8b8ee5b43e40 100644
--- a/japanese/xdvik/files/patch-texk::make::paths.mk
+++ b/japanese/xdvik/files/patch-texk::make::paths.mk
@@ -9,3 +9,12 @@
  
  # The top-level font directory.
  fontdir = $(texmf)/fonts
+@@ -80,7 +80,7 @@
+ fontnamedir = $(texmf)/fontname
+ 
+ # For dvips configuration files, psfonts.map, etc.
+-dvipsdir = $(texmf)/dvips
++dvipsdir = $(texmf)/dvips-ptex
+ 
+ # For dvips .pro files, gsftopk's render.ps, etc.
+ psheaderdir = $(dvipsdir)
diff --git a/japanese/xdvik/files/patch-ab b/japanese/xdvik/files/patch-texk::xdvik::Makefile.in
index 56383278c625..b354cc9b67a5 100644
--- a/japanese/xdvik/files/patch-ab
+++ b/japanese/xdvik/files/patch-texk::xdvik::Makefile.in
@@ -1,5 +1,5 @@
---- xdvik-22.40w/texk/xdvik/Makefile.in.orig	Wed Apr 16 23:26:11 2003
-+++ xdvik-22.40w/texk/xdvik/Makefile.in	Wed Apr 16 23:29:12 2003
+--- xdvik-22.40y1/texk/xdvik/Makefile.in.orig	Mon Sep 20 04:09:40 2004
++++ xdvik-22.40y1/texk/xdvik/Makefile.in	Mon Sep 20 04:10:30 2004
 @@ -80,7 +80,7 @@
    paper.o tategaki.o vfontmap.o vf2ft.o \
    $(ALLOCA) dvips.o tfmload.o
@@ -25,4 +25,13 @@
 +	for p in $(program) $(perlprog); do rm -f $(bindir)/$$p; done
  
  ### //FIXME: add installation for encoding.map here!! (same place where psfonts.map is?)
- install-data: xdvi.1 t1mapper.1 vfontmap.sample
+ install-data: xdvi.1 t1mapper.1 vfontmap.vflib vfontmap.freetype
+@@ -167,7 +166,7 @@
+ 	$(INSTALL_DATA) xdvi.1 $(man1dir)/xdvi.$(manext)
+ 	$(INSTALL_DATA) $(srcdir)/t1mapper.1 $(man1dir)/t1mapper.$(manext)
+ 	$(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext)
+-	$(INSTALL_DATA) $(srcdir)/texmf/xdvi-teTeX.cfg $(texmf)/xdvi/xdvi.cfg
++	$(INSTALL_DATA) $(srcdir)/texmf/xdvi-teTeX.cfg $(XDVIETCDIR)/xdvi.cfg
+ 	if test ! -f $(XDVIETCDIR)/vfontmap; then \
+ 	 case "$(vflib_def)" in \
+ 	  *-DVF2FT) $(INSTALL_DATA) vfontmap.freetype $(XDVIETCDIR)/vfontmap;; \
diff --git a/japanese/xdvik/files/pkg-install.in b/japanese/xdvik/files/pkg-install.in
deleted file mode 100644
index 52eee144d440..000000000000
--- a/japanese/xdvik/files/pkg-install.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-GREP=/usr/bin/grep
-SED=/usr/bin/sed
-MODE=ptex-tetex
-
-MKTEXLSR=%%MKTEXLSR%%
-TETEX_MODESW=%%TETEX_MODESW%%
-
-case $2 in
-POST-INSTALL)
-	${TETEX_MODESW} ${MODE} xdvi forceinstall
-	${MKTEXLSR}
-	;;
-DEINSTALL)
-	${TETEX_MODESW} default xdvi forceinstall
-	${MKTEXLSR}
-	;;
-esac
diff --git a/japanese/xdvik/pkg-message b/japanese/xdvik/pkg-message
new file mode 100644
index 000000000000..80051f2aff47
--- /dev/null
+++ b/japanese/xdvik/pkg-message
@@ -0,0 +1,8 @@
+=== IMPORTANT NOTICE ===
+
+- xdvi(1) searches the necessary files from the share/texmf/xdvi-ptex
+  directory first, and then the share/texmf/xdvi directory.
+
+- The files in share/texmf/xdvi-ptex should not be edited
+  directly.  Instead, copy them to share/texmf-var/xdvi-ptex and
+  edit them.  xdvi(1) will find the latter files first.
diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist
index 1877a3a82e01..5e0f1130e524 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -3,13 +3,14 @@ bin/t1mapper
 bin/xdvi
 bin/xdvizilla
 libexec/xdviprint
-%%TEXMF%%/xdvi/vfontmap
-%%TEXMF%%/xdvi/vfontmap.dist
-%%TEXMF%%/xdvi/xdvi.cfg
-%%TEXMF%%/xdvi/xdvipaper.dvi2ps-j
-%%TEXMF%%/xdvi/xdvipaper.dvips
-%%TEXMF%%/xdvi/xdvipaper.jdvi2kps
-%%TEXMF%%/xdvi/XDvi.ptex-tetex
+%%XDVIETCDIR%%/vfontmap
+%%XDVIETCDIR%%/vfontmap.dist
+%%XDVIETCDIR%%/xdvi.cfg
+%%XDVIETCDIR%%/xdvipaper.dvi2ps-j
+%%XDVIETCDIR%%/xdvipaper.dvips
+%%XDVIETCDIR%%/xdvipaper.jdvi2kps
+%%XDVIETCDIR%%/XDvi
+@dirrm %%XDVIETCDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.xdvik-jp.html
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20a-j1.1
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20c-j1.0
@@ -36,3 +37,5 @@ libexec/xdviprint
 %%PORTDOCS%%%%DOCSDIR%%/README.xdvik-22.15-j1.04.patch
 %%PORTDOCS%%%%DOCSDIR%%/xdvi.icon
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@exec %%MKTEXLSR%%
+@unexec %%MKTEXLSR%%