Update to 4.7 and unbroken.

Submitted by:	hrs
Approved by:	Mitsuru Yoshida <mitsuru@riken.go.jp> (maintainer)

4 files changed, 42 insertions, 49 deletions

diff --git a/japanese/texinfo/Makefile b/japanese/texinfo/Makefile
index 3ae1fb6f2380..0352d4ecf746 100644
--- a/japanese/texinfo/Makefile
+++ b/japanese/texinfo/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	texinfo
-PORTVERSION=	4.5
-PORTREVISION=	1
+PORTVERSION=	4.7
+PORTREVISION=	0
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,19 +20,18 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	mitsuru@riken.go.jp
 COMMENT=	Typeset Texinfo files for printing. Uses TeX
 
-RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex
-
-BROKEN=		"Checksum mismatch"
-EXPIRATION_DATE=2004-08-20
-DEPRECATED=	${BROKEN}
+RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-tetex
 
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=j
 INSTALL_TARGET=	install install-tex
 CFLAGS+=	"-DEUC=1"
-MAKE_ARGS=	TEXMF=${PREFIX}/share/texmf
+MAKE_ARGS=	TEXMF=${PREFIX}/${TEXMFLOCAL}
+PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL}
+TEXMFLOCAL=	share/texmf-local
 
-MAN1=		jinfo.1 jinstall-info.1 jmakeinfo.1 jtexindex.1 jtexi2dvi.1
+MAN1=		jinfo.1 jinfokey.1 jinstall-info.1 jmakeinfo.1 jtexindex.1 jtexi2dvi.1
 MAN5=		jinfo.5 jtexinfo.5
 
 .include <bsd.port.mk>
diff --git a/japanese/texinfo/distinfo b/japanese/texinfo/distinfo
index 86af86a6110e..5d42bf1d9ad3 100644
--- a/japanese/texinfo/distinfo
+++ b/japanese/texinfo/distinfo
@@ -1,2 +1,4 @@
-MD5 (texinfo-4.5.tar.gz) = 8a5d6b54bc2ff5ec51c696a4e89d93b2
-MD5 (texinfo-4.5-j.diff.gz) = 980ac509afcb6dea27c5de30f1a578c0
+MD5 (texinfo-4.7.tar.gz) = 72a57e378efb9898c9e41ca839554dae
+SIZE (texinfo-4.7.tar.gz) = 1979183
+MD5 (texinfo-4.7-j.diff.gz) = b50bfcadbcf80b6f5a290a3b81adcd51
+SIZE (texinfo-4.7-j.diff.gz) = 23561
diff --git a/japanese/texinfo/files/patch-ab b/japanese/texinfo/files/patch-ab
index 7b64adda3a77..37e7e025fba6 100644
--- a/japanese/texinfo/files/patch-ab
+++ b/japanese/texinfo/files/patch-ab
@@ -1,15 +1,15 @@
---- util/texi2dvi.orig	Wed Aug 25 13:47:25 1999
-+++ util/texi2dvi	Wed Aug 25 13:47:31 1999
-@@ -354,7 +354,7 @@
+--- util/texi2dvi.orig	Fri Mar  5 19:45:29 2004
++++ util/texi2dvi	Fri Mar  5 19:48:08 2004
+@@ -449,7 +449,7 @@
      *)
        # Assume a Texinfo file.  Texinfo files need makeinfo, texindex and tex.
        bibtex=
 -      texindex=${TEXINDEX:-texindex}
 +      texindex=${TEXINDEX:-jtexindex}
+       textra_cmd='/^@setfilename/a'
        if test $oformat = dvi; then
          tex=${TEX:-ptex}
-       else
-@@ -363,7 +363,7 @@
+@@ -459,7 +459,7 @@
        # Unless required by the user, makeinfo expansion is wanted only
        # if texinfo.tex is too old.
        if test "$expand" = t; then
@@ -18,12 +18,12 @@
        else
          # Check if texinfo.tex performs macro expansion by looking for
          # its version.  The version is a date of the form YEAR-MO-DA.
