- Update to 1.81.

- Add LICENSE.
- Update yatex-startup.el for modern Emacsen.

5 files changed, 51 insertions, 51 deletions

diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index d90994df919c..a51d02e31a12 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	yatex
-PORTVERSION=	1.77
-PORTREVISION=	4
+PORTVERSION=	1.81
 CATEGORIES?=	print elisp
 MASTER_SITES=	http://www.yatex.org/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
@@ -12,9 +11,11 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Yet Another LaTeX mode and html mode on Emacs
 
-BROKEN=		unfetchable
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKDIR}/LICENSE
 
 USES=		dos2unix emacs
+
 EMACS_NO_DEPENDS=	yes
 
 NO_BUILD=	yes
@@ -28,28 +29,32 @@ PORTDOCS=	00readme readme.meadow.j yatex.new yatexj.tex yatex.ref	\
 		yatexe.tex htmlqa.eng yahtmle.tex yatexref.eng qanda.eng
 INFO=		yahtmle yahtmlj yatexe yatexj
 
-ELFILES=	comment.el yatex.el yatexadd.el yatexgen.el \
-		yatexenv.el yatexlib.el \
-		yatexmth.el yatexhks.el yatexhlp.el yatexprc.el \
-		yatexm-o.el yatexsec.el  yatexpkg.el yatexhie.el yahtml.el \
-		yatex19.el
+ELFILES=yahtml.el yatex.el yatex19.el yatex23.el yatexadd.el		\
+	yatexenv.el yatexflt.el yatexgen.el yatexhie.el yatexhks.el	\
+	yatexhlp.el yatexlib.el yatexm-o.el yatexmth.el yatexpkg.el	\
+	yatexprc.el yatexsec.el
 
 post-extract:
