7 files changed, 55 insertions, 31 deletions

diff --git a/mail/Makefile b/mail/Makefile
index bc190f15cb59..1f603bb4e45a 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -59,6 +59,7 @@
     SUBDIR += exact
     SUBDIR += exim
     SUBDIR += exim-doc-html
+    SUBDIR += exim-doc-info
     SUBDIR += exim-doc-pdf
     SUBDIR += exim-doc-postscript
     SUBDIR += exim-ldap
diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index dee58a18f0e2..d65a791afe98 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -5,32 +5,38 @@
 # $FreeBSD$
 #
 
-PORTNAME=	exim-doc-${DOCFORMAT}
+PORTNAME=	exim
 PORTVERSION=	4.20
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_EXIM}
 MASTER_SITE_SUBDIR=	exim4
-DISTNAME=	exim-${DOCFORMAT}-${PORTVERSION}
+PKGNAMESUFFIX=	-doc-${DOCFORMAT}
+DISTNAME=	exim-${DISTDOCFORMAT}-${PORTVERSION}
 DIST_SUBDIR=	exim
 
 MAINTAINER=	sheldonh@FreeBSD.org
 COMMENT=	Documentation for the Exim MTA in multiple formats
 
 USE_BZIP2=	yes
-NO_BUILD=	yes
-DOCSDIR=	${PREFIX}/share/doc/exim
-PLIST=		${WRKDIR}/pkg-plist
+PLIST=		${PKGDIR}/pkg-plist_${DOCFORMAT}
 
 DOCFORMAT?=	html
-.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf" && ${DOCFORMAT} != "postscript"
+DISTDOCFORMAT?=	${DOCFORMAT}
+.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf" && ${DOCFORMAT} != "postscript" && ${DOCFORMAT} != "info"
 .BEGIN:
 	@ ${ECHO} 'ERROR: invalid value for DOCFORMAT: "${DOCFORMAT}"'
-	@ ${ECHO} 'Possible values are "html", "pdf" and "postscript".'
+	@ ${ECHO} 'Possible values are "html", "pdf", "postscript" and "info".'
 	@ ${FALSE}
 .endif
 
-pre-install:
-	@ ${CP} ${PKGDIR}/pkg-plist_${DOCFORMAT} ${PLIST}
+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)
@@ -43,6 +49,15 @@ do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${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
 .endif
 .endif
 
diff --git a/mail/exim-doc-html/distinfo b/mail/exim-doc-html/distinfo
index 4de852152ee3..83fcdccadf7d 100644
--- a/mail/exim-doc-html/distinfo
+++ b/mail/exim-doc-html/distinfo
@@ -1,3 +1,4 @@
 MD5 (exim/exim-html-4.20.tar.bz2) = 75541910675660bf3203bc16080f4365
 MD5 (exim/exim-pdf-4.20.tar.bz2) = f17a521b58372a016ada5745fa64cc8f
 MD5 (exim/exim-postscript-4.20.tar.bz2) = fb00d8ceae45779f4524f6f84f7f64ea
+MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d
diff --git a/mail/exim-doc-html/pkg-plist_info b/mail/exim-doc-html/pkg-plist_info
new file mode 100644
index 000000000000..3cd0dec3f91d
--- /dev/null
+++ b/mail/exim-doc-html/pkg-plist_info
@@ -0,0 +1,6 @@
+%%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
new file mode 100644
index 000000000000..816dc4019753
--- /dev/null
+++ b/mail/exim-doc-info/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	exim-doc-info
+# Date created:				30 Aug 2003
+# Whom:					Oliver Eikemeier <eikemeier@fillmore-labs.com>
+#
+# $FreeBSD$
+#
+
+DOCFORMAT=	info
+DISTDOCFORMAT=	texinfo
+MASTERDIR=	${.CURDIR}/../exim-doc-html
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 8ffd621aab16..e6230d4c9e1a 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	exim
-PORTVERSION=	${EXIM_VERSION}
-PORTREVISION=	1
+PORTVERSION=	4.22
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_EXIM}
 MASTER_SITE_SUBDIR=	exim4
-DISTFILES=	exim-${EXIM_VERSION}${EXTRACT_SUFX} \
-		exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	exim
 
 .if !defined(WITHOUT_EXISCAN)
 PATCH_SITES=	http://duncanthrax.net/%SUBDIR%/
 PATCH_SITE_SUBDIR=	exiscan-acl
 PATCHFILES=	exiscan-acl-${EXISCAN_ACL_VERSION}.patch.bz2
+PATCH_DIST_STRIP=	-p1
 .endif
 
 MAINTAINER=	sheldonh@FreeBSD.org
@@ -29,20 +28,15 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 USE_BZIP2=	yes
 USE_PERL5=	yes
 MAN8=		exim.8
-INFO=		exim exim_filter
 
-EXIM_VERSION=		4.22
-EXIM_DOCVERSION=	4.20
-EXISCAN_ACL_VERSION=	${EXIM_VERSION}-10
+EXISCAN_ACL_VERSION=	${PORTVERSION}-11
 
-PLIST_SUB+=	EXIM_VERSION="${EXIM_VERSION}"
+PLIST_SUB+=	EXIM_VERSION="${PORTVERSION}"
 
 .if defined(NOPORTDOCS)
 PKGMESSAGE=	${WRKDIR}/POST-INSTALL-NOTES
 .endif
 
-PATCH_DIST_STRIP=	-p1
-
 MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH} LOCALBASE=${LOCALBASE}
 
 POSTGRESQL_PORT?=	databases/postgresql7
@@ -244,7 +238,7 @@ SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
 
 .if defined(WITH_SASLAUTHD)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
-SEDLIST+=     -e 's,^\# CYRUS_SASLAUTHD_SOCKET=,CYRUS_SASLAUTHD_SOCKET=,'
+SEDLIST+=	-e 's,^\# CYRUS_SASLAUTHD_SOCKET=,CYRUS_SASLAUTHD_SOCKET=,'
 .endif
 
 .if defined(WITH_PWCHECK)
@@ -343,10 +337,6 @@ post-patch:
 do-configure:
 	${MKDIR} ${WRKSRC}/Local
 	${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile
-	cd ${WRKSRC}/doc && \
-	for i in ../../exim-texinfo-${EXIM_DOCVERSION}/doc/* ; do \
-		${LN} -sf $$i ; \
-	done
 
 pre-install:
 	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@@ -359,11 +349,11 @@ post-install:
 .if !defined(WITHOUT_EXISCAN)
 	${INSTALL_DATA} ${FILESDIR}/POST-INSTALL-NOTES.clamd ${DOCSDIR}
 .endif
-.for file in ${PORTDOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.for docfile in ${PORTDOC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DOCSDIR}
 .endfor
-.for file in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/doc/${file} ${MAN8PREFIX}/man/man8
+.for manfile in ${MAN8}
+	${INSTALL_MAN} ${WRKSRC}/doc/${manfile} ${MAN8PREFIX}/man/man8
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 2708870419b8..60814094f693 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,3 +1,2 @@
 MD5 (exim/exim-4.22.tar.bz2) = 938ae799c08ed1899dd27fd50d48f4e5
-MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d
-MD5 (exim/exiscan-acl-4.22-10.patch.bz2) = 239fb3db3eeb5da7c816ce2765b5db2a
+MD5 (exim/exiscan-acl-4.22-11.patch.bz2) = 44cea47c192b6f5825023d83b9e1d47b