-@@ -380,7 +380,7 @@
+@@ -476,7 +476,7 @@
          if test "$txiprereq" -le "$txiversion" >/dev/null 2>&1; then
            makeinfo=
          else
 -          makeinfo=${MAKEINFO:-makeinfo}
 +          makeinfo=${MAKEINFO:-jmakeinfo}
          fi
-         # As long as we had to run TeX, offer the user this convenience
-         if test "$txiformat" = Texinfo; then
+         # As long as we had to run TeX, offer the user this convenience:
+         test "$txiformat" = Texinfo && escape=@
diff --git a/japanese/texinfo/pkg-plist b/japanese/texinfo/pkg-plist
index 83d649aca1bb..d0518cbaccc7 100644
--- a/japanese/texinfo/pkg-plist
+++ b/japanese/texinfo/pkg-plist
@@ -12,41 +12,28 @@ info/texinfo
 info/texinfo-1
 info/texinfo-2
 info/texinfo-3
-info/texinfo-4
-info/texinfo-5
-info/texinfo-6
-info/texinfo-7
-info/texinfo-8
-info/texinfo-9
-info/texinfo-10
-info/texinfo-11
-info/texinfo-12
-info/texinfo-13
-info/texinfo-14
-info/texinfo-15
 info/info-stnd.info
-info/info-stnd.info-1
-info/info-stnd.info-2
-info/info-stnd.info-3
 @exec install-info %D/info/info.info %D/info/dir
 @exec install-info %D/info/texinfo %D/info/dir
 @exec install-info %D/info/info-stnd.info %D/info/dir
+share/texinfo/texinfo.cat
 share/texinfo/texinfo.dtd
 share/texinfo/texinfo.xsl
-share/texmf/tex/generic/dvips/epsf.tex
-share/texmf/tex/texinfo/texinfo.tex
-share/texmf/tex/texinfo/txi-cs.tex
-share/texmf/tex/texinfo/txi-de.tex
-share/texmf/tex/texinfo/txi-no.tex
-share/texmf/tex/texinfo/txi-ja.tex
-share/texmf/tex/texinfo/txi-en.tex
-share/texmf/tex/texinfo/txi-es.tex
-share/texmf/tex/texinfo/txi-fr.tex
-share/texmf/tex/texinfo/txi-it.tex
-share/texmf/tex/texinfo/txi-nl.tex
-share/texmf/tex/texinfo/txi-pt.tex
-share/texmf/tex/texinfo/txi-tr.tex
-share/texmf/pdftex/plain/misc/pdfcolor.tex
+%%TEXMFLOCAL%%/tex/generic/dvips/epsf.tex
+%%TEXMFLOCAL%%/tex/texinfo/texinfo.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-cs.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-de.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-no.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-ja.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-en.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-es.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-fr.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-it.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-nl.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-pl.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-pt.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-tr.tex
+%%TEXMFLOCAL%%/pdftex/plain/misc/pdfcolor.tex
 share/locale/de/LC_MESSAGES/texinfo.mo
 share/locale/fr/LC_MESSAGES/texinfo.mo
 share/locale/nl/LC_MESSAGES/texinfo.mo
@@ -59,6 +46,9 @@ share/locale/da/LC_MESSAGES/texinfo.mo
 share/locale/he/LC_MESSAGES/texinfo.mo
 share/locale/hr/LC_MESSAGES/texinfo.mo
 share/locale/ja/LC_MESSAGES/texinfo.mo
+share/locale/nb/LC_MESSAGES/texinfo.mo
+share/locale/pl/LC_MESSAGES/texinfo.mo
+share/locale/ro/LC_MESSAGES/texinfo.mo
 share/locale/sv/LC_MESSAGES/texinfo.mo
 share/locale/tr/LC_MESSAGES/texinfo.mo
 share/locale/zh_CN/LC_MESSAGES/texinfo.mo
@@ -66,5 +56,7 @@ share/locale/zh_TW/LC_MESSAGES/texinfo.mo
 @unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/* 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
-@unexec rmdir %D/share/texmf/tex/generic/dvips 2>/dev/null || true
+@unexec rmdir %D/%%TEXMFLOCAL%%/tex/generic/dvips 2>/dev/null || true
+@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain/misc 2>/dev/null || true
+@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain 2>/dev/null || true
 @unexec rmdir %D/share/texinfo 2>/dev/null || true