-	@${INSTALL_DATA} ${WRKSRC}/docs/* ${WRKSRC}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${WRKSRC}
+	${SED} -n "/(c)1991/,/^;;; Code:$$/p" \
+	    < ${WRKSRC}/yatex.el > ${WRKDIR}/LICENSE
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/yatex
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${ELFILES} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/yatex
-	${INSTALL_DATA} \
-		${WRKDIR}/yatex-startup.el \
-		${WRKSRC}/help/YATEXHLP.jp \
-		${WRKSRC}/help/YATEXHLP.eng \
-		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} \
+	    ${ELFILES} \
+	    ${WRKDIR}/yatex-startup.el \
+	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/yatex
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/yatex/help
+	cd ${WRKSRC}/help && ${INSTALL_DATA} \
+	    YATEXHLP.jp YATEXHLP.eng \
+	    ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/yatex/help
 	for F in ${INFO}; do \
 		${INSTALL_DATA} ${WRKSRC}/docs/$$F \
-			${STAGEDIR}${PREFIX}/${INFO_PATH}/$${F}.info; \
+		    ${STAGEDIR}${PREFIX}/${INFO_PATH}/$${F}.info; \
 	done
+
+post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
diff --git a/print/yatex/distinfo b/print/yatex/distinfo
index 653c9859a7ab..7b9c3ad6f377 100644
--- a/print/yatex/distinfo
+++ b/print/yatex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (yatex1.77.tar.gz) = acc3e14c34ea5eba0c1a96cef6b5c7ab850e621f75cf25764e0ae37be483f177
-SIZE (yatex1.77.tar.gz) = 356721
+TIMESTAMP = 1577125366
+SHA256 (yatex1.81.tar.gz) = f0d91090ef79d0bdc39d4b445e6f1fc9a55b2e8606b7f3bb9397f17cf013c40c
+SIZE (yatex1.81.tar.gz) = 385394
diff --git a/print/yatex/files/pkg-message.in b/print/yatex/files/pkg-message.in
index 6a75aab61905..93c74bc63599 100644
--- a/print/yatex/files/pkg-message.in
+++ b/print/yatex/files/pkg-message.in
@@ -5,7 +5,7 @@ To use YaTeX, add the next line into your .emacs:
 
     (require 'yatex-startup)
 
-yatex-startup.el in %%PREFIX%%/%%EMACS_SITE_LISPDIR%% also includes
+yatex-startup.el in %%PREFIX%%/%%EMACS_SITE_LISPDIR%%/yatex also includes
 configuration examples.  To get more information, see the info file
 of YaTeX.
 EOM
diff --git a/print/yatex/files/yatex-startup.el.in b/print/yatex/files/yatex-startup.el.in
index ada4106fbf36..fb7c0ec0c66c 100644
--- a/print/yatex/files/yatex-startup.el.in
+++ b/print/yatex/files/yatex-startup.el.in
@@ -1,15 +1,27 @@
-;; a startup elisp for YaTeX
-;;   -- S. Taoka <taoka@FreeBSD.org>
+;; startup elisp for YaTeX
+;;
 ;; $FreeBSD$
-
-(setq load-path (append (list 
-        "%%PREFIX%%/%%EMACS_SITE_LISPDIR%%/yatex"
-        ) load-path))
+;;
 (setq auto-mode-alist
      (cons (cons "\\.tex$" 'yatex-mode) auto-mode-alist))
 (autoload 'yatex-mode "yatex" "Yet Another LaTeX mode" t)
+(cond
+  ((string= current-language-environment "Japanese")
+   (progn
+     (setq YaTeX-help-file "%%PREFIX%%/%%EMACS_SITE_LISPDIR%%/yatex/help/YATEXHLP.jp")
+     (setq tex-command "platex")
+   ))
+  (t
+   (progn
+     (setq YaTeX-help-file "%%PREFIX%%/%%EMACS_SITE_LISPDIR%%/yatex/help/YATEXHLP.eng")
+     (setq tex-command "latex")
+   ))
+)
+(setq YaTeX-use-font-lock t)
+(setq YaTeX-dvipdf-command "dvipdfmx")
+(setq tex-pdfview-command "mupdf")
+
 ;;
-;(setq tex-command "latex")
 ;(setq dvi2-command "xdvi -geo +0+0 -s 3")
 ;; If you use dvipsk as default, you should use the following three lines.
 ;(setq dviprint-from-format "-p %b")
@@ -18,26 +30,7 @@
 ;; specifying a Kanji code for Mule
 ;;   (1=Shift JIS, 2=JIS, 3=EUC)
 ;(setq YaTeX-kanji-code 3)
-;;
-
-;; To highlight buffer, LaTeX commands (e.g. \section{foo})
-(if (featurep 'xemacs)
-    (progn
-      ;;;;;; XEmacs 21 or later ;;;;;;
-    	(setq YaTeX-use-font-lock t)
-      )
-  (if (string-match  "19.34" emacs-version)
-      (progn
-	;;;;;; Emacs 19.34 ;;;;;
-	(setq YaTeX-use-hilit19 t)
-	)
-    (progn
-      ;;;;;; Emacs 20 or later ;;;;;;
-;	(setq YaTeX-use-hilit19 t)
-    	(setq YaTeX-use-font-lock t)
-	)))
 
-;;
 ;;;;;;;; Yahtml (another html-mode) ;;;;;;
 ;(setq auto-mode-alist
 ;      (cons (cons "\\.html$" 'yahtml-mode) auto-mode-alist))
diff --git a/print/yatex/pkg-plist b/print/yatex/pkg-plist
index e03708f62284..54cb1f0e1ff6 100644
--- a/print/yatex/pkg-plist
+++ b/print/yatex/pkg-plist
@@ -1,9 +1,10 @@
-%%EMACS_SITE_LISPDIR%%/yatex/comment.el
 %%EMACS_SITE_LISPDIR%%/yatex/yahtml.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatex.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatex19.el
+%%EMACS_SITE_LISPDIR%%/yatex/yatex23.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatexadd.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatexenv.el
+%%EMACS_SITE_LISPDIR%%/yatex/yatexflt.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatexgen.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatexhie.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatexhks.el
@@ -11,9 +12,9 @@
 %%EMACS_SITE_LISPDIR%%/yatex/yatexlib.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatexm-o.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatexmth.el
+%%EMACS_SITE_LISPDIR%%/yatex/yatexpkg.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatexprc.el
 %%EMACS_SITE_LISPDIR%%/yatex/yatexsec.el
-%%EMACS_SITE_LISPDIR%%/yatex/yatexpkg.el
-%%EMACS_SITE_LISPDIR%%/YATEXHLP.jp
-%%EMACS_SITE_LISPDIR%%/YATEXHLP.eng
-%%EMACS_SITE_LISPDIR%%/yatex-startup.el
+%%EMACS_SITE_LISPDIR%%/yatex/help/YATEXHLP.eng
+%%EMACS_SITE_LISPDIR%%/yatex/help/YATEXHLP.jp
+%%EMACS_SITE_LISPDIR%%/yatex/yatex-startup.el