11 files changed, 153 insertions, 151 deletions

diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile
index 36dc84d924ef..27caafb01c3a 100644
--- a/print/yatex-xemacs-mule/Makefile
+++ b/print/yatex-xemacs-mule/Makefile
@@ -3,15 +3,15 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.4 1998/11/20 18:19:09 itojun Exp $
+# $Id: Makefile,v 1.5 1998/12/01 03:06:25 asami Exp $
 #
 
-PKGNAME=	ja-yatex-xemacs-1.66
-CATEGORIES=	japanese print elisp
+PKGNAME=	yatex-xemacs-mule-1.66
 
 XEMACS-MULE=	yes
 
-MASTERDIR=	${.CURDIR}/../../print/yatex
+MASTERDIR=	${.CURDIR}/../yatex
+COMMENT=	${.CURDIR}/pkg/COMMENT
 PLIST=		${.CURDIR}/pkg/PLIST
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs-mule/pkg-comment b/print/yatex-xemacs-mule/pkg-comment
new file mode 100644
index 000000000000..166897be6a9b
--- /dev/null
+++ b/print/yatex-xemacs-mule/pkg-comment
@@ -0,0 +1 @@
+Yet Another LaTeX mode and html mode on Emacs (for XEmacs-mule)
diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile
index 452391afb404..78bb81bc9368 100644
--- a/print/yatex-xemacs/Makefile
+++ b/print/yatex-xemacs/Makefile
@@ -3,15 +3,15 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.4 1998/11/20 18:19:09 itojun Exp $
+# $Id: Makefile,v 1.5 1998/12/01 03:06:24 asami Exp $
 #
 
-PKGNAME=	ja-yatex-1.66
-CATEGORIES=	japanese print elisp
+PKGNAME=	yatex-xemacs-1.66
 
-MULE=		yes
+XEMACS=		yes
 
-MASTERDIR=	${.CURDIR}/../../print/yatex
+MASTERDIR=	${.CURDIR}/../yatex
+COMMENT=	${.CURDIR}/pkg/COMMENT
 PLIST=		${.CURDIR}/pkg/PLIST
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs/pkg-comment b/print/yatex-xemacs/pkg-comment
new file mode 100644
index 000000000000..6e01cc0e1974
--- /dev/null
+++ b/print/yatex-xemacs/pkg-comment
@@ -0,0 +1 @@
+Yet Another LaTeX mode and html mode on Emacs (for XEmacs19, XEmacs20)
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 6d232024d00b..b82316402a25 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -3,7 +3,7 @@
 # Date created:		98/11/17
 # Whom:			Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
-# $Id: Makefile,v 1.6 1998/12/01 03:06:39 asami Exp $
+# $Id: Makefile,v 1.7 1998/12/13 08:47:42 asami Exp $
 #
 
 DISTNAME=	yatex1.66
@@ -17,36 +17,34 @@ MAINTAINER=	taoka@infonets.hiroshima-u.ac.jp
 WRKSRC=		${WRKDIR}/yatex${VERSION}
 .if defined(XEMACS-MULE)
 BUILD_DEPENDS=	xemacs:${PORTSDIR}/editors/xemacs-mule \
-		nkf:${PORTSDIR}/japanese/nkf \
-		bash:${PORTSDIR}/shells/bash2
+		nkf:${PORTSDIR}/japanese/nkf
 .endif
-
 PKGINSTALL=	${WRKDIR}/INSTALL
 PKGDEINSTALL=	${WRKDIR}/DEINSTALL
+PKGMESSAGE=	${WRKDIR}/MESSAGE
 VERSION=	1.66
 TARGETNAME=	YaTeX
 DIRSECTION=	The Emacs editor and associated tools
-ADDSITESTART=
-SITESTARTDIR=
+
 # Note that 'INFODIR' is defined in bsd.info.mk
-.if !defined(XEMACS-MULE)
-INFODIR=	${PREFIX}/info
-.endif
-.if defined(MULE)
-# The value of ADDSITESTART should follow a format of printf(1)
-ADDSITESTART=	(setq load-path (append (list \\n\
-		\\t\\"${ELISPDIR}/yatex\\"\\n\
-		\\t) load-path))\\n
-EMACSDIR=	${PREFIX}/share/mule
-SITESTARTDIR=	${EMACSDIR}/19.34/site-lisp
-.endif
-.if defined(XEMACS-MULE)
+.if defined(XEMACS) || defined(XEMACS-MULE)
 EMACS=		xemacs
 EMACSDIR=	${PREFIX}/lib/xemacs
