23 files changed, 22 insertions, 98 deletions

diff --git a/japanese/bookview/Makefile b/japanese/bookview/Makefile
index 803876739987..43017b5bf621 100644
--- a/japanese/bookview/Makefile
+++ b/japanese/bookview/Makefile
@@ -16,6 +16,8 @@ COMMENT=	NDTP client written in Tcl/Tk
 
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
+INFO=		bookview-ja bookview
+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	WISH=${LOCALBASE}/bin/wish8.4
diff --git a/japanese/bookview/pkg-plist b/japanese/bookview/pkg-plist
index 443993f39be4..193754105d61 100644
--- a/japanese/bookview/pkg-plist
+++ b/japanese/bookview/pkg-plist
@@ -1,10 +1,4 @@
 bin/bookview
-@unexec install-info --delete %D/info/bookview-ja.info %D/info/dir
-@unexec install-info --delete %D/info/bookview.info %D/info/dir
-info/bookview-ja.info
-info/bookview.info
-@exec install-info %D/info/bookview-ja.info %D/info/dir
-@exec install-info %D/info/bookview.info %D/info/dir
 share/bookview/arrow.xbm
 share/bookview/backward.xbm
 share/bookview/copyright.gif
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 36371257d9bc..c669d8ac47ce 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -27,6 +27,8 @@ DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
 PLIST=	${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
 
+INFO=		skk
+
 SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
 SKK_DOCS=	AUTHORS.ja CODENAME.ja Contributors FAQ.ja NEWS.ja README
 SKK_EXAMPLES=	etc/Emacs.ad etc/dot.emacs etc/dot.skk
diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist
index 2331ad8af8f5..0980c6056912 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -67,13 +67,6 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.el
 %%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.elc
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/skk
-@unexec install-info --delete %D/info/skk.info %D/info/dir
-info/skk.info
-info/skk.info-1
-info/skk.info-2
-info/skk.info-3
-info/skk.info-4
-@exec install-info %D/info/skk.info %D/info/dir
 share/skk/NICOLA-SKK.tut
 share/skk/SKK.tut
 share/skk/SKK.tut.E
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index 63a153aba161..439f0486c9ee 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -72,6 +72,9 @@ CONFIGURE_ARGS=	--enable-nls \
 
 APPENDIXDIR=	${DATADIR}/appendix
 
+INFO=		eb-ja ebfont-ja ebfont ebinfo-ja ebinfo ebrefile-ja \
+		ebrefile ebzip-ja ebzip
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64"
diff --git a/japanese/eb3/pkg-plist b/japanese/eb3/pkg-plist
index 33973ab6fae9..af8b47d9be7d 100644
--- a/japanese/eb3/pkg-plist
+++ b/japanese/eb3/pkg-plist
@@ -15,33 +15,6 @@ include/eb/font.h
 include/eb/text.h
 include/eb/zio.h
 @dirrm include/eb
-@unexec install-info --delete %D/info/eb-ja.info %D/info/dir
-@unexec install-info --delete %D/info/ebfont-ja.info %D/info/dir
-@unexec install-info --delete %D/info/ebfont.info %D/info/dir
-@unexec install-info --delete %D/info/ebinfo-ja.info %D/info/dir
-@unexec install-info --delete %D/info/ebinfo.info %D/info/dir
-@unexec install-info --delete %D/info/ebrefile-ja.info %D/info/dir
-@unexec install-info --delete %D/info/ebrefile.info %D/info/dir
-@unexec install-info --delete %D/info/ebzip-ja.info %D/info/dir
-@unexec install-info --delete %D/info/ebzip.info %D/info/dir
-info/eb-ja.info
-info/ebfont-ja.info
-info/ebfont.info
-info/ebinfo-ja.info
-info/ebinfo.info
-info/ebrefile-ja.info
-info/ebrefile.info
-info/ebzip-ja.info
-info/ebzip.info
-@exec install-info %D/info/eb-ja.info %D/info/dir
-@exec install-info %D/info/ebfont-ja.info %D/info/dir
-@exec install-info %D/info/ebfont.info %D/info/dir
-@exec install-info %D/info/ebinfo-ja.info %D/info/dir
-@exec install-info %D/info/ebinfo.info %D/info/dir
-@exec install-info %D/info/ebrefile-ja.info %D/info/dir
-@exec install-info %D/info/ebrefile.info %D/info/dir
-@exec install-info %D/info/ebzip-ja.info %D/info/dir
-@exec install-info %D/info/ebzip.info %D/info/dir
 lib/libeb.a
 lib/libeb.so
 lib/libeb.so.7
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index b4b3ba64ce65..d124e7b0983c 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -21,6 +21,8 @@ COMMENT=	GNU awk + multi-byte extension
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bitops --enable-non-decimal-data
 
+INFO=		gawk
+
 MAN1=		gawk.1 igawk.1
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
diff --git a/japanese/gawk/pkg-plist b/japanese/gawk/pkg-plist
index 9e1dc6707d81..8fe481a0bc70 100644
--- a/japanese/gawk/pkg-plist
+++ b/japanese/gawk/pkg-plist
@@ -1,8 +1,5 @@
 bin/gawk
 bin/igawk
-@unexec install-info --delete %D/info/gawk.info %D/info/dir
-info/gawk.info
-@exec install-info %D/info/gawk.info %D/info/dir
 libexec/awk/grcat
 libexec/awk/pwcat
 share/awk/assert.awk
diff --git a/japanese/grep/Makefile b/japanese/grep/Makefile
index 2882068e7b4b..a6a50c7b1e63 100644
--- a/japanese/grep/Makefile
+++ b/japanese/grep/Makefile
@@ -21,6 +21,8 @@ COMMENT=	GNU grep + multi-byte extension
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=j --disable-nls
 
+INFO=		grep
+
 MAN1=		jgrep.1
 MLINKS=		jgrep.1 jegrep.1 \
 		jgrep.1 jfgrep.1
diff --git a/japanese/grep/pkg-plist b/japanese/grep/pkg-plist
index 8af50fabfee2..46b7fa799693 100644
--- a/japanese/grep/pkg-plist
+++ b/japanese/grep/pkg-plist
@@ -1,9 +1,6 @@
 bin/jgrep
 bin/jegrep
 bin/jfgrep
-@unexec install-info --delete %D/info/grep.info %D/info/dir
-info/grep.info
-@exec install-info %D/info/grep.info %D/info/dir
 %%PORTDOCS%%share/doc/ja-grep/README.MB
 %%PORTDOCS%%share/doc/ja-grep/README.mlb
 %%PORTDOCS%%@dirrm share/doc/ja-grep
diff --git a/japanese/lookup-emacs20/pkg-plist b/japanese/lookup-emacs20/pkg-plist
index 19de6c322114..1218740e6db4 100644
--- a/japanese/lookup-emacs20/pkg-plist
+++ b/japanese/lookup-emacs20/pkg-plist
@@ -46,13 +46,4 @@
 %%ELISPDIR%%/lookup/stem-english.elc
 %%ELISPDIR%%/lookup/lookup-vars.el
 %%ELISPDIR%%/lookup/lookup-vars.elc
-@unexec install-info  --delete %D/info/lookup.info %D/info/dir
-info/lookup.info
-info/lookup.info-1
-info/lookup.info-2
-info/lookup.info-3
-@exec install-info %D/info/lookup.info %D/info/dir
-@unexec install-info  --delete %D/info/lookup-guide.info %D/info/dir
-info/lookup-guide.info
-@exec install-info %D/info/lookup-guide.info %D/info/dir
 @dirrm %%ELISPDIR%%/lookup
diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile
index b42d856b3a58..dd8ae53974e6 100644
--- a/japanese/lookup-emacs21/Makefile
+++ b/japanese/lookup-emacs21/Makefile
@@ -20,6 +20,8 @@ PKGDIR=		${.CURDIR}/../lookup
 PLIST=		${.CURDIR}/pkg-plist
 EMACS_PORT_NAME?=	emacs21
 
+INFO?=		lookup lookup-guide
+
 .if (${EMACS_PORT_NAME} == "xemacs21-mule")
 EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
 ELISPDIR=	${EMACSDIR}/lisp/lookup
diff --git a/japanese/lookup-emacs21/pkg-plist b/japanese/lookup-emacs21/pkg-plist
index 19de6c322114..1218740e6db4 100644
--- a/japanese/lookup-emacs21/pkg-plist
+++ b/japanese/lookup-emacs21/pkg-plist
@@ -46,13 +46,4 @@
 %%ELISPDIR%%/lookup/stem-english.elc
 %%ELISPDIR%%/lookup/lookup-vars.el
 %%ELISPDIR%%/lookup/lookup-vars.elc
-@unexec install-info  --delete %D/info/lookup.info %D/info/dir
-info/lookup.info
-info/lookup.info-1
-info/lookup.info-2
-info/lookup.info-3
-@exec install-info %D/info/lookup.info %D/info/dir
-@unexec install-info  --delete %D/info/lookup-guide.info %D/info/dir
-info/lookup-guide.info
-@exec install-info %D/info/lookup-guide.info %D/info/dir
 @dirrm %%ELISPDIR%%/lookup
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index b42d856b3a58..dd8ae53974e6 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -20,6 +20,8 @@ PKGDIR=		${.CURDIR}/../lookup
 PLIST=		${.CURDIR}/pkg-plist
 EMACS_PORT_NAME?=	emacs21
 
+INFO?=		lookup lookup-guide
+
 .if (${EMACS_PORT_NAME} == "xemacs21-mule")
 EMACSDIR=	${PREFIX}/lib/xemacs/site-packages
 ELISPDIR=	${EMACSDIR}/lisp/lookup
diff --git a/japanese/lookup/pkg-plist b/japanese/lookup/pkg-plist
index 19de6c322114..1218740e6db4 100644
--- a/japanese/lookup/pkg-plist
+++ b/japanese/lookup/pkg-plist
@@ -46,13 +46,4 @@
 %%ELISPDIR%%/lookup/stem-english.elc
 %%ELISPDIR%%/lookup/lookup-vars.el
 %%ELISPDIR%%/lookup/lookup-vars.elc
-@unexec install-info  --delete %D/info/lookup.info %D/info/dir
-info/lookup.info
-info/lookup.info-1
-info/lookup.info-2
-info/lookup.info-3
-@exec install-info %D/info/lookup.info %D/info/dir
-@unexec install-info  --delete %D/info/lookup-guide.info %D/info/dir
-info/lookup-guide.info
-@exec install-info %D/info/lookup-guide.info %D/info/dir
 @dirrm %%ELISPDIR%%/lookup
diff --git a/japanese/mtools/Makefile b/japanese/mtools/Makefile
index b9e1eaf57d5d..dfdf6504d10c 100644
--- a/japanese/mtools/Makefile
+++ b/japanese/mtools/Makefile
@@ -23,6 +23,7 @@ COMMENT=	Tools for manipulating MSDOS files + support 1232KB , Unicode LFN
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-xdf
+INFO=		mtools
 
 USE_GMAKE=	yes
 
diff --git a/japanese/mtools/pkg-plist b/japanese/mtools/pkg-plist
index cc38859efbde..0b6544382312 100644
--- a/japanese/mtools/pkg-plist
+++ b/japanese/mtools/pkg-plist
@@ -51,9 +51,6 @@ bin/mcheck
 bin/mcomp
 bin/mkmanifest
 bin/mxtar
-@unexec install-info --delete %D/info/mtools.info %D/info/dir
-info/mtools.info
-@exec install-info %D/info/mtools.info %D/info/dir
 etc/mtools.conf
 @comment @exec ln -fs %D/man/man1/mcopy.1.gz %D/man/man1/mwrite.1.gz
 @comment @unexec rm %D/man/man1/mwrite.1.gz
diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index 3fa8c5e74333..015a93751ced 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -30,6 +30,8 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 OPTIONS=	DVIPSK "Install dvipsk with Japanize patch from ASCII" off
 OPTIONS+=	UDVIPS "Install udvips (Implies DVIPSK)" off
 
+INFO=		kpathsea latex web2c
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_UDVIPS)
diff --git a/japanese/ptex-base/pkg-plist b/japanese/ptex-base/pkg-plist
index 7550ebfba2ed..0af45d3e3722 100644
--- a/japanese/ptex-base/pkg-plist
+++ b/japanese/ptex-base/pkg-plist
@@ -196,22 +196,6 @@ include/kpathsea/types.h
 include/kpathsea/variable.h
 include/kpathsea/xopendir.h
 include/kpathsea/xstat.h
