upgrade to 4.40

5 files changed, 24 insertions, 140 deletions

diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index dfd705b42caf..a1e99e4b5d50 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	exim
-PORTVERSION=	4.30
+PORTVERSION=	4.40
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_EXIM}
 MASTER_SITE_SUBDIR=	exim4
@@ -18,16 +18,26 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Documentation for the Exim MTA in multiple formats
 
 USE_BZIP2=	yes
-PLIST=		${PKGDIR}/pkg-plist_${DOCFORMAT}
 
 DOCFORMAT?=	html
 DISTDOCFORMAT?=	${DOCFORMAT}
-.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf" && ${DOCFORMAT} != "postscript" && ${DOCFORMAT} != "info"
-.BEGIN:
+
+.if !defined(NOPORTDOCS)
+.if ${DOCFORMAT} == "html"
+PORTDOCS=	html
+.elif ${DOCFORMAT} == "pdf"
+PORTDOCS=	*.pdf
+.elif ${DOCFORMAT} == "postscript"
+PORTDOCS=	*.ps
+.elif ${DOCFORMAT} == "info"
+PLIST=		${PKGDIR}/pkg-plist_${DOCFORMAT}
+.else
+pre-everything::
 	@ ${ECHO} 'ERROR: invalid value for DOCFORMAT: "${DOCFORMAT}"'
 	@ ${ECHO} 'Possible values are "html", "pdf", "postscript" and "info".'
 	@ ${FALSE}
 .endif
+.endif
 
 do-build:
 .if ${DOCFORMAT} == "info"
@@ -58,6 +68,8 @@ do-install:
 	@ install-info --section="Exim" \
 		--entry "* Filtering: (exim_filter).     Filtering mail with Exim" \
 		${PREFIX}/info/exim_filter.info ${PREFIX}/info/dir
+.else
+	@${FALSE}
 .endif
 .endif
 
diff --git a/mail/exim-doc-html/distinfo b/mail/exim-doc-html/distinfo
index 0843448f0984..64dad9463464 100644
--- a/mail/exim-doc-html/distinfo
+++ b/mail/exim-doc-html/distinfo
@@ -1,8 +1,8 @@
-MD5 (exim/exim-html-4.30.tar.bz2) = 6a58c6d9d20ece7ca8264663ad8db322
-SIZE (exim/exim-html-4.30.tar.bz2) = 518372
-MD5 (exim/exim-texinfo-4.30.tar.bz2) = dceb3ce755543ababd7362437a3c1141
-SIZE (exim/exim-texinfo-4.30.tar.bz2) = 300231
-MD5 (exim/exim-pdf-4.30.tar.bz2) = 07dbe1be819f3faa4998e9650876f751
-SIZE (exim/exim-pdf-4.30.tar.bz2) = 1171950
-MD5 (exim/exim-postscript-4.30.tar.bz2) = abeb1aaf957ab71b2c270289791264c2
-SIZE (exim/exim-postscript-4.30.tar.bz2) = 439377
+MD5 (exim/exim-html-4.40.tar.bz2) = 3e87a3e368a4570785480a1821728ef0
+SIZE (exim/exim-html-4.40.tar.bz2) = 542983
+MD5 (exim/exim-texinfo-4.40.tar.bz2) = cc91bd804ee0f7fd70991e2e6b529033
+SIZE (exim/exim-texinfo-4.40.tar.bz2) = 311481
+MD5 (exim/exim-pdf-4.40.tar.bz2) = 1e00b6a4b4cd52c7cac1f892d94c1a76
+SIZE (exim/exim-pdf-4.40.tar.bz2) = 1189696
+MD5 (exim/exim-postscript-4.40.tar.bz2) = e376d8fd805c76bf7117caa16e8692c3
+SIZE (exim/exim-postscript-4.40.tar.bz2) = 454533
diff --git a/mail/exim-doc-html/pkg-plist_html b/mail/exim-doc-html/pkg-plist_html
deleted file mode 100644
index 79174ab19026..000000000000
--- a/mail/exim-doc-html/pkg-plist_html
+++ /dev/null
@@ -1,122 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_A.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_B.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_C.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_D.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_E.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_F.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_G.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_H.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_I.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_K.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_L.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_M.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_N.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_O.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_P.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_Q.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_R.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_S.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_T.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_U.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_V.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_W.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_X.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_Y.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ-KWIC_Z.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_0.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_10.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_12.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_13.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_14.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_15.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_16.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_17.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_18.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_19.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_20.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_21.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_22.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_23.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_24.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_25.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_26.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_27.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_28.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_7.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/FAQ_9.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filter_0.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filter_1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filter_2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filter_3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filter_toc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcrepattern.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pcretest.html
-%%PORTDOCS%%%%DOCSDIR%%/html/relaying.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/routing.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/spec.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_10.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_12.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_13.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_14.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_15.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_16.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_17.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_18.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_19.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_20.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_21.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_22.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_23.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_24.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_25.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_26.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_27.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_28.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_29.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_30.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_31.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_32.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_33.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_34.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_35.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_36.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_37.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_38.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_39.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_40.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_41.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_42.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_43.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_44.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_45.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_46.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_47.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_48.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_49.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_50.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_7.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_9.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_cindex.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_oindex.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spec_toc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/spectop.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
diff --git a/mail/exim-doc-html/pkg-plist_pdf b/mail/exim-doc-html/pkg-plist_pdf
deleted file mode 100644
index 4817d9abf819..000000000000
--- a/mail/exim-doc-html/pkg-plist_pdf
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/filter.pdf
-%%PORTDOCS%%%%DOCSDIR%%/spec.pdf
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
diff --git a/mail/exim-doc-html/pkg-plist_postscript b/mail/exim-doc-html/pkg-plist_postscript
deleted file mode 100644
index 2a2bec14f146..000000000000
--- a/mail/exim-doc-html/pkg-plist_postscript
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/filter.ps
-%%PORTDOCS%%%%DOCSDIR%%/spec.ps
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true