-#
 INFODIR=	${EMACSDIR}/info
+.elif defined(MULE)
+EMACSDIR=	${PREFIX}/share/mule
+INFODIR=	${PREFIX}/info
+.else
+EMACSDIR=	${PREFIX}/share/emacs
+INFODIR=	${PREFIX}/info
 .endif
-.if defined(MULE) || defined(XEMACS-MULE)
+.if defined(XEMACS)
+NEW=
+HELP=		help/YATEXHLP.eng
+INFOFILES=	yatexe
+INFONODES=	YaTeX
+INFONODEEXPS=	Yet Another tex-mode for Emacs.
+.else
 NEW=		yatex.new
 HELP=		help/YATEXHLP.jp help/YATEXHLP.eng
 DOCSRC=		docs/yatexj.tex \
@@ -57,14 +55,6 @@ INFOFILES=	yatexj:yatexe
 INFONODES=	YaTeX-jp:YaTeX
 INFONODEEXPS=	Yet Another tex-mode for Emacs. (Japanese):Yet Another tex-mode for Emacs.
 .endif
-.if !defined(MULE) && !defined(XEMACS-MULE)
-EMACSDIR=	${PREFIX}/share/emacs
-NEW=
-HELP=		help/YATEXHLP.eng
-INFOFILES=	yatexe
-INFONODES=	YaTeX
-INFONODEEXPS=	Yet Another tex-mode for Emacs.
-.endif
 DOCSRC+=	docs/yatexe.tex \
 		docs/yatexref.eng \
 		docs/qanda.eng
@@ -77,27 +67,25 @@ EL_FILES=	comment.el yatex.el yatexadd.el yatexgen.el \
 		yatex19.el
 
 do-build:
-	for file in user-install INSTALL DEINSTALL; do \
-	  ${SED} -e 's,%TARGETNAME%,${TARGETNAME},g' \
-		 -e 's,%VERSION%,${VERSION},g' \
-		 -e 's,%PREFIX%,${PREFIX},g' \
-		 -e 's,%BASENAME%,${BASENAME},g' \
-		 -e 's,%CAT%,${CAT},g' \
-		 -e 's,%CP%,${CP},g' \
-		 -e 's,%ECHO%,${ECHO},g' \
-		 -e 's,%GREP%,${GREP},g' \
-		 -e 's,%RM%,${RM},g' \
-		 -e 's,%SED%,${SED},g' \
-		 -e 's,%TOUCH%,${TOUCH},g' \
-		 -e 's,%DO_NADA%,${DO_NADA},g' \
-		 -e 's,%INFODIR%,${INFODIR},g' \
-		 -e 's,%ELISPDIR%,${ELISPDIR},g' \
-		 -e 's,%INFOFILES%,${INFOFILES},g' \
-		 -e 's,%INFONODES%,${INFONODES},g' \
-		 -e 's,%INFONODEEXPS%,${INFONODEEXPS},g' \
-		 -e 's,%DIRSECTION%,${DIRSECTION},g' \
-		 -e 's,%SITESTARTDIR%,${SITESTARTDIR},g' \
-		 -e 's,%ADDSITESTART%,${ADDSITESTART},g' \
+	for file in yatex-startup.el INSTALL DEINSTALL MESSAGE; do \
+	  ${SED} -e 's,%%TARGETNAME%%,${TARGETNAME},g' \
+		 -e 's,%%VERSION%%,${VERSION},g' \
+		 -e 's,%%PREFIX%%,${PREFIX},g' \
+		 -e 's,%%BASENAME%%,${BASENAME},g' \
+		 -e 's,%%CAT%%,${CAT},g' \
+		 -e 's,%%CP%%,${CP},g' \
+		 -e 's,%%ECHO%%,${ECHO},g' \
+		 -e 's,%%GREP%%,${GREP},g' \
+		 -e 's,%%RM%%,${RM},g' \
+		 -e 's,%%SED%%,${SED},g' \
+		 -e 's,%%TOUCH%%,${TOUCH},g' \
+		 -e 's,%%DO_NADA%%,${DO_NADA},g' \
+		 -e 's,%%INFODIR%%,${INFODIR},g' \
+		 -e 's,%%ELISPDIR%%,${ELISPDIR},g' \
+		 -e 's,%%INFOFILES%%,${INFOFILES},g' \
+		 -e 's,%%INFONODES%%,${INFONODES},g' \
+		 -e 's,%%INFONODEEXPS%%,${INFONODEEXPS},g' \
+		 -e 's,%%DIRSECTION%%,${DIRSECTION},g' \
 		< ${FILESDIR}/$${file}.tmpl > ${WRKDIR}/$${file}; \
 	done
 # For XEmacs-mule 20.4, yatexj.info (in Japanese) should be remade
