6 files changed, 37 insertions, 61 deletions

diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index 00a41c966bc2..0e0d651873a3 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -2,32 +2,39 @@
 # $FreeBSD$
 
 PORTNAME=	exim
-PORTVERSION=	4.71
+PORTVERSION=	4.82.1
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/} \
-		${MASTER_SITE_LOCAL:S/$/:local/} \
-		http://dryice.name/computer/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR=	exim4/:exim dryice/:local
+MASTER_SITES=	${MASTER_SITE_EXIM:S/$/:exim/}
+MASTER_SITE_SUBDIR=	exim4/:exim
 PKGNAMESUFFIX=	-doc-${DOCFORMAT}
 DISTNAME=	exim-${DISTDOCFORMAT}-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.bz2:exim,local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:exim
 DIST_SUBDIR=	exim
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Documentation for the Exim MTA in multiple formats
 
-USES=		makeinfo tar:bzip2
-NO_STAGE=	yes
+USES=		tar:bzip2
 
 DOCFORMAT?=	html
 DISTDOCFORMAT?=	${DOCFORMAT}
+AVAILABLE_FORMATS=	html \
+					pdf \
+					postscript
+NO_BUILD=	yes
 
-.if ${DOCFORMAT} == "info"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
-MAKEINFO=	${LOCALBASE}/bin/makeinfo
+.if make(makesum) && !defined(FETCH_ALL)
+.error "You forgot to define FETCH_ALL to create the sane distinfo"
+.endif
+
+.if defined(FETCH_ALL)
+. for _df in ${AVAILABLE_FORMATS}
+.  if ${_df} != ${DOCFORMAT}
+DISTFILES+=	exim-${_df}-${PORTVERSION}${EXTRACT_SUFX}:exim
+.  endif
+. endfor
 .endif
 
-.if !defined(NOPORTDOCS)
 .if ${DOCFORMAT} == "html"
 PORTDOCS=	html
 .elif ${DOCFORMAT} == "pdf"
@@ -35,46 +42,25 @@ PORTDOCS=	*.pdf
 .elif ${DOCFORMAT} == "postscript"
 PORTDOCS=	*.ps
 .elif ${DOCFORMAT} == "info"
-PLIST=		${PKGDIR}/pkg-plist_${DOCFORMAT}
+IGNORE=	exim no longer provides documentation in info format
 .else
 pre-everything::
 	@ ${ECHO} 'ERROR: invalid value for DOCFORMAT: "${DOCFORMAT}"'
-	@ ${ECHO} 'Possible values are "html", "pdf", "postscript" and "info".'
+	@ ${ECHO} 'Possible values are "html", "pdf", and "postscript".'
 	@ ${FALSE}
 .endif
-.endif
-
-do-build:
-.if ${DOCFORMAT} == "info"
-	@ cd ${WRKSRC}/doc; \
-		${MAKEINFO} --no-split --output exim.info spec.texinfo; \
-		${MAKEINFO} --no-split --output exim_filter.info filter.texinfo
-.else
-	@ ${DO_NADA}
-.endif
 
 do-install:
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
+	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
 .if ${DOCFORMAT} == "html"
 	${TAR} -C ${WRKSRC}/doc -cf - html | \
