9 files changed, 5 insertions, 45 deletions

diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index bdb55c4fc677..81215d162486 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -20,5 +20,6 @@ EMACS_PORT_NAME?=	emacs21
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+INFO=		mailcrypt
 
 .include <bsd.port.mk>
diff --git a/mail/mailcrypt/pkg-plist b/mail/mailcrypt/pkg-plist
index 7927bb758ce0..6f8d5094b1db 100644
--- a/mail/mailcrypt/pkg-plist
+++ b/mail/mailcrypt/pkg-plist
@@ -1,8 +1,3 @@
-@unexec install-info --delete %D/info/mailcrypt.info %D/info/dir
-info/mailcrypt.info
-info/mailcrypt.info-1
-info/mailcrypt.info-2
-@exec install-info %D/info/mailcrypt.info %D/info/dir
 %%EMACS_VERSION_SITE_LISPDIR%%/mailcrypt/expect.el
 %%EMACS_VERSION_SITE_LISPDIR%%/mailcrypt/expect.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/mailcrypt/mailcrypt.el
diff --git a/mail/mew-emacs20/Makefile b/mail/mew-emacs20/Makefile
index 62967e03a7db..728a82a1111f 100644
--- a/mail/mew-emacs20/Makefile
+++ b/mail/mew-emacs20/Makefile
@@ -20,5 +20,6 @@ INSTALL_TARGET=	install install-info install-jinfo install-etc
 
 # use pkg-* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}
+INFO=		mew.jis
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/mew-emacs20/pkg-plist b/mail/mew-emacs20/pkg-plist
index 0a1465a5e396..0a95cc321cc2 100644
--- a/mail/mew-emacs20/pkg-plist
+++ b/mail/mew-emacs20/pkg-plist
@@ -2,19 +2,6 @@ bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/uumerge
-@exec [ -f %D/info/dir ] || sed -ne 1,/Menu:/p /usr/share/info/dir > %D/info/dir
-@unexec install-info --delete %D/info/mew.info %D/info/dir
-info/mew.info
-@exec install-info %D/info/mew.info %D/info/dir
-info/mew.info-1
-info/mew.info-2
-info/mew.info-3
-@exec [ -f %D/info/dir ] || sed -ne 1,/Menu:/p /usr/share/info/dir > %D/info/dir
-@unexec install-info --delete %D/info/mew.jis.info %D/info/dir
-info/mew.jis.info
-@exec install-info %D/info/mew.jis.info %D/info/dir
-info/mew.jis.info-1
-info/mew.jis.info-2
 %%MEW_DOCDIR%%/00changes
 %%MEW_DOCDIR%%/00copyright
 %%MEW_DOCDIR%%/00copyright.jis
diff --git a/mail/mew2-emacs20/pkg-plist b/mail/mew2-emacs20/pkg-plist
index 2e7a38b4494e..1d80d8a5222c 100644
--- a/mail/mew2-emacs20/pkg-plist
+++ b/mail/mew2-emacs20/pkg-plist
@@ -3,18 +3,6 @@ bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/mewls
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
-info/mew%%MEW_MAJOR_VER%%.info
-info/mew%%MEW_MAJOR_VER%%.info-1
-info/mew%%MEW_MAJOR_VER%%.info-2
-info/mew%%MEW_MAJOR_VER%%.info-3
-info/mew%%MEW_MAJOR_VER%%.jis.info
-info/mew%%MEW_MAJOR_VER%%.jis.info-1
-info/mew%%MEW_MAJOR_VER%%.jis.info-2
-info/mew%%MEW_MAJOR_VER%%.jis.info-3
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 share/doc/mew%%MEW_MAJOR_VER%%/00api
 share/doc/mew%%MEW_MAJOR_VER%%/00changes
 share/doc/mew%%MEW_MAJOR_VER%%/00copyright
diff --git a/mail/mew2/Makefile b/mail/mew2/Makefile
index b4223ed19caf..8a0a6b04c66a 100644
--- a/mail/mew2/Makefile
+++ b/mail/mew2/Makefile
@@ -44,6 +44,8 @@ MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1 incm.1
 # make sure LATEST_LINK is different from mew1
 LATEST_LINK=    mew${MEW_MAJOR_VER}-${EMACS_PORT_NAME}
 
+INFO+=		mew${MEW_MAJOR_VER} mew${MEW_MAJOR_VER}.jis
+
 post-patch:
 	for f in mew-key.el info/mew.texi; do \
 		${PERL} -i -pe 's,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g' ${WRKSRC}/$${f}; \
diff --git a/mail/mew2/pkg-plist b/mail/mew2/pkg-plist
index 2e7a38b4494e..1d80d8a5222c 100644
--- a/mail/mew2/pkg-plist
+++ b/mail/mew2/pkg-plist
@@ -3,18 +3,6 @@ bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/mewls
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
-info/mew%%MEW_MAJOR_VER%%.info
-info/mew%%MEW_MAJOR_VER%%.info-1
-info/mew%%MEW_MAJOR_VER%%.info-2
-info/mew%%MEW_MAJOR_VER%%.info-3
-info/mew%%MEW_MAJOR_VER%%.jis.info
-info/mew%%MEW_MAJOR_VER%%.jis.info-1
-info/mew%%MEW_MAJOR_VER%%.jis.info-2
-info/mew%%MEW_MAJOR_VER%%.jis.info-3
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 share/doc/mew%%MEW_MAJOR_VER%%/00api
 share/doc/mew%%MEW_MAJOR_VER%%/00changes
 share/doc/mew%%MEW_MAJOR_VER%%/00copyright
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index 941e60d4cc68..bf30add2d972 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -22,6 +22,7 @@ INSTALLS_SHLIB=	yes
 
 MAN5=		pop3lite.conf.5
 MAN8=		pop3lite.8
+INFO=		pop3lite-admin
 
 pre-build:
 	@${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
diff --git a/mail/pop3lite/pkg-plist b/mail/pop3lite/pkg-plist
index e41caecab3bc..67cba32512f7 100644
--- a/mail/pop3lite/pkg-plist
+++ b/mail/pop3lite/pkg-plist
@@ -3,9 +3,6 @@ include/pop3lite/alias.h
 include/pop3lite/apop.h
 include/pop3lite/mailbox.h
 include/pop3lite/userconf.h
-@unexec install-info --delete %D/info/pop3lite-admin.info %D/info/dir
-info/pop3lite-admin.info
-@exec install-info %D/info/pop3lite-admin.info %D/info/dir
 lib/pop3lite/alias.so
 lib/pop3lite/apop.so
 lib/pop3lite/capa.so