Remove install-info from Makefile, it's automatically done when INFO is defined

21 files changed, 5 insertions, 36 deletions

diff --git a/games/emacs-chess/Makefile b/games/emacs-chess/Makefile
index 3cc0cf938f1..413dbb41613 100644
--- a/games/emacs-chess/Makefile
+++ b/games/emacs-chess/Makefile
@@ -69,7 +69,6 @@ do-install:
 .endif
 
 post-install:
-	install-info --dir ${PREFIX}/info/dir ${PREFIX}/info/chess.info
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile
index 180931de77d..f578c7af7f2 100644
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@@ -41,7 +41,6 @@ do-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/gnushogi/gnushogi.bbk ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/gnushogi.info ${PREFIX}/info
-	install-info ${PREFIX}/info/gnushogi.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/BOOKFILES ${DOCSDIR}
diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile
index 4608c86a086..7769a64caa6 100644
--- a/graphics/gauche-gl/Makefile
+++ b/graphics/gauche-gl/Makefile
@@ -42,7 +42,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 .for i in gauche-gl-refe.info gauche-gl-refj.info
 	${GZCAT} ${WRKSRC}/doc/${i}.gz >${PREFIX}/info/${i}
-	install-info ${PREFIX}/info/${i} ${PREFIX}/info/dir
 .endfor
 	${MKDIR} ${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index da3ba51c9ed..afac46608f9 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -34,8 +34,10 @@ MAKE_ENV+=	CPPFLAGS="${CPPFLAGS} -DHAVE_DECL_GETOPT"
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 PLIST_FILES=	bin/ocrad
+.if !defined(NOPORTDOCS)
 INFO=		ocrad
 MAN1=		ocrad.1
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ocrad ${PREFIX}/bin
@@ -43,7 +45,6 @@ do-install:
 	@${MKDIR} ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 	@${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${PREFIX}/man/man1
 	@${INSTALL_DATA} ${WRKSRC}/doc/ocrad.info ${PREFIX}/info
-	@install-info ${PREFIX}/info/ocrad.info ${PREFIX}/info/dir
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/zgv/Makefile b/graphics/zgv/Makefile
index 45d64149579..5445bfa4651 100644
--- a/graphics/zgv/Makefile
+++ b/graphics/zgv/Makefile
@@ -45,7 +45,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.zgvrc ${PREFIX}/etc/zgvrc.sample
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/doc/zgv ${PREFIX}/${INFO_PATH}/zgv.info
-	install-info ${PREFIX}/${INFO_PATH}/zgv.info ${PREFIX}/${INFO_PATH}/dir
 	${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
diff --git a/japanese/mtools/Makefile b/japanese/mtools/Makefile
index dfdf6504d10..957cb76b05e 100644
--- a/japanese/mtools/Makefile
+++ b/japanese/mtools/Makefile
@@ -50,6 +50,5 @@ post-install:
 	@${LN} -sf ${PREFIX}/bin/mtools ${PREFIX}/bin/mwrite
 	@${INSTALL_DATA} ${WRKSRC}/mtools.conf ${PREFIX}/etc
 	@${ECHO} "Please verify ${PREFIX}/etc/mtools.conf for your machine."
-	@install-info ${PREFIX}/info/mtools.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile
index b0675324f01..985beeddc5f 100644
--- a/japanese/skk10-elisp-emacs20/Makefile
+++ b/japanese/skk10-elisp-emacs20/Makefile
@@ -96,7 +96,6 @@ post-install:
 			${INSTALL_DATA} $${i} ${LOCALBASE}/${SKK_DOCDIR} ;\
 		done ;\
 	)
-	@install-info ${LOCALBASE}/info/skk.info ${LOCALBASE}/info/dir
 .if !defined(NOPORTDOCS)
 	@${INSTALL_DATA} ${WRKSRC}/READMEs/* ${LOCALBASE}/${SKK_DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/experimental/GUIDELINE \
diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile
index 971e9421d26..0b589cc3bce 100644
--- a/lang/Sather/Makefile
+++ b/lang/Sather/Makefile
@@ -91,9 +91,8 @@ do-install:
 .for file in sabrowse.1 sacomp.1
 	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/${file} ${MANPREFIX}/man/man1
 .endfor
-.for file in sather-mode.info sather-tutorial.info sather.info
-	${INSTALL_DATA} ${WRKSRC}/Emacs/${file} ${PREFIX}/info
-	@install-info ${PREFIX}/info/${file} ${PREFIX}/info/dir
+.for file in ${INFO}
+	${INSTALL_DATA} ${WRKSRC}/Emacs/${file}.info ${PREFIX}/info
 .endfor
 .for file in hl319.el sather-lib.el sather-module.el sather.el
 	${INSTALL_DATA} ${WRKSRC}/Emacs/${file} ${PREFIX}/share/emacs/site-lisp
diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index 5ac34e5f2ba..d13f131f00d 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -49,13 +49,10 @@ post-configure:
 BROKEN=		"Does not compile on !i386"
 .endif
 
-post-install: install-info
+post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/bigloo.sh | ${SED} "s|%%BIGLOO_VERSION%%|${PORTVERSION}|g" > ${PREFIX}/etc/rc.d/000.bigloo.sh
 	@${CHMOD} 750 ${PREFIX}/etc/rc.d/000.bigloo.sh
 
-install-info:
-	@${INSTALL_INFO} ${PREFIX}/info/${PORTNAME}.info ${PREFIX}/info/dir
-
 test: build
 	@(cd ${WRKSRC}; ${GMAKE} test)
 
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index fbd2ffa1c8d..fd99a69b3ed 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -99,9 +99,6 @@ post-install:
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
-.for info in cpp g77 gcc
-	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} \
 		-type f -o -type l >${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 7b1888c671c..4c91e42a1e7 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -67,9 +67,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${MANPREFIX}/man/man1/
 	${INSTALL_DATA} ${WRKSRC}/doc/*.info ${PREFIX}/info/
-.for info in ${INFO}
-	install-info --section="${INFOSECTION}" ${WRKSRC}/doc/${info}.info ${PREFIX}/info/dir
-.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 167f76d8d32..d7b9b8f5bd7 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -115,9 +115,6 @@ post-install:
 .if defined(WANT_SHAREDLIBS)
 	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 .endif
-.for info in ${INFO}
-	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-.endfor
 	cd ${PREFIX} ;\
 	    ${FIND} lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV} \
 		-type f -o -type l >${WRKDIR}/PLIST.gcc-lib
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 3b55c2edce1..40b22f5211c 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -123,9 +123,6 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-.for info in cpp cppinternals g77 gcc
-	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-.endfor
 # I am sick and tired of the anonyance that man pages can only be generated if
 # perl 5.6 is installed.  This is becoming a royal PITA on non-5-CURRENT systems
 .for mp in ${_MANPAGES}
diff --git a/lang/slib/Makefile b/lang/slib/Makefile
index 7c60482f0bc..c8d465a2b45 100644
--- a/lang/slib/Makefile
+++ b/lang/slib/Makefile
@@ -33,7 +33,6 @@ do-install:
 	${MKDIR} ${DATADIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} *.scm *.init *.txt *.xyz *.ps ${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/slib.info ${PREFIX}/info
-	install-info ${PREFIX}/info/slib.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for file in ANNOUNCE ChangeLog FAQ README
diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index b76eed9f840..70a8c21198e 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -55,7 +55,6 @@ post-install:
 	for f in ${WRKSRC}/doc/yorick.info*; do \
 	  ${INSTALL_DATA} $$f ${PREFIX}/info; \
 	done
-	install-info ${PREFIX}/info/yorick.info ${PREFIX}/info/dir
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/mboxgrep/Makefile b/mail/mboxgrep/Makefile
index 213f6930f65..e0dc1593072 100644
--- a/mail/mboxgrep/Makefile
+++ b/mail/mboxgrep/Makefile
@@ -31,7 +31,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,void \*tmpp,FILE \*tmpp,g' ${WRKSRC}/src/main.c
 
 post-install:
-	install-info ${PREFIX}/info/mboxgrep.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
 .for f in ${DOCS}
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index deb69df0b30..0f9d75248b2 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -73,7 +73,6 @@ post-install:
 	@test -d ${PREFIX}/share/doc/gnuplot+ || ${MKDIR} ${PREFIX}/share/doc/gnuplot+
 	${INSTALL_DATA} ${GP_DOCS} ${PREFIX}/share/doc/gnuplot+
 	${INSTALL_DATA} ${WRKSRC}/docs/gnuplot.info ${PREFIX}/info
-	install-info ${PREFIX}/info/gnuplot.info ${PREFIX}/info/dir
 	${MKDIR} ${PREFIX}/share/examples/gnuplot+
 	${INSTALL_DATA} ${WRKSRC}/demo/* ${PREFIX}/share/examples/gnuplot+
 
diff --git a/math/gri/Makefile b/math/gri/Makefile
index bf821df163f..869091c275b 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -47,7 +47,6 @@ post-install:
 .endfor
 .if !defined(NOPORTDOCS)
 	@${INSTALL_DATA} ${WRKSRC}/doc/gri.info ${PREFIX}/info
-	install-info ${PREFIX}/info/gri.info ${PREFIX}/info/dir
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/gwhich/Makefile b/misc/gwhich/Makefile
index 51b7026008a..de1e823bfbc 100644
--- a/misc/gwhich/Makefile
+++ b/misc/gwhich/Makefile
@@ -22,7 +22,6 @@ MAN1=		gwhich.1
 INFO=		which
 
 post-install:
-	@install-info ${PREFIX}/info/which.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/examples/gwhich
 	@${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${PREFIX}/share/examples/gwhich/EXAMPLES
diff --git a/misc/vera/Makefile b/misc/vera/Makefile
index 4ec5f16e490..6436f8129ca 100644
--- a/misc/vera/Makefile
+++ b/misc/vera/Makefile
@@ -22,7 +22,4 @@ do-build:
 do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/vera.info ${PREFIX}/info
 
-post-install:
-	@ install-info ${PREFIX}/info/vera.info ${PREFIX}/info/dir
-
 .include <bsd.port.mk>
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index 326259acfc3..bb5e848c7ab 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -66,7 +66,6 @@ post-patch:
 .endif
 
 post-install:
-	install-info ${PREFIX}/info/conduits.info ${PREFIX}/info/dir
 	${MKDIR} ${PREFIX}/include/pconn
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/include/pconn/*.h ${PREFIX}/include/pconn/