9 files changed, 184 insertions, 22 deletions

diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 2439670ee504..fb49fd5d0c33 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -1,42 +1,52 @@
 # New ports collection makefile for: YaTeX
-# Version required:	1.66
+# Version required:	1.67
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	yatex1.66
-PKGNAME?=	yatex-1.66
+DISTNAME=	yatex1.67
+PKGNAME?=	yatex-1.67
 CATEGORIES?=	print elisp
-MASTER_SITES=	http://www.comp.ae.keio.ac.jp/~yuuji/yatex/ \
-		http://www.comp.ae.keio.ac.jp/~yuuji/tmp/
+MASTER_SITES=	http://www.yatex.org/
 
 MAINTAINER=	taoka@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/yatex${VERSION}
 .if defined(XEMACS-MULE)
 BUILD_DEPENDS=	xemacs:${PORTSDIR}/editors/xemacs-mule \
+		${PREFIX}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-sumo-packages \
 		nkf:${PORTSDIR}/japanese/nkf
 .endif
 PKGINSTALL=	${WRKDIR}/INSTALL
 PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 PKGMESSAGE=	${WRKDIR}/MESSAGE
-VERSION=	1.66
+VERSION=	1.67
 TARGETNAME=	YaTeX
 DIRSECTION=	The Emacs editor and associated tools
 
 # Note that 'INFODIR' is defined in bsd.info.mk
-.if defined(XEMACS) || defined(XEMACS-MULE)
+.if defined(XEMACS)
+EMACS=		xemacs
+EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
+INFODIR=	${EMACSDIR}/info
+PLIST=		${PKGDIR}/PLIST.xemacs
+MANIFEST=	MANIFEST.yatex
+.elif defined(XEMACS-MULE)
 EMACS=		xemacs
-EMACSDIR=	${PREFIX}/lib/xemacs
+EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
 INFODIR=	${EMACSDIR}/info
+PLIST=		${PKGDIR}/PLIST.xemacs-mule
+MANIFEST=	MANIFEST.yatex
 .elif defined(MULE)
 EMACSDIR=	${PREFIX}/share/mule
 INFODIR=	${PREFIX}/info
+PLIST=		${PKGDIR}/PLIST.mule
 .else
 EMACSDIR=	${PREFIX}/share/emacs
 INFODIR=	${PREFIX}/info
+PLIST=		${PKGDIR}/PLIST.emacs
 .endif
 .if defined(XEMACS)
 NEW=
@@ -49,16 +59,23 @@ NEW=		yatex.new
 HELP=		help/YATEXHLP.jp help/YATEXHLP.eng
 DOCSRC=		docs/yatexj.tex \
 		docs/yatex.ref \
+		docs/yahtmlj.tex docs/htmlqa \
 		docs/yatexadd.doc docs/yatexgen.doc \
 		docs/qanda
-INFOFILES=	yatexj:yatexe
-INFONODES=	YaTeX-jp:YaTeX
-INFONODEEXPS=	Yet Another tex-mode for Emacs. (Japanese):Yet Another tex-mode for Emacs.
+INFOFILES=	yatexj:yatexe:yahtmlj
+INFONODES=	YaTeX-jp:YaTeX:yahtml-jp
+INFONODEEXPS=	Yet Another tex-mode for Emacs. (Japanese):Yet Another tex-mode for Emacs.:Yet Another HTML mode. (Japanese)
 .endif
 DOCSRC+=	docs/yatexe.tex \
 		docs/yatexref.eng \
 		docs/qanda.eng
+.if defined(XEMACS) || defined(XEMACS-MULE)
+ELISPDIR=	${EMACSDIR}/lisp
+HELPDIR=	${EMACSDIR}/../site-lisp
+.else
 ELISPDIR=	${EMACSDIR}/site-lisp
+HELPDIR=	${ELISPDIR}
+.endif
 PORTSDOCDIR=	${PREFIX}/share/doc/yatex
 EL_FILES=	comment.el yatex.el yatexadd.el yatexgen.el \
 		yatexenv.el yatexlib.el \
@@ -86,6 +103,7 @@ do-build:
 		 -e 's,%%INFONODES%%,${INFONODES},g' \
 		 -e 's,%%INFONODEEXPS%%,${INFONODEEXPS},g' \
 		 -e 's,%%DIRSECTION%%,${DIRSECTION},g' \
+		 -e 's,%%EMACS%%,${EMACS},g' \
 		< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
 	done
 # For XEmacs-mule 20.4, yatexj.info (in Japanese) should be remade
