8 files changed, 5 insertions, 44 deletions

diff --git a/lang/emacs-lisp-intro/Makefile b/lang/emacs-lisp-intro/Makefile
index f649136268bb..0609483eeca9 100644
--- a/lang/emacs-lisp-intro/Makefile
+++ b/lang/emacs-lisp-intro/Makefile
@@ -15,5 +15,6 @@ MAINTAINER=	amakawa@jp.FreeBSD.org
 COMMENT=	An introduction to Emacs Lisp programming
 
 USE_AUTOTOOLS=	autoconf:213
+INFO=		emacs-lisp-intro
 
 .include <bsd.port.mk>
diff --git a/lang/emacs-lisp-intro/pkg-plist b/lang/emacs-lisp-intro/pkg-plist
deleted file mode 100644
index b4a5081ec61a..000000000000
--- a/lang/emacs-lisp-intro/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-@unexec install-info --delete %D/info/emacs-lisp-intro.info %D/info/dir
-info/emacs-lisp-intro.info
-@exec install-info %D/info/emacs-lisp-intro.info %D/info/dir
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 012f21251c18..3b55c2edce1d 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -27,6 +27,7 @@ LATEST_LINK?=	gcc32${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
+INFO=		cpp cppinternals g77 gcc gccint
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist
index 84928e6c478a..86b3935ca4e2 100644
--- a/lang/gcc32/pkg-plist
+++ b/lang/gcc32/pkg-plist
@@ -11,18 +11,3 @@ bin/gccbug-%%PORTVERSION%%
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
-@unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@unexec install-info --delete %D/info/g77.info %D/info/dir
-@unexec install-info --delete %D/info/gcc.info %D/info/dir
-@unexec install-info --delete %D/info/gccint.info %D/info/dir
-info/cpp.info
-info/cppinternals.info
-info/g77.info
-info/gcc.info
-info/gccint.info
-@exec install-info %D/info/cpp.info %D/info/dir
-@exec install-info %D/info/cppinternals.info %D/info/dir
-@exec install-info %D/info/g77.info %D/info/dir
-@exec install-info %D/info/gcc.info %D/info/dir
-@exec install-info %D/info/gccint.info %D/info/dir
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index a006f65f626f..0c820f11dc41 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -37,6 +37,7 @@ PLIST_SUB=	PORTVERSION="${PORTVERSION}" \
 		WORDSIZE=${WORDSIZE} BYTEORDER=${BYTEORDER}
 
 MAN1=		gforth.1
+INFO=		gforth vmgen
 
 # Local variables
 #
diff --git a/lang/gforth/pkg-plist b/lang/gforth/pkg-plist
index 7684c70dfdb7..81f00143de01 100644
--- a/lang/gforth/pkg-plist
+++ b/lang/gforth/pkg-plist
@@ -14,12 +14,6 @@ bin/gforthmi-%%PORTVERSION%%
 bin/vmgen-%%PORTVERSION%%
 @exec ln -fs %f %B/vmgen
 @unexec rm -f %B/vmgen
-@unexec install-info --quiet --delete %D/info/gforth.info %D/info/dir
-info/gforth.info
-@exec install-info %D/info/gforth.info %D/info/dir
-@unexec install-info --quiet --delete %D/info/vmgen.info %D/info/dir
-info/vmgen.info
-@exec install-info %D/info/vmgen.info %D/info/dir
 %%LIB_DIR%%/%%PORTVERSION%%/gforth-ditc
 %%LIB_DIR%%/%%PORTVERSION%%/gforth.fi
 @exec mkdir -p %D/lib/gforth/site-forth
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index d151d39fa414..c308debccac9 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -20,6 +20,8 @@ USE_AUTOTOOLS=	libtool:13
 CONFIGURE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAN1=		oo2c.1 oob.1 ooef.1 oocn.1 oowhereis.1
 
+INFO=		OOCref
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
diff --git a/lang/oo2c/pkg-plist b/lang/oo2c/pkg-plist
index 10de1aef5cba..4dbf2b111079 100644
--- a/lang/oo2c/pkg-plist
+++ b/lang/oo2c/pkg-plist
@@ -5,26 +5,6 @@ bin/oobacktrace
 bin/oocn
 bin/ooef
 bin/oowhereis
-@unexec install-info --delete %D/info/OOCref.info %D/info/dir
-info/OOCref.info
-info/OOCref.info-1
-info/OOCref.info-2
-info/OOCref.info-3
-info/OOCref.info-4
-info/OOCref.info-5
-info/OOCref.info-6
-info/OOCref.info-7
-info/OOCref.info-8
-info/OOCref.info-9
-info/OOCref.info-10
-info/OOCref.info-11
-info/OOCref.info-12
-info/OOCref.info-13
-info/OOCref.info-14
-info/OOCref.info-15
-info/OOCref.info-16
-info/OOCref.info-17
-@exec install-info %D/info/OOCref.info %D/info/dir
 lib/liboo2c.a
 lib/liboo2c.la
 lib/liboo2c.so