7 files changed, 136 insertions, 17 deletions

diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 976107179813..f7e275e549b5 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	dvipsk
-PORTVERSION=	5.92b
-PORTREVISION=	1
+PORTVERSION=	5.94a
+PORTREVISION=	0
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
 		${MASTER_SITE_TEX_CTAN} \
-		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
+		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:jpatch \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/TeX/ptex-win32/utils,:S,$,:udvipspatch,}
 MASTER_SITE_SUBDIR=	systems/unix/teTeX/2.0/distrib/
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-tetex
 DISTFILES=	tetex-src-${VER_TETEX}${EXTRACT_SUFX} \
-		dvipsk-jpatch-p${VER_JPATCH}${EXTRACT_SUFX}:1
+		dvipsk-jpatch-p${VER_JPATCH}${EXTRACT_SUFX}:jpatch \
+		udvips-5.94a-p1.6.patch:udvipspatch
 DIST_SUBDIR=	teTeX
+EXTRACT_ONLY=	tetex-src-${VER_TETEX}${EXTRACT_SUFX} \
+		dvipsk-jpatch-p${VER_JPATCH}${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A DVI to PostScript translator + Japanese patch
@@ -35,7 +39,8 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		t1.5:${PORTSDIR}/devel/t1lib
 
 PATCH_WRKSRC=	${WRKDIR}/tetex-src-${VER_TETEX}/texk
-EXTRA_PATCHES=	${WRKDIR}/dvipsk-${PORTVERSION}-p${VER_JPATCH}.patch
+EXTRA_PATCHES=	${WRKDIR}/dvipsk-5.92b-p${VER_JPATCH}.patch \
+		${DISTDIR}/${DIST_SUBDIR}/udvips-5.94a-p1.6.patch
 CONFIGURE_WRKSRC=${WRKDIR}/tetex-src-${VER_TETEX}
 BUILD_WRKSRC=	${WRKDIR}/tetex-src-${VER_TETEX}/texk/dvipsk
 INSTALL_WRKSRC=	${WRKDIR}/tetex-src-${VER_TETEX}/texk/dvipsk
@@ -75,6 +80,29 @@ post-configure:
 	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 	${CHMOD} 0755 ${PKGINSTALL}
+	cd ${PATCH_WRKSRC} && ${RM} -rf udvipsk && ${CP} -pr dvipsk udvipsk
+
+do-build:
+.for D in dvipsk odvipsk
+	cd ${WRKDIR}/tetex-src-${VER_TETEX}/texk/${D} &&\
+		${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}
+.endfor
+	cd ${WRKDIR}/tetex-src-${VER_TETEX}/texk/udvipsk &&\
+		${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} \
+		program=udvips XDEFS=-DUDVIPS \
+		${ALL_TARGET}
+
+do-install:
+.for D in dvipsk odvipsk
+	cd ${WRKDIR}/tetex-src-${VER_TETEX}/texk/${D} &&\
+		${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}
+.endfor
+	${INSTALL_PROGRAM} \
+		${PATCH_WRKSRC}/udvipsk/udvips \
+		${PREFIX}/bin
 
 post-install:
 	${INSTALL_DATA} \
diff --git a/japanese/dvipsk/distinfo b/japanese/dvipsk/distinfo
index b6610c1bea40..00cb3ea24bf3 100644
--- a/japanese/dvipsk/distinfo
+++ b/japanese/dvipsk/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/dvipsk-jpatch-p1.6.tar.gz) = a072a2196015caa15834522728a91a78
 SIZE (teTeX/dvipsk-jpatch-p1.6.tar.gz) = 28637