@@ -96,19 +114,26 @@ do-build:
 	${MV} yatexj.tex yatexj.tex.org; \
 	nkf -e yatexj.tex.org > yatexj.tex; \
 	${SETENV} LANG=ja_JP.EUC ${EMACS} -no-site-file -no-init-file \
-		-batch yatexj.tex -e texinfo-format-buffer -f save-buffer; \
+		-batch -l texinfmt -f batch-texinfo-format yatexj.tex; \
 	)
 .endif
 
 do-install:
 	(cd ${WRKSRC}; \
 	${MKDIR} ${ELISPDIR}/yatex; \
+	${MKDIR} ${HELPDIR} ${INFODIR}; \
 	${INSTALL_DATA} ${EL_FILES} ${ELISPDIR}/yatex; \
-	${INSTALL_DATA} ${HELP} ${ELISPDIR}; \
+	${INSTALL_DATA} ${HELP} ${HELPDIR}; \
 	${MKDIR} ${INFODIR}; \
+.if defined(XEMACS) || defined(XEMACS-MULE)
+	for file in `${ECHO} ${INFOFILES} | ${SED} "s,:, ,g"`; do \
+		${INSTALL_DATA} ${WRKSRC}/docs/$${file} ${INFODIR}.info; \
+	done; \
+.else
 	for file in `${ECHO} ${INFOFILES} | ${SED} "s,:, ,g"`; do \
 		${INSTALL_DATA} ${WRKSRC}/docs/$${file} ${INFODIR}; \
 	done; \
+.endif
 	)
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PORTSDOCDIR}
@@ -122,5 +147,14 @@ post-install:
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${INSTALL_DATA} ${WRKDIR}/yatex-startup.el ${ELISPDIR}
 	@${CAT} ${PKGMESSAGE}
