From feedac49cdebf8f2fc1c0bfbf4faae6c48bf14d4 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@FreeBSD.org>
Date: Fri, 15 Jun 2001 07:51:44 +0000
Subject: [PATCH] Update to 5.8.6. Fix a problem with building Kerberos 4
 (Kerberos 5 is still broken).

PR:		27941 (the Kerberos 4 build problem)
Submitted by:	Shawn Halpenny <malachai@iname.com>
Approved by:	maintainer
---
 mail/fetchmail/Makefile  | 25 +++++++++++++++++--------
 mail/fetchmail/distinfo  |  2 +-
 mail/fetchmail/pkg-plist |  2 ++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 9152a88d350e..a381d88529fd 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -10,7 +10,7 @@
 # want fetchmailconf to work, define WITH_X11
 
 PORTNAME=	fetchmail
-PORTVERSION=	5.8.5
+PORTVERSION=	5.8.6
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.tuxedo.org/~esr/fetchmail/ \
 		ftp://ftp.ccil.org/pub/esr/fetchmail/
@@ -33,6 +33,10 @@ MAKE_ENV+=	${CONFIGURE_ENV}
 MAN1=		fetchmail.1
 MLINKS=		fetchmail.1 fetchmailconf.1
 
+FDOC=		${PREFIX}/share/doc/fetchmail
+DOCS=		COPYING FAQ FEATURES NOTES README \
+		design-notes.html fetchmail-FAQ.html fetchmail-features.html
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 400014
@@ -41,13 +45,19 @@ CONFIGURE_ARGS+=--enable-inet6
 
 .if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a)
 CONFIGURE_ARGS+=--with-ssl=/usr
+DOCS+=		README.SSL
+PLIST_SUB+=	SSLDOCS="%%PORTDOCS%%"
 .elif exists(${LOCALBASE}/lib/libssl.a) && exists(${LOCALBASE}/lib/libcrypto.a)
 CONFIGURE_ARGS+=-with-includes=${LOCALBASE}/include/openssl --with-ssl=${LOCALBASE}
 CONFIGURE_ENV+=	RSAGLUE=-lRSAglue
+DOCS+=		README.SSL
+PLIST_SUB+=	SSLDOCS="%%PORTDOCS%%"
+.else
+PLIST_SUB+=	SSLDOCS="%%PORTDOCS%%@comment "
 .endif
 
 .if exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
-CONFIGURE_ARGS += --with-kerberos=/usr/include
+CONFIGURE_ARGS += --with-kerberos=/usr
 .endif
 
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
@@ -56,10 +66,12 @@ CONFIGURE_ARGS += --with-kerberos5=${KRB5_HOME}
 
 .if defined(WITH_NTLM)
 CONFIGURE_ARGS += --enable-NTLM
+DOCS+=		README.NTLM
+PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%"
+.else
+PLIST_SUB+=	NTLMDOCS="%%PORTDOCS%%@comment "
 .endif
 
-FDOC=	${PREFIX}/share/doc/fetchmail
-
 pre-patch:
 	@${CP} -f  /usr/include/md5.h ${WRKSRC}
 	@${PERL} -pi.bak -e 's|^#!/.*/python|#!${PREFIX}/bin/python|;' ${WRKSRC}/fetchmailconf
@@ -68,10 +80,7 @@ pre-patch:
 post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${FDOC}
-	cd ${WRKSRC} && ${INSTALL_DATA} \
-	   FAQ NOTES FEATURES README COPYING \
-	   fetchmail-FAQ.html fetchmail-features.html \
-	   design-notes.html ${FDOC}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${FDOC}
 .endif
 	${MV} ${PREFIX}/bin/fetchmailconf ${PREFIX}/libexec/fetchmailconf.bin
 	${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index e066236e6401..1d10c12eded5 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1 +1 @@
-MD5 (fetchmail-5.8.5.tar.gz) = 980e67fedcd02578d45fd939fe1c1643
+MD5 (fetchmail-5.8.6.tar.gz) = 576a9fd8d092706cd74d74d742c7d543
diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist
index b2ddd32f8c66..8e25357cde3f 100644
--- a/mail/fetchmail/pkg-plist
+++ b/mail/fetchmail/pkg-plist
@@ -6,6 +6,8 @@ libexec/fetchmailconf.bin
 %%PORTDOCS%%share/doc/fetchmail/FEATURES
 %%PORTDOCS%%share/doc/fetchmail/NOTES
 %%PORTDOCS%%share/doc/fetchmail/README
+%%NTLMDOCS%%share/doc/fetchmail/README.NTLM
+%%SSLDOCS%%share/doc/fetchmail/README.SSL
 %%PORTDOCS%%share/doc/fetchmail/design-notes.html
 %%PORTDOCS%%share/doc/fetchmail/fetchmail-FAQ.html
 %%PORTDOCS%%share/doc/fetchmail/fetchmail-features.html