+MD5 (teTeX/udvips-5.94a-p1.6.patch) = a41fd7b5532d72a133d8da4ff39eb45b
+SIZE (teTeX/udvips-5.94a-p1.6.patch) = 15975
diff --git a/japanese/dvipsk/files/patch-texk::kpathsea::Makefile.in b/japanese/dvipsk/files/patch-texk::kpathsea::Makefile.in
new file mode 100644
index 000000000000..8af3cee1caab
--- /dev/null
+++ b/japanese/dvipsk/files/patch-texk::kpathsea::Makefile.in
@@ -0,0 +1,11 @@
+--- kpathsea/Makefile.in.orig	Sun Feb 16 02:21:42 2003
++++ kpathsea/Makefile.in	Fri Jun 11 20:45:58 2004
+@@ -126,7 +126,7 @@
+ 	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \
+ 	| tr '%' '\012' \
+ 	| sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \
+-	      -e 's%\$$TEXMF%$(texmf)%g' \
++	      -e 's%\$$TEXMF\([,}/]\)%$(texmf)\1%g' \
+ 	      -e 's%\$$VARTEXFONTS%$(vartexfonts)%g' \
+ 	      -e 's%\$$web2cdir%$(web2cdir)%g' \
+ 	      -e 's%\$$prefix%$(prefix)%g' \
diff --git a/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in b/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
new file mode 100644
index 000000000000..edd8b20560c6
--- /dev/null
+++ b/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
@@ -0,0 +1,77 @@
+--- kpathsea/texmf.in.orig	Sat Feb 22 05:55:05 2003
++++ 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
+ % TEXMFMAIN tree).
+-%   VARTEXMF = @texmf@-var
++VARTEXMF = @texmf@-var
+ 
+ % User texmf trees can be catered for like this...
+ HOMETEXMF = $HOME/texmf
+@@ -74,7 +74,7 @@
+ %   - list $VARTEXMF in the TEXMF definition;
+ %   - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.
+ % TEXMF = $TEXMFMAIN
+-TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
++TEXMF = {$HOMETEXMF,!!$VARTEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
+ 
+ % The system trees.  These are the trees that are shared by all the users.
+ SYSTEXMF = $TEXMF
+@@ -144,6 +144,13 @@
+ TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
+ TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
+ 
++% TeXfamily
++TEXINPUTS.jtex = .:$TEXMF/{jtex,tex}/{plain,generic,}//
++TEXINPUTS.jlatex = .:$TEXMF/{jtex,tex}/{latex,generic,}//
++TEXINPUTS.jlatex209 = .:$TEXMF/{jtex,tex}/{latex209,generic,latex,}//
++TEXINPUTS.multex = .:$TEXMF/{multex,jtex,tex}/{plain,generic,}//
++TEXINPUTS.mullatex = .:$TEXMF/{multex,jtex,tex}/{latex,generic,}//
++
+ % Fontinst needs to read afm files.
+ TEXINPUTS.fontinst = .;$TEXMF/tex//;$TEXMF/fonts/afm//
+ 
+@@ -201,12 +208,12 @@
+ % and string pools (.pool) for ini{tex,mf,mp}.  It is silly that we have six
+ % paths and directories here (they all resolve to a single place by default),
+ % but historically ...
+-TEXFORMATS = .;$TEXMF/web2c
+-MFBASES = .;$TEXMF/web2c
+-MPMEMS = .;$TEXMF/web2c
+-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
+ 
+ % Device-independent font metric files.
+ VFFONTS = .;$TEXMF/fonts/vf//
+@@ -318,7 +325,7 @@
+ %
+ % For security reasons, it is better not to have . part of the path.
+ % 
+-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@
++TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/{web2c-ptex,web2c}};$TETEXDIR;@web2c@;$TEXMF/web2c
+ 
+ 
+ 
+@@ -483,3 +490,8 @@
+ error_line = 79
+ half_error_line = 50
+ max_print_line = 79
++
++% default file code of JTeX and MuLTeX
++% These override the code specified by TeX command in dumping (making format).
++jtex_filetype = euc
++%ml_input_code = junet
diff --git a/japanese/dvipsk/files/patch-texk::make::paths.mk b/japanese/dvipsk/files/patch-texk::make::paths.mk
new file mode 100644
index 000000000000..f41143d54b4d
--- /dev/null
+++ b/japanese/dvipsk/files/patch-texk::make::paths.mk
@@ -0,0 +1,11 @@
+--- make/paths.mk.orig	Sat Jun 12 12:13:14 2004
++++ make/paths.mk	Sat Jun 12 12:13:04 2004
+@@ -61,7 +61,7 @@
+ dvilj_latex2e_macrodir = $(texinputdir)/latex/dvilj
+ 
+ # mktex.cnf, texmf.cnf, etc.
+-web2cdir = $(texmf)/web2c
++web2cdir = $(texmf)/web2c-ptex
+ 
+ # The top-level font directory.
+ fontdir = $(texmf)/fonts
diff --git a/japanese/dvipsk/pkg-descr b/japanese/dvipsk/pkg-descr
index 324da2ba8876..230ee77837ef 100644
--- a/japanese/dvipsk/pkg-descr
+++ b/japanese/dvipsk/pkg-descr
@@ -3,15 +3,3 @@ a PostScript file. Missing fonts can be automatically generated if
 METAFONT exists on the system, or can be converted from `gf' to `pk'
 format on demand. Dvips also supports `tpic', `psfig', `emtex',
 and `METAPOST'.
-
-Configuration file is /usr/local/share/texmf/dvips/base/config.ps
-In this configuration, it is possible to do convert them to 
-PDF file through ghostscript, then read by Adobe Acrobat to perform
-`cut and paste' of English fonts.  If you don't like this behavior
-(i.e. You want to embed bitmap information of english fonts; cut and 
-      paste becomes impossible),  delete or comment following two lines:
-p +psfonts.cmz
-p +psfonts.amz
-
-- Makoto WATANABE
-watanabe@zlab.phys.nagoya-u.ac.jp
diff --git a/japanese/dvipsk/pkg-plist b/japanese/dvipsk/pkg-plist
index 11bf5cc8aab9..3a1c6d7d8f08 100644
--- a/japanese/dvipsk/pkg-plist
+++ b/japanese/dvipsk/pkg-plist
@@ -1,6 +1,8 @@
 @comment $FreeBSD$
 bin/afm2tfm
 bin/dvips
+bin/odvips
+bin/udvips
 %%TEXMF%%/dvips/base/tex.pro
 %%TEXMF%%/dvips/base/texps.pro
 %%TEXMF%%/dvips/base/texc.pro