-		${TAR} --unlink -C ${DOCSDIR} -xf -
+		${TAR} --unlink -C ${STAGEDIR}${DOCSDIR} -xf -
 .elif ${DOCFORMAT} == "pdf"
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${STAGEDIR}${DOCSDIR}
 .elif ${DOCFORMAT} == "postscript"
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCSDIR}
-.elif ${DOCFORMAT} == "info"
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/exim.info ${PREFIX}/info
-	@ install-info --section="Exim" \
-		--entry "* User guide: (exim).           Exim manual" \
-		${PREFIX}/info/exim.info ${PREFIX}/info/dir
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/exim_filter.info ${PREFIX}/info
-	@ install-info --section="Exim" \
-		--entry "* Filtering: (exim_filter).     Filtering mail with Exim" \
-		${PREFIX}/info/exim_filter.info ${PREFIX}/info/dir
+	@ ${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${STAGEDIR}${DOCSDIR}
 .else
 	@${FALSE}
 .endif
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/exim-doc-html/distinfo b/mail/exim-doc-html/distinfo
index 066ff62843bb..80f67147bd00 100644
--- a/mail/exim-doc-html/distinfo
+++ b/mail/exim-doc-html/distinfo
@@ -1,8 +1,6 @@
-SHA256 (exim/exim-html-4.71.tar.bz2) = 55175071a651441f8baed45438fc40fc3e45681a6c700348c38af28991dedfb0
-SIZE (exim/exim-html-4.71.tar.bz2) = 796004
-SHA256 (exim/exim-texinfo-4.71.tar.bz2) = b39f051babc853f1e4a788521b71489627853bd314c34204de358e890bc315b0
-SIZE (exim/exim-texinfo-4.71.tar.bz2) = 364841
-SHA256 (exim/exim-pdf-4.71.tar.bz2) = c437d7dae147d6095bcd3316b79d74aa90e30b5a6627924a125a834761eb8158
-SIZE (exim/exim-pdf-4.71.tar.bz2) = 1661652
-SHA256 (exim/exim-postscript-4.71.tar.bz2) = 7385546a39136c3f82c2c5fa43fcef41adf6054824c327ca4019b83dab0eff0d
-SIZE (exim/exim-postscript-4.71.tar.bz2) = 897250
+SHA256 (exim/exim-html-4.82.1.tar.bz2) = 81d0237cff64b259d47c758d5c82da93bd2e7b8ce048974d53d90e597eee122e
+SIZE (exim/exim-html-4.82.1.tar.bz2) = 458569
+SHA256 (exim/exim-pdf-4.82.1.tar.bz2) = 2e3705504f22633a14d417ffcb72c6beddc2f142e38ff4f01394b83ae583ff42
+SIZE (exim/exim-pdf-4.82.1.tar.bz2) = 1835284
+SHA256 (exim/exim-postscript-4.82.1.tar.bz2) = f9c69153b1da3ef854c73ac98ec5bcef842438c5630819bc2287dec869bd039d
+SIZE (exim/exim-postscript-4.82.1.tar.bz2) = 1008574
diff --git a/mail/exim-doc-html/pkg-plist_info b/mail/exim-doc-html/pkg-plist_info
deleted file mode 100644
index f656197a4cb6..000000000000
--- a/mail/exim-doc-html/pkg-plist_info
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-%%PORTDOCS%%@unexec install-info --delete %D/info/exim.info %D/info/dir
-%%PORTDOCS%%info/exim.info
-%%PORTDOCS%%@exec install-info --section="Exim" --entry "* User guide: (exim).           Exim manual" %D/%F %B/dir
-%%PORTDOCS%%@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
-%%PORTDOCS%%info/exim_filter.info
-%%PORTDOCS%%@exec install-info --section="Exim" --entry "* Filtering: (exim_filter).     Filtering mail with Exim" %D/%F %B/dir
diff --git a/mail/exim-doc-info/Makefile b/mail/exim-doc-info/Makefile
index 4518c27e0558..0a3466f6eea4 100644
--- a/mail/exim-doc-info/Makefile
+++ b/mail/exim-doc-info/Makefile
@@ -1,8 +1,9 @@
 # Created by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
 # $FreeBSD$
 
-DOCFORMAT=	info
-DISTDOCFORMAT=	texinfo
-MASTERDIR=	${.CURDIR}/../exim-doc-html
 
-.include "${MASTERDIR}/Makefile"
+IGNORE=	exim no is no longer provided with documentation in info format
+DEPRECATED=	yes
+EXPIRATION_DATE=	2014-07-30
+
+.include <bsd.port.mk>
diff --git a/mail/exim-doc-pdf/Makefile b/mail/exim-doc-pdf/Makefile
index 16f79738113a..235acd21fc9d 100644
--- a/mail/exim-doc-pdf/Makefile
+++ b/mail/exim-doc-pdf/Makefile
@@ -4,5 +4,4 @@
 DOCFORMAT=	pdf
 MASTERDIR=	${.CURDIR}/../exim-doc-html
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/exim-doc-postscript/Makefile b/mail/exim-doc-postscript/Makefile
index b33037ecbfa3..076d30afeb35 100644
--- a/mail/exim-doc-postscript/Makefile
+++ b/mail/exim-doc-postscript/Makefile
@@ -4,5 +4,4 @@
 DOCFORMAT=	postscript
 MASTERDIR=	${.CURDIR}/../exim-doc-html
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"