-@unexec install-info --delete %D/info/kpathsea.info %D/info/dir
-@unexec install-info --delete %D/info/latex.info %D/info/dir
-@unexec install-info --delete %D/info/web2c.info %D/info/dir
-info/kpathsea.info
-info/latex.info
-info/latex.info-1
-info/latex.info-2
-info/latex.info-3
-info/web2c.info
-info/web2c.info-1
-info/web2c.info-2
-info/web2c.info-3
-info/web2c.info-4
-@exec install-info %D/info/kpathsea.info %D/info/dir
-@exec install-info %D/info/latex.info %D/info/dir
-@exec install-info %D/info/web2c.info %D/info/dir
 lib/libkpathsea.a
 share/texmf/COPYRIGHT
 share/texmf/COPYRIGHT.jis
diff --git a/japanese/sed/Makefile b/japanese/sed/Makefile
index dad5e9673467..b400bd823a92 100644
--- a/japanese/sed/Makefile
+++ b/japanese/sed/Makefile
@@ -18,6 +18,8 @@ COMMENT=	GNU sed + multi-byte extension
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+INFO=		sed
+
 PATCH_SITES=	http://www.hinadori.dyn.to/~wills/program/
 PATCHFILES=	${PORTNAME}mb109.diff.gz
 PATCH_DIST_STRIP=	-p1