@@ -128,9 +116,6 @@ do-install:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${INSTALL_SCRIPT} ${WRKDIR}/user-install ${PORTSDOCDIR}
-.endif
 	if [ ! -f ${INFODIR}/dir ]; then \
 		${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${INFODIR}/dir; \
 	fi
@@ -138,6 +123,7 @@ post-install:
 		ELISPDIR=${ELISPDIR} DIRSECTION="${DIRSECTION}" \
 		INFOFILES="${INFOFILES}" \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${INSTALL_DATA} ${WRKDIR}/yatex-startup.el ${ELISPDIR}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/print/yatex/files/DEINSTALL.tmpl b/print/yatex/files/DEINSTALL.tmpl
index 169e15519733..526f1ee7df18 100644
--- a/print/yatex/files/DEINSTALL.tmpl
+++ b/print/yatex/files/DEINSTALL.tmpl
@@ -2,33 +2,20 @@
 
 pkgname=$1
 
-CP=${CP:-%CP%}
-ECHO=${ECHO:-%ECHO%}
-GREP=${GREP:-%GREP%}
-RM=${RM:-%RM%}
-SED=${SED:-%SED%}
+CP=${CP:-%%CP%%}
+ECHO=${ECHO:-%%ECHO%%}
+GREP=${GREP:-%%GREP%%}
+RM=${RM:-%%RM%%}
+SED=${SED:-%%SED%%}
 
-infodir=${INFODIR:-%INFODIR%}
-infofiles=${INFOFILES:-%INFOFILES%}
-sitestartdir=${SITESTARTDIR:-%SITESTARTDIR%}
-elispdir=${ELISPDIR:-%ELISPDIR%}
-
-OptionStart=";;; configuration options for ${pkgname}"
-OptionEnd=";;; End of configuration options for ${pkgname}"
+infodir=${INFODIR:-%%INFODIR%%}
+infofiles=${INFOFILES:-%%INFOFILES%%}
 
 if [ "X$2" = X"DEINSTALL" ]; 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
 	done
-	if [ X"${sitestartdir}" != X ] && \
-		    [ "`grep \"^${OptionStart}\"  ${sitestartdir}/site-start.el`" ]; then 
-		${ECHO} "Deleting entry for \"${pkgname}\" from ${sitestartdir}/site-start.el"
-		${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \
-		    ${sitestartdir}/site-start.el > ${sitestartdir}/site-start.el.bak
-		${CP} ${sitestartdir}/site-start.el.bak ${sitestartdir}/site-start.el
-		${RM} ${sitestartdir}/site-start.el.bak
-	fi
 else
 	exit 0
 fi
diff --git a/print/yatex/files/INSTALL.tmpl b/print/yatex/files/INSTALL.tmpl
index ef43acea1305..23726eaa8d6e 100644
--- a/print/yatex/files/INSTALL.tmpl
+++ b/print/yatex/files/INSTALL.tmpl
@@ -2,66 +2,49 @@
 
 pkgname=$1
 
-BASENAME=${BASENAME:-%BASENAME%}
-CP=${CP:-%CP%}
-ECHO=${ECHO:-%ECHO%}
-GREP=${GREP:-%GREP%}
-SED=${SED:-%SED%}
-TOUCH=${TOUCH:-%TOUCH%}
-DO_NADA=${DO_NADA:-%DO_NADA%}
+BASENAME=${BASENAME:-%%BASENAME%%}
+CP=${CP:-%%CP%%}
+ECHO=${ECHO:-%%ECHO%%}
+GREP=${GREP:-%%GREP%%}
+SED=${SED:-%%SED%%}
+TOUCH=${TOUCH:-%%TOUCH%%}
+CUT=${CUT:-%%CUT%%}
+DO_NADA=${DO_NADA:-%%DO_NADA%%}
+CUT=/usr/bin/cut
+EXPR=/bin/expr
 
-infodir=${INFODIR:-%INFODIR%}
-infofiles=${INFOFILES:-%INFOFILES%}
-infonodes=${INFONODES:-%INFONODES%}
-infonodeexps=${INFONODEEXPS:-%INFONODEEXPS%}
-elispdir=${ELISPDIR:-%ELISPDIR%}
-sitestartdir=${SITESTARTDIR:-%SITESTARTDIR%}
-dirsection=${DIRSECTION:-%DIRSECTION%}
-
-OptionStart=";;; configuration options for ${pkgname}"
-OptionEnd=";;; End of configuration options for ${pkgname}"
+infodir=${INFODIR:-%%INFODIR%%}
+infofiles=${INFOFILES:-%%INFOFILES%%}
+infonodes=${INFONODES:-%%INFONODES%%}
+infonodeexps=${INFONODEEXPS:-%%INFONODEEXPS%%}
+dirsection=${DIRSECTION:-%%DIRSECTION%%}
 
 if [ "X$2" = X"POST-INSTALL" ]; then
-	if [ ! -f ${sitestartdir}/site-start.el ]; then 
-		 ${TOUCH} ${sitestartdir}/site-start.el
+    count=1
+    # For example, the result of `cut ttt -d : -f 2` is ttt. Why?
+    infofiles=${infofiles}:
+    while ${DO_NADA}; do
+	if [ X`${ECHO} ${infofiles} | ${CUT} -d : -f $count` = X ]; then
+	    break
 	fi
-	count=1
-	# For example, the result of `cut ttt -d : -f 2` is ttt. Why?
-	infofiles=${infofiles}:
-	while ${DO_NADA}; do
-	    if [ X`${ECHO} ${infofiles} | cut -d : -f $count` = X ]; then
-		break
-	    fi
-	    file=`${ECHO} ${infofiles} | cut -d : -f $count`
-	    nodename=`${ECHO} ${infonodes} | cut -d : -f $count`
-	    nodeexp=`${ECHO} ${infonodeexps} | cut -d : -f $count`
-	    if [ ! "`${GREP} \"START-INFO-DIR-ENTRY\" ${infodir}/${file}`" ]; then
-		${ECHO} "INFO-DIR-SECTION ${dirsection}" \
-						>> ${infodir}/${file}
-		${ECHO} "START-INFO-DIR-ENTRY"	>> ${infodir}/${file}
-		${ECHO} "* ${nodename}: (`${BASENAME} ${file}`).		${nodeexp}" \
-						>> ${infodir}/${file}
-		${ECHO} "END-INFO-DIR-ENTRY"	>> ${infodir}/${file}
-	    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 [ X"${sitestartdir}" != X ]; then
-	    if [ "`${GREP} \"^${OptionStart}\"  ${sitestartdir}/site-start.el`" ]; then 
-		${SED} -e "/^${OptionStart}/,/^${OptionEnd}/d" \
-		${sitestartdir}/site-start.el > ${sitestartdir}/site-start.el.bak
-		${CP} ${sitestartdir}/site-start.el.bak ${sitestartdir}/site-start.el
-	    fi
-	    ${ECHO} "Adding entry for \"${pkgname}\" to ${sitestartdir}/site-start.el"
-	    ${ECHO} "${OptionStart}" >> ${sitestartdir}/site-start.el
-	    /usr/bin/printf "%ADDSITESTART%" | \
-		${SED} "s/^ //" >> ${sitestartdir}/site-start.el
-	    ${ECHO} "${OptionEnd}" >> ${sitestartdir}/site-start.el
+	file=`${ECHO} ${infofiles} | ${CUT} -d : -f $count`
+	nodename=`${ECHO} ${infonodes} | ${CUT} -d : -f $count`
+	nodeexp=`${ECHO} ${infonodeexps} | ${CUT} -d : -f $count`
+	if [ ! "`${GREP} \"START-INFO-DIR-ENTRY\" ${infodir}/${file}`" ]; then
+	    ${ECHO} "INFO-DIR-SECTION ${dirsection}" \
+					    >> ${infodir}/${file}
+	    ${ECHO} "START-INFO-DIR-ENTRY"	>> ${infodir}/${file}
+	    ${ECHO} "* ${nodename}: (`${BASENAME} ${file}`).		${nodeexp}" \
+					    >> ${infodir}/${file}
+	    ${ECHO} "END-INFO-DIR-ENTRY"	>> ${infodir}/${file}
 	fi
-	exit 0
+	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
+    exit 0
 else
-	exit 0
+    exit 0
 fi
diff --git a/print/yatex/files/MESSAGE.tmpl b/print/yatex/files/MESSAGE.tmpl
new file mode 100644
index 000000000000..38e568bcc3d9
--- /dev/null
+++ b/print/yatex/files/MESSAGE.tmpl
@@ -0,0 +1,12 @@
+######################################################################
+To use YaTeX, add the next line into your .emacs;
+
+    (require 'yatex-startup)
+
+where yatex-startup.el is in %%ELISPDIR%%.
+Please check the setup file because it has a lot of examples.
+To get more information, see the info file of YaTeX;
+
+Installation::
+Customizations => Lisp variables::
+######################################################################
diff --git a/print/yatex/files/yatex-startup.el.tmpl b/print/yatex/files/yatex-startup.el.tmpl
new file mode 100644
index 000000000000..317412f9d4fa
--- /dev/null
+++ b/print/yatex/files/yatex-startup.el.tmpl
@@ -0,0 +1,39 @@
+;; a startup elisp for YaTeX
+;;   -- S. Taoka <taoka@infonets.hiroshima-u.ac.jp>
+
+;;;;;;;;;;; %%TARGETNAME%% (Ver.%%VERSION%%) ;;;;;;;;;;;
+
+(setq load-path (append (list 
+        "%%ELISPDIR%%/yatex"
+        ) load-path))
+(setq auto-mode-alist
+     (cons (cons "\\.tex$" 'yatex-mode) auto-mode-alist))
+(autoload 'yatex-mode "yatex" "Yet Another LaTeX mode" t)
+;;
+;(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")
+;(setq dviprint-to-format "-l %b")
+;(setq dviprint-command-format "dvips %f %t %s | lpr")
+;; specifying a Kanji code for Mule
+;;   (1=Shift JIS, 2=JIS, 3=EUC)
+;(setq YaTeX-kanji-code 3)
+;;
+;; For XEmacs, it is not supported that YaTeX originally color
+;; LaTeX commands (e.g. \section{foo}) by using hilit19
+;; so you had better uncomment the next line.
+;(put 'yatex-mode 'font-lock-defaults 'latex-mode)
+;;
+;;;;;;;; Yahtml (another html-mode) ;;;;;;
+;(setq auto-mode-alist
+;      (cons (cons "\\.html$" 'yahtml-mode) auto-mode-alist))
+;(autoload 'yahtml-mode "yahtml" "Yet Another HTML mode" t)
+;; Write your favorite browser.  But netscape is advantageous.
+;(setq yahtml-www-browser "netscape")
+;; Write correspondence alist from ABSOLUTE unix path name to URL path.
+;(setq yahtml-path-url-alist
+;      '(("/home/yuuji/public_html" . "http://www.mynet/~yuuji")
+;	("/home/staff/yuuji/html" . "http://www.othernet/~yuuji")))
+
+(provide 'yatex-startup)
diff --git a/print/yatex/pkg-comment b/print/yatex/pkg-comment
index 04b958dd25a1..143020537968 100644
--- a/print/yatex/pkg-comment
+++ b/print/yatex/pkg-comment
@@ -1 +1 @@
-Yet Another LaTeX mode on Emacs (including another html-mode)
+Yet Another LaTeX mode and html mode on Emacs (for Emacs19, Emacs20)
diff --git a/print/yatex/pkg-descr b/print/yatex/pkg-descr
index f1c03d26fe50..00fdb480306b 100644
--- a/print/yatex/pkg-descr
+++ b/print/yatex/pkg-descr
@@ -1,26 +1,19 @@
-******************************
-**      About YaTeX         **
-******************************
+[[About YaTeX]]
 YaTeX automates typesetting and previewing of LaTeX and enables
 completing input of LaTeX mark-up command such as `\begin{}'..`\end{}'.
 
 YaTeX also supports Demacs which runs on MS-DOS(386), Mule (Multi
 Language Enhancement to GNU Emacs), and latex on DOS.
 
-You need to adjust your init file, ~/.emacs.  This port has a setup
-script 'user-install'. Please execute it as the following:
+To use YaTeX, add the next line into your ~/.emacs;
 
-sh /usr/local/share/doc/yatex/user-install
-
-and check ~/.emacs. To get more setup information, see the info file
-of YaTeX,
+(require 'yatex-setup)
 
+To get more setup information, see the info file of YaTeX;
 Installation::
 Customizations => Lisp variables::
 
-******************************
-**      About yahtml        **
-******************************
+[[About yahtml]]
 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.