4 files changed, 5 insertions, 37 deletions

diff --git a/news/gnus-emacs20/Makefile b/news/gnus-emacs20/Makefile
index 968ff081c90a..4bc6595f5915 100644
--- a/news/gnus-emacs20/Makefile
+++ b/news/gnus-emacs20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnus
 PORTVERSION=	5.8.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news mail elisp
 MASTER_SITES=	http://quimby.gnus.org/gnus/dist/ \
 		ftp://quimby.gnus.org/gnus/dist/ \
@@ -32,6 +32,7 @@ CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--infodir=${INFODIR}
 
 INFODIR=	${PREFIX}/info
+INFO=		emacs-mime gnus message
 
 PORTDOCDIR=	share/doc/gnus-${EMACS_PORT_NAME}
 DOCS=		ChangeLog GNUS-NEWS README
diff --git a/news/gnus-emacs20/pkg-plist b/news/gnus-emacs20/pkg-plist
index 447018f25a5b..1b53cf10082e 100644
--- a/news/gnus-emacs20/pkg-plist
+++ b/news/gnus-emacs20/pkg-plist
@@ -207,36 +207,6 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/gnus/uudecode.el
 %%EMACS_VERSION_SITE_LISPDIR%%/gnus/uudecode.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/gnus/webmail.el
-@unexec install-info --delete %D/%%INFODIR%%/emacs-mime.info %D/%%INFODIR%%/dir
-@unexec test -f %D/%%INFODIR%%/emacs-mime && install-info %D/%%INFODIR%%/emacs-mime %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/gnus.info %D/%%INFODIR%%/dir
-@unexec test -f %D/%%INFODIR%%/gnus && install-info %D/%%INFODIR%%/gnus %D/%%INFODIR%%/dir
-@unexec install-info --delete %D/%%INFODIR%%/message.info %D/%%INFODIR%%/dir
-@unexec test -f %D/%%INFODIR%%/message && install-info %D/%%INFODIR%%/message %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-mime.info
-%%INFODIR%%/gnus-1.info
-%%INFODIR%%/gnus-10.info
-%%INFODIR%%/gnus-11.info
-%%INFODIR%%/gnus-12.info
-%%INFODIR%%/gnus-13.info
-%%INFODIR%%/gnus-14.info
-%%INFODIR%%/gnus-15.info
-%%INFODIR%%/gnus-16.info
-%%INFODIR%%/gnus-17.info
-%%INFODIR%%/gnus-18.info
-%%INFODIR%%/gnus-2.info
-%%INFODIR%%/gnus-3.info
-%%INFODIR%%/gnus-4.info
-%%INFODIR%%/gnus-5.info
-%%INFODIR%%/gnus-6.info
-%%INFODIR%%/gnus-7.info
-%%INFODIR%%/gnus-8.info
-%%INFODIR%%/gnus-9.info
-%%INFODIR%%/gnus.info
-%%INFODIR%%/message.info
-@exec install-info %D/%%INFODIR%%/emacs-mime.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/gnus.info %D/%%INFODIR%%/dir
-@exec install-info %D/%%INFODIR%%/message.info %D/%%INFODIR%%/dir
 share/doc/gnus-%%EMACS_PORT_NAME%%/ChangeLog
 share/doc/gnus-%%EMACS_PORT_NAME%%/GNUS-NEWS
 share/doc/gnus-%%EMACS_PORT_NAME%%/README
diff --git a/print/preview-latex/Makefile b/print/preview-latex/Makefile
index d72a5c8c7522..7cf5436e630e 100644
--- a/print/preview-latex/Makefile
+++ b/print/preview-latex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	preview-latex
 PORTVERSION=	0.7.8
+PORTREVISION=	1
 CATEGORIES=	print elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -23,6 +24,8 @@ RUN_DEPENDS=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/auctex/latex.el:${PORTSDIR}/prin
 
 EMACS_PORT_NAME?=	emacs21
 
+INFO=		preview-latex
+
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 		--with-lispdir=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/preview \
diff --git a/print/preview-latex/pkg-plist b/print/preview-latex/pkg-plist
index 7727341165de..0a5604971cb4 100644
--- a/print/preview-latex/pkg-plist
+++ b/print/preview-latex/pkg-plist
@@ -25,12 +25,6 @@ share/texmf/doc/latex/styles/preview.dvi
 %%EMACS_VERSION_SITE_LISPDIR%%/preview/prevwork.xbm
 %%EMACS_VERSION_SITE_LISPDIR%%/preview/prevwork.xpm
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/preview
-@unexec install-info --delete %D/info/preview-latex.info %D/info/dir
-info/preview-latex.info
-info/preview-latex.info-1
-info/preview-latex.info-2
-info/preview-latex.info-3
-@exec install-info %D/info/preview-latex.info %D/info/dir
 %%PORTDOCS%%share/doc/preview-latex/ChangeLog
 %%PORTDOCS%%share/doc/preview-latex/INSTALL
 %%PORTDOCS%%share/doc/preview-latex/PROBLEMS