diff --git a/japanese/sed/pkg-plist b/japanese/sed/pkg-plist
index 21db3fb9b33e..1dde6a84597d 100644
--- a/japanese/sed/pkg-plist
+++ b/japanese/sed/pkg-plist
@@ -1,7 +1,4 @@
 bin/sed
-@unexec install-info --delete %D/info/sed.info %D/info/dir
-info/sed.info
-@exec install-info %D/info/sed.info %D/info/dir
 %%PORTDOCS%%share/doc/ja-sed/OREADME.MB
 %%PORTDOCS%%share/doc/ja-sed/README.MB
 %%PORTDOCS%%@dirrm share/doc/ja-sed
diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile
index 14824aa2a6ad..b0675324f013 100644
--- a/japanese/skk10-elisp-emacs20/Makefile
+++ b/japanese/skk10-elisp-emacs20/Makefile
@@ -27,6 +27,8 @@ PORT_CLASS?=	master
 EMACS_PORT_NAME=	emacs20
 .endif
 
+INFO=		skk
+
 .include <bsd.port.pre.mk>
 
 .if defined(EMACS_PORT_NAME)
diff --git a/japanese/skk10-elisp-emacs20/pkg-plist b/japanese/skk10-elisp-emacs20/pkg-plist
index f50d7300c1e2..bb66a5dd13f3 100644
--- a/japanese/skk10-elisp-emacs20/pkg-plist
+++ b/japanese/skk10-elisp-emacs20/pkg-plist
@@ -40,9 +40,6 @@
 %%EMACS_LIBDIR%%/site-lisp/skk/skk.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/%%SKK_STARTUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/skk
-@unexec install-info --delete %D/info/skk.info %D/info/dir
-info/skk.info
-@exec install-info %D/info/skk.info %D/info/dir
 %%SKK_JISYODIR%%/SKK.tut
 %%SKK_JISYODIR%%/SKK.tut.E
 %%SKK_DOCDIR%%/AUTHORS