Update to 1.76.

7 files changed, 69 insertions, 23 deletions

diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index 3a6c0f86eb18..dfa8fa7db7b2 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	yatex
-PORTVERSION=	1.73
-PORTREVISION=	8
+PORTVERSION=	1.76
 CATEGORIES?=	print elisp
 MASTER_SITES=	http://www.yatex.org/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -32,14 +31,14 @@ SUB_LIST=	TARGETNAME=${TARGETNAME} \
 		SED=${SED} \
 		TOUCH=${TOUCH} \
 		DO_NADA=${DO_NADA} \
-		INFODIR=${INFODIR} \
+		INFODIR=${PREFIX}/${INFO_PATH} \
 		ELISPDIR=${ELISPDIR} \
 		INFOFILES=${INFOFILES} \
 		INFONODES="${INFONODES}" \
 		INFONODEEXPS="${INFONODEEXPS}" \
 		DIRSECTION="${DIRSECTION}" \
 		EMACS_NAME=${EMACS_NAME}
-
+USE_DOS2UNIX=	yes
 USE_EMACS=	yes
 EMACS_NO_RUN_DEPENDS=YES
 EMACS_MASTERDIR_PKGFILES=YES
@@ -48,13 +47,11 @@ EMACS_PACKAGESDIR=${EMACS_LIBDIR}/site-packages
 TARGETNAME=	YaTeX
 DIRSECTION=	The Emacs editor and associated tools
 
-# Note that 'INFODIR' is defined in bsd.info.mk
-
 .include <bsd.port.pre.mk>
 
 .if (${EMACS_PORT_NAME} == xemacs21)
 EMACS_NO_BUILD_DEPENDS=	YES
-INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
+INFO_PATH=	${EMACS_PACKAGESDIR}/info
 ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp
 HELPDIR=	${PREFIX}/${EMACS_LIBDIR}/site-lisp
 PLIST=		${PKGDIR}/pkg-plist.xemacs
@@ -64,7 +61,7 @@ INFOFILES=	yatexe:yahtmle
 INFONODES=	YaTeX:yahtml
 INFONODEEXPS=	Yet Another tex-mode for Emacs.:Yet Another HTML mode.
 .elif (${EMACS_PORT_NAME} == xemacs21-mule)
-INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
+INFO_PATH=	${EMACS_PACKAGESDIR}/info
 ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp
 HELPDIR=	${PREFIX}/${EMACS_LIBDIR}/site-lisp
 PLIST=		${PKGDIR}/pkg-plist.xemacs-mule
@@ -77,7 +74,6 @@ INFONODES=	YaTeX-jp:YaTeX:yahtml-jp:yahtml
 INFONODEEXPS=	Yet Another tex-mode for Emacs. (Japanese):Yet Another tex-mode for Emacs.:Yet Another HTML mode. (Japanese):Yet Another HTML mode.
 .else
 EMACS_NO_BUILD_DEPENDS=	YES
-INFODIR=	${PREFIX}/info
 PLIST=		${PKGDIR}/pkg-plist.emacs
 ELISPDIR=	${PREFIX}/${EMACS_LIBDIR}/site-lisp
 HELPDIR=	${ELISPDIR}
@@ -106,36 +102,37 @@ do-build:
 .endif
 
 do-install:
-	${MKDIR} ${ELISPDIR}/yatex ${HELPDIR} ${INFODIR}
+	@${MKDIR} ${ELISPDIR}/yatex ${HELPDIR} ${PREFIX}/${INFO_PATH}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${EL_FILES} ${ELISPDIR}/yatex && \
 		${INSTALL_DATA} ${HELP} ${HELPDIR}
 .if (${EMACS_PORT_NAME} == xemacs21) || (${EMACS_PORT_NAME} == xemacs21-mule)
 	for F in ${INFOFILES:S,:, ,g}; do \
-		${INSTALL_DATA} ${WRKSRC}/docs/$${F} ${INFODIR}/$${F}.info; \
+		${INSTALL_DATA} ${WRKSRC}/docs/$${F} \
+		${PREFIX}/${INFO_PATH}/$${F}.info; \
 	done
 .else
 	cd ${WRKSRC}/docs && \
-		${INSTALL_DATA} ${INFOFILES:S,:, ,g} ${INFODIR}
+		${INSTALL_DATA} ${INFOFILES:S,:, ,g} ${PREFIX}/${INFO_PATH}
 .endif
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${WRKSRC}
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 post-install:
-	@${SETENV} TOUCH=${TOUCH} INFODIR=${INFODIR} \
+	@${SETENV} TOUCH=${TOUCH} INFODIR=${PREFIX}/${INFO_PATH} \
 		ELISPDIR=${ELISPDIR} DIRSECTION="${DIRSECTION}" \
 		INFOFILES="${INFOFILES}" \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${INSTALL_DATA} ${WRKDIR}/yatex-startup.el ${ELISPDIR}
 .if (${EMACS_PORT_NAME} == xemacs21) || (${EMACS_PORT_NAME} == xemacs21-mule)
