6 files changed, 25 insertions, 25 deletions

diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 8342648ba01c..f02946e0d3cc 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -6,29 +6,28 @@
 #
 
 PORTNAME=	yatex
-PORTVERSION=	1.69.k
+PORTVERSION=	1.70
 CATEGORIES?=	print elisp
 MASTER_SITES=	http://www.yatex.org/ \
 		http://www.gentei.org/~yuuji/tmp/
-DISTNAME=	${PORTNAME}${VERSION}
-#DISTNAME=	${PORTNAME}${PORTVERSION}
-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
 PKGINSTALL=	${WRKDIR}/INSTALL
 PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 PKGMESSAGE=	${WRKDIR}/MESSAGE
-VERSION=	10106111128
-TARGETNAME=	YaTeX
-DIRSECTION=	The Emacs editor and associated tools
-EMACS_PORT_NAME?=emacs20
-.if (${EMACS_PORT_NAME} == xemacs21-mule)
-BUILD_DEPENDS=	xemacs:${PORTSDIR}/japanese/xemacs21-canna \
-		${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages \
-		nkf:${PORTSDIR}/japanese/nkf
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
+
+EMACS_PORT_NAME?=emacs21
+EMACS_NO_RUN_DEPENDS=YES
+.if (${EMACS_PORT_NAME} != xemacs21-mule)
+EMACS_NO_BUILD_DEPENDS=YES
 .endif
 
+VERSION=	${PORTVERSION}
+TARGETNAME=	YaTeX
+DIRSECTION=	The Emacs editor and associated tools
 EMACS_PACKAGESDIR=${EMACS_LIBDIR}/site-packages
 # Note that 'INFODIR' is defined in bsd.info.mk
 .if (${EMACS_PORT_NAME} == xemacs21)
@@ -56,13 +55,13 @@ HELPDIR=	${ELISPDIR}
 .endif
 PORTSDOCDIR=	${PREFIX}/share/doc/yatex
 .if (${EMACS_PORT_NAME} == xemacs21)
-NEW=
+DOCS=
 HELP=		help/YATEXHLP.eng
 INFOFILES=	yatexe:yahtmle
 INFONODES=	YaTeX:yahtml
 INFONODEEXPS=	Yet Another tex-mode for Emacs.:Yet Another HTML mode.
 .else
-NEW=		yatex.new
+DOCS=		00readme readme.meadow.j yatex.new
 HELP=		help/YATEXHLP.jp help/YATEXHLP.eng
 DOCSRC=		docs/yatexj.tex \
 		docs/yatex.ref \
@@ -106,14 +105,10 @@ do-build:
 		 -e 's,%%EMACS_NAME%%,${EMACS_NAME},g' \
 		< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
 	done
-# For XEmacs-mule 20.4, yatexj.info (in Japanese) should be remade
-# after Kanji code of yatexj.tex is convert from shift jis (MS-Kanji)
-# to EUC.
+# For XEmacs, yatexj (a Japanese info file) should be remade.
 .if (${EMACS_PORT_NAME} == xemacs21-mule)
 	(cd ${WRKSRC}/docs; \
-	${MV} yatexj.tex yatexj.tex.org; \
-	nkf -e yatexj.tex.org > yatexj.tex; \
-	${SETENV} LANG=ja_JP.EUC ${EMACS_CMD} -no-site-file -no-init-file \
+	${SETENV} LANG=ja_JP.eucJP ${EMACS_CMD} -no-site-file -no-init-file \
 		-batch -l texinfmt -f batch-texinfo-format yatexj.tex; \
 	)
 .endif
@@ -138,7 +133,7 @@ do-install:
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PORTSDOCDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} ${NEW} ${DOCSRC} ${PORTSDOCDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${DOCSRC} ${PORTSDOCDIR}
 .endif
 
 post-install:
diff --git a/print/yatex/distinfo b/print/yatex/distinfo
index c5170c972df1..3b34e1438f79 100644
--- a/print/yatex/distinfo
+++ b/print/yatex/distinfo
@@ -1 +1 @@
-MD5 (yatex10106111128.tar.gz) = 1f75e8531c9cd79dd88f47b71a034038
+MD5 (yatex1.70.tar.gz) = 48e850e95d74327e2d95817dbc850ada
diff --git a/print/yatex/files/yatex-startup.el.tmpl b/print/yatex/files/yatex-startup.el.tmpl
index 9c608f3b36c1..0495a1ddae28 100644
--- a/print/yatex/files/yatex-startup.el.tmpl
+++ b/print/yatex/files/yatex-startup.el.tmpl
@@ -34,9 +34,8 @@
 	)
     (progn
       ;;;;;; Emacs 20 or later ;;;;;;
-	(setq YaTeX-use-hilit19 t)
-;	(add-hook 'yatex-mode-hook 'turn-on-font-lock)
-;    	(setq YaTeX-use-font-lock t)
+;	(setq YaTeX-use-hilit19 t)
+    	(setq YaTeX-use-font-lock t)
 	)))
 
 ;;
diff --git a/print/yatex/pkg-plist.emacs b/print/yatex/pkg-plist.emacs
index 6874d0f85a37..140b8dc6c9a5 100644
--- a/print/yatex/pkg-plist.emacs
+++ b/print/yatex/pkg-plist.emacs
@@ -20,10 +20,12 @@ info/yahtmle
 info/yahtmlj
 info/yatexe
 info/yatexj
+share/doc/yatex/00readme
 share/doc/yatex/htmlqa
 share/doc/yatex/htmlqa.eng
 share/doc/yatex/qanda
 share/doc/yatex/qanda.eng
+share/doc/yatex/readme.meadow.j
 share/doc/yatex/yahtmle.tex
 share/doc/yatex/yahtmlj.tex
 share/doc/yatex/yatex.new
diff --git a/print/yatex/pkg-plist.mule b/print/yatex/pkg-plist.mule
index b8fbcabbfadc..d897c96137be 100644
--- a/print/yatex/pkg-plist.mule
+++ b/print/yatex/pkg-plist.mule
@@ -20,10 +20,12 @@ info/yahtmle
 info/yahtmlj
 info/yatexe
 info/yatexj
+share/doc/yatex/00readme
 share/doc/yatex/htmlqa
 share/doc/yatex/htmlqa.eng
 share/doc/yatex/qanda
 share/doc/yatex/qanda.eng
+share/doc/yatex/readme.meadow.j
 share/doc/yatex/yahtmle.tex
 share/doc/yatex/yahtmlj.tex
 share/doc/yatex/yatex.new
diff --git a/print/yatex/pkg-plist.xemacs-mule b/print/yatex/pkg-plist.xemacs-mule
index 6193906d4b70..fc9e13e0cd17 100644
--- a/print/yatex/pkg-plist.xemacs-mule
+++ b/print/yatex/pkg-plist.xemacs-mule
@@ -21,10 +21,12 @@ lib/xemacs/site-packages/info/yatexj.info
 lib/xemacs/site-packages/info/yatexe.info
 lib/xemacs/site-lisp/YATEXHLP.jp
 lib/xemacs/site-lisp/YATEXHLP.eng
+share/doc/yatex/00readme
 share/doc/yatex/htmlqa
 share/doc/yatex/htmlqa.eng
 share/doc/yatex/qanda
 share/doc/yatex/qanda.eng
+share/doc/yatex/readme.meadow.j
 share/doc/yatex/yahtmle.tex
 share/doc/yatex/yahtmlj.tex
 share/doc/yatex/yatex.new