+.if defined(XEMACS) || defined(XEMACS-MULE)
+	${RM} -f ${WRKDIR}/${MANIFEST}
+	emacsdir=`${ECHO} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
+	${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
+		${SED} -e "s;^${EMACSDIR}/;;" > ${WRKDIR}/${MANIFEST}
+	${MKDIR} ${EMACSDIR}/pkginfo
+	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
+		${EMACSDIR}/pkginfo/
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/yatex/distinfo b/print/yatex/distinfo
index 78b6d5250146..2aa8e46fe80f 100644
--- a/print/yatex/distinfo
+++ b/print/yatex/distinfo
@@ -1 +1 @@
-MD5 (yatex1.66.tar.gz) = a112d4762f25ceb3b89480e51ae022d1
+MD5 (yatex1.67.tar.gz) = ff0fba39a1c6f3fca5d6242b8e1134e1
diff --git a/print/yatex/files/DEINSTALL.tmpl b/print/yatex/files/DEINSTALL.tmpl
index 526f1ee7df18..3691c577f747 100644
--- a/print/yatex/files/DEINSTALL.tmpl
+++ b/print/yatex/files/DEINSTALL.tmpl
@@ -11,7 +11,7 @@ SED=${SED:-%%SED%%}
 infodir=${INFODIR:-%%INFODIR%%}
 infofiles=${INFOFILES:-%%INFOFILES%%}
 
-if [ "X$2" = X"DEINSTALL" ]; then
+if [ "X$2" = X"DEINSTALL" -a %%EMACS%% != xemacs ]; then
 	${ECHO} "Deleting entry for \"${pkgname}\" from ${infodir}/dir"
 	for file in `echo  ${infofiles} | ${SED} "s,:, ,g"`; do
 		install-info --delete ${infodir}/${file} ${infodir}/dir
diff --git a/print/yatex/files/INSTALL.tmpl b/print/yatex/files/INSTALL.tmpl
index 23726eaa8d6e..fd33fb2b64a1 100644
--- a/print/yatex/files/INSTALL.tmpl
+++ b/print/yatex/files/INSTALL.tmpl
@@ -40,10 +40,12 @@ if [ "X$2" = X"POST-INSTALL" ]; then
 	fi
 	count=`${EXPR} $count + 1`
     done
-    ${ECHO} "Adding entry for \"${pkgname}\" to ${infodir}/dir"
-    for file in `${ECHO}  ${infofiles} | ${SED} "s,:, ,g"`; do
-	    install-info ${infodir}/${file} ${infodir}/dir
-    done
+    if [ %%EMACS%% != xemacs ]; then
+	${ECHO} "Adding entry for \"${pkgname}\" to ${infodir}/dir"
+	for file in `${ECHO}  ${infofiles} | ${SED} "s,:, ,g"`; do
+		install-info ${infodir}/${file} ${infodir}/dir
+	done
+    fi
     exit 0
 else
     exit 0
diff --git a/print/yatex/pkg-descr b/print/yatex/pkg-descr
index 939f5959fd98..160e6e0ea209 100644
--- a/print/yatex/pkg-descr
+++ b/print/yatex/pkg-descr
@@ -18,8 +18,7 @@ Yahtml is a brand new package for writing HTML files with Emacs. It is
 very far from html-mode, html-helper-mode or other existing HTML modes.
 It is a good successor of YaTeX in HTML world.
 
-To install yahtml, see the guidance in the beginning of
-site-lisp/yatex/yahtml.el.
-
 - S. Taoka
 taoka@FreeBSD.org
+
+WWW: http://www.yatex.org/
diff --git a/print/yatex/pkg-plist.emacs b/print/yatex/pkg-plist.emacs
new file mode 100644
index 000000000000..af417290230a
--- /dev/null
+++ b/print/yatex/pkg-plist.emacs
@@ -0,0 +1,34 @@
+share/emacs/site-lisp/yatex/comment.el
+share/emacs/site-lisp/yatex/yahtml.el
+share/emacs/site-lisp/yatex/yatex.el
+share/emacs/site-lisp/yatex/yatex19.el
+share/emacs/site-lisp/yatex/yatexadd.el
+share/emacs/site-lisp/yatex/yatexenv.el
+share/emacs/site-lisp/yatex/yatexgen.el
+share/emacs/site-lisp/yatex/yatexhie.el
+share/emacs/site-lisp/yatex/yatexhks.el
+share/emacs/site-lisp/yatex/yatexhlp.el
+share/emacs/site-lisp/yatex/yatexlib.el
+share/emacs/site-lisp/yatex/yatexm-o.el
+share/emacs/site-lisp/yatex/yatexmth.el
+share/emacs/site-lisp/yatex/yatexprc.el
+share/emacs/site-lisp/yatex/yatexsec.el
+share/emacs/site-lisp/yatex-startup.el
+share/emacs/site-lisp/YATEXHLP.jp
+share/emacs/site-lisp/YATEXHLP.eng
+info/yahtmlj
+info/yatexj
+info/yatexe
+share/doc/yatex/htmlqa
+share/doc/yatex/qanda
+share/doc/yatex/qanda.eng
+share/doc/yatex/yahtmlj.tex
+share/doc/yatex/yatex.new
+share/doc/yatex/yatex.ref
+share/doc/yatex/yatexadd.doc
+share/doc/yatex/yatexe.tex
+share/doc/yatex/yatexgen.doc
+share/doc/yatex/yatexj.tex
+share/doc/yatex/yatexref.eng
+@dirrm share/emacs/site-lisp/yatex
+@dirrm share/doc/yatex
diff --git a/print/yatex/pkg-plist.mule b/print/yatex/pkg-plist.mule
new file mode 100644
index 000000000000..0965454d28c4
--- /dev/null
+++ b/print/yatex/pkg-plist.mule
@@ -0,0 +1,34 @@
+share/mule/site-lisp/yatex/comment.el
+share/mule/site-lisp/yatex/yahtml.el
+share/mule/site-lisp/yatex/yatex.el
+share/mule/site-lisp/yatex/yatex19.el
+share/mule/site-lisp/yatex/yatexadd.el
+share/mule/site-lisp/yatex/yatexenv.el
+share/mule/site-lisp/yatex/yatexgen.el
+share/mule/site-lisp/yatex/yatexhie.el
+share/mule/site-lisp/yatex/yatexhks.el
+share/mule/site-lisp/yatex/yatexhlp.el
+share/mule/site-lisp/yatex/yatexlib.el
+share/mule/site-lisp/yatex/yatexm-o.el
+share/mule/site-lisp/yatex/yatexmth.el
+share/mule/site-lisp/yatex/yatexprc.el
+share/mule/site-lisp/yatex/yatexsec.el
+share/mule/site-lisp/yatex-startup.el
+share/mule/site-lisp/YATEXHLP.jp
+share/mule/site-lisp/YATEXHLP.eng
+info/yahtmlj
+info/yatexj
+info/yatexe
+share/doc/yatex/htmlqa
+share/doc/yatex/qanda
+share/doc/yatex/qanda.eng
+share/doc/yatex/yahtmlj.tex
+share/doc/yatex/yatex.new
+share/doc/yatex/yatex.ref
+share/doc/yatex/yatexadd.doc
+share/doc/yatex/yatexe.tex
+share/doc/yatex/yatexgen.doc
+share/doc/yatex/yatexj.tex
+share/doc/yatex/yatexref.eng
+@dirrm share/mule/site-lisp/yatex
+@dirrm share/doc/yatex
diff --git a/print/yatex/pkg-plist.xemacs b/print/yatex/pkg-plist.xemacs
new file mode 100644
index 000000000000..ebf20d6804a7
--- /dev/null
+++ b/print/yatex/pkg-plist.xemacs
@@ -0,0 +1,24 @@
+lib/xemacs/site-packages/lisp/yatex/comment.el
+lib/xemacs/site-packages/lisp/yatex/yahtml.el
+lib/xemacs/site-packages/lisp/yatex/yatex.el
+lib/xemacs/site-packages/lisp/yatex/yatex19.el
+lib/xemacs/site-packages/lisp/yatex/yatexadd.el
+lib/xemacs/site-packages/lisp/yatex/yatexenv.el
+lib/xemacs/site-packages/lisp/yatex/yatexgen.el
+lib/xemacs/site-packages/lisp/yatex/yatexhie.el
+lib/xemacs/site-packages/lisp/yatex/yatexhks.el
+lib/xemacs/site-packages/lisp/yatex/yatexhlp.el
+lib/xemacs/site-packages/lisp/yatex/yatexlib.el
+lib/xemacs/site-packages/lisp/yatex/yatexm-o.el
+lib/xemacs/site-packages/lisp/yatex/yatexmth.el
+lib/xemacs/site-packages/lisp/yatex/yatexprc.el
+lib/xemacs/site-packages/lisp/yatex/yatexsec.el
+lib/xemacs/site-packages/lisp/yatex-startup.el
+lib/xemacs/site-packages/pkginfo/MANIFEST.yatex
+lib/xemacs/site-packages/info/yatexe.info
+lib/xemacs/site-lisp/YATEXHLP.eng
+share/doc/yatex/qanda.eng
+share/doc/yatex/yatexe.tex
+share/doc/yatex/yatexref.eng
+@dirrm lib/xemacs/site-packages/lisp/yatex
+@dirrm share/doc/yatex
diff --git a/print/yatex/pkg-plist.xemacs-mule b/print/yatex/pkg-plist.xemacs-mule
new file mode 100644
index 000000000000..9cc91d46c362
--- /dev/null
+++ b/print/yatex/pkg-plist.xemacs-mule
@@ -0,0 +1,35 @@
+lib/xemacs/site-packages/lisp/yatex/comment.el
+lib/xemacs/site-packages/lisp/yatex/yahtml.el
+lib/xemacs/site-packages/lisp/yatex/yatex.el
+lib/xemacs/site-packages/lisp/yatex/yatex19.el
+lib/xemacs/site-packages/lisp/yatex/yatexadd.el
+lib/xemacs/site-packages/lisp/yatex/yatexenv.el
+lib/xemacs/site-packages/lisp/yatex/yatexgen.el
+lib/xemacs/site-packages/lisp/yatex/yatexhie.el
+lib/xemacs/site-packages/lisp/yatex/yatexhks.el
+lib/xemacs/site-packages/lisp/yatex/yatexhlp.el
+lib/xemacs/site-packages/lisp/yatex/yatexlib.el
+lib/xemacs/site-packages/lisp/yatex/yatexm-o.el
+lib/xemacs/site-packages/lisp/yatex/yatexmth.el
+lib/xemacs/site-packages/lisp/yatex/yatexprc.el
+lib/xemacs/site-packages/lisp/yatex/yatexsec.el
+lib/xemacs/site-packages/lisp/yatex-startup.el
+lib/xemacs/site-packages/pkginfo/MANIFEST.yatex
+lib/xemacs/site-packages/info/yahtmlj.info
+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/htmlqa
+share/doc/yatex/qanda
+share/doc/yatex/qanda.eng
+share/doc/yatex/yahtmlj.tex
+share/doc/yatex/yatex.new
+share/doc/yatex/yatex.ref
+share/doc/yatex/yatexadd.doc
+share/doc/yatex/yatexe.tex
+share/doc/yatex/yatexgen.doc
+share/doc/yatex/yatexj.tex
+share/doc/yatex/yatexref.eng
+@dirrm lib/xemacs/site-packages/lisp/yatex
+@dirrm share/doc/yatex