-	${RM} -f ${WRKDIR}/${MANIFEST}
-	${CAT} ${PLIST} | ${GREP} -e "^${EMACS_LIBDIR}" | \
+	@${RM} -f ${WRKDIR}/${MANIFEST}
+	@${CAT} ${PLIST} | ${GREP} -e "^${EMACS_LIBDIR}" | \
 		${SED} -e "s;^${EMACS_LIBDIR}/;;" > ${WRKDIR}/${MANIFEST}
-	${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-packages/pkginfo
-	${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
+	@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/site-packages/pkginfo
+	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
 		${PREFIX}/${EMACS_LIBDIR}/site-packages/pkginfo/
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/print/yatex/distinfo b/print/yatex/distinfo
index 84dd8009d097..7c5764a9c2fd 100644
--- a/print/yatex/distinfo
+++ b/print/yatex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yatex1.73.tar.gz) = 367bfc862bd6ae78818f57a87c13b39d3157ba27fcf3e3d640a2250b0e289cd3
-SIZE (yatex1.73.tar.gz) = 344934
+SHA256 (yatex1.76.tar.gz) = 66c6f162a0ce4ee1edb231bacb4a3926ea4b5a45a4ba004330bb0bc0a7887acf
+SIZE (yatex1.76.tar.gz) = 357552
diff --git a/print/yatex/files/patch-docs-yahtmle b/print/yatex/files/patch-docs-yahtmle
new file mode 100644
index 000000000000..3ef7aba9b48a
--- /dev/null
+++ b/print/yatex/files/patch-docs-yahtmle
@@ -0,0 +1,12 @@
+--- docs/yahtmle.orig	2012-08-05 01:01:50.000000000 +0900
++++ docs/yahtmle	2012-08-05 01:02:09.000000000 +0900
+@@ -3,9 +3,6 @@
+ from file `yahtmle.tex'
+ using `texinfmt.el' version 2.42 of  7 Jul 2006.
+ 
+-START-INFO-DIR-ENTRY
+-* yahtml-e: (yahtmle).  Yet Another html-mode for Emacs (English).
+-END-INFO-DIR-ENTRY
+ 
+ 
+ 
diff --git a/print/yatex/files/patch-docs-yahtmlj b/print/yatex/files/patch-docs-yahtmlj
new file mode 100644
index 000000000000..276d27ed5bf1
--- /dev/null
+++ b/print/yatex/files/patch-docs-yahtmlj
@@ -0,0 +1,12 @@
+--- docs/yahtmlj.orig	2012-08-05 01:01:53.000000000 +0900
++++ docs/yahtmlj	2012-08-05 01:02:14.000000000 +0900
+@@ -3,9 +3,6 @@
+ from file `yahtmlj.tex'
+ using `texinfmt.el' version 2.42 of  7 Jul 2006.
+ 
+-START-INFO-DIR-ENTRY
+-* yahtml: (yahtmlj).    Yet Another html-mode for Emacs (Japanese).
+-END-INFO-DIR-ENTRY
+ 
+ 
+ 
diff --git a/print/yatex/files/patch-docs-yatexe b/print/yatex/files/patch-docs-yatexe
new file mode 100644
index 000000000000..5dcd59d22e5d
--- /dev/null
+++ b/print/yatex/files/patch-docs-yatexe
@@ -0,0 +1,12 @@
+--- docs/yatexe.orig	2012-08-05 01:01:58.000000000 +0900
++++ docs/yatexe	2012-08-05 01:02:22.000000000 +0900
+@@ -3,9 +3,6 @@
+ from file `yatexe.tex'
+ using `texinfmt.el' version 2.42 of  7 Jul 2006.
+ 
+-START-INFO-DIR-ENTRY
+-* YaTeX-e: (yatexe).    Yet Another tex-mode for Emacs (English).
+-END-INFO-DIR-ENTRY
+ 
+ 
+ 
diff --git a/print/yatex/files/patch-docs-yatexj b/print/yatex/files/patch-docs-yatexj
new file mode 100644
index 000000000000..a6f60ab75990
--- /dev/null
+++ b/print/yatex/files/patch-docs-yatexj
@@ -0,0 +1,12 @@
+--- docs/yatexj.orig	2012-08-05 01:02:01.000000000 +0900
++++ docs/yatexj	2012-08-05 01:02:19.000000000 +0900
+@@ -3,9 +3,6 @@
+ from file `yatexj.tex'
+ using `texinfmt.el' version 2.42 of  7 Jul 2006.
+ 
+-START-INFO-DIR-ENTRY
+-* YaTeX: (yatexj).      Yet Another tex-mode for Emacs (Japanese).
+-END-INFO-DIR-ENTRY
+ 
+ 
+ 
diff --git a/print/yatex/files/pkg-message.in b/print/yatex/files/pkg-message.in
index 239f1ad754df..31e3ace96bf9 100644
--- a/print/yatex/files/pkg-message.in
+++ b/print/yatex/files/pkg-message.in
@@ -1,10 +1,11 @@
+==============================================================================
 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:
+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::