- Fix builds on NetBSD 1.6 due to Kerberos/OpenSSL 0.9.7 issues

- Included some utilities in the install that were once a part of the
  imap-uw-utils package but are now a part of this package
- ok'ed kim@

2 files changed, 24 insertions, 3 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 5f46e49e710..a6a2ddbfbb5 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2005/01/31 11:38:22 abs Exp $
+# $NetBSD: Makefile,v 1.90 2005/03/05 22:01:47 adrianp Exp $
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
 # upgrade this package you *must* test it on a system with Kerberos libraries
@@ -6,6 +6,7 @@
 
 DISTNAME=       imap-2004c1
 PKGNAME=        imap-uw-2004c1
+PKGREVISION=	1
 CATEGORIES=     mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=	.tar.Z
@@ -38,7 +39,12 @@ BUILD_TARGET=	sg6
 BUILD_TARGET=	sgi
 .  endif
 .else
+# USE_KERBEROS=no is explicitly set on NetBSD 1.x due to interoperability
+# issues with later versions of OpenSSL (e.g. 0.9.7)
 BUILD_TARGET=	neb
+.  if !empty(MACHINE_PLATFORM:MNetBSD-1.*)
+USE_KERBEROS=	no
+.  endif
 .  if defined(USE_KERBEROS) && ${USE_KERBEROS} != "no"
 PKG_USE_KERBEROS=	# defined
 BUILD_TARGET+=	EXTRAAUTHENTICATORS="gss"
@@ -175,6 +181,14 @@ do-install:
 	${FIND} ${DOC_DIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${DOC_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
 
+	${INST_PROG} ${WRKSRC}/mailutil/mailutil ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/man/man1
+	${INST_PROG} ${WRKSRC}/dmail/dmail ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${PREFIX}/man/man1
+	${INST_PROG} ${WRKSRC}/mlock/mlock ${PREFIX}/bin
+	${INST_PROG} ${WRKSRC}/tmail/tmail ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/man/man1
+
 .if !defined(IMAP_UW_NO_SSL) || ${IMAP_UW_NO_SSL} != "YES"
 .include "../../security/openssl/buildlink3.mk"
 .endif
diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST
index 891aea31860..c99646f0f7c 100644
--- a/mail/imap-uw/PLIST
+++ b/mail/imap-uw/PLIST
@@ -1,4 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 07:38:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/03/05 22:01:47 adrianp Exp $
+bin/dmail
+bin/mailutil
+bin/mlock
+bin/tmail
 include/c-client/c-client.h
 include/c-client/env.h
 include/c-client/env_unix.h
@@ -25,6 +29,9 @@ lib/libc-client_pic.a
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d
+man/man1/dmail.1
+man/man1/mailutil.1
+man/man1/tmail.1
 man/man8/imapd.8
 man/man8/ipop2d.8
 man/man8/ipop3d.8
@@ -33,8 +40,8 @@ sbin/mtest
 sbin/rimapd
 share/doc/imap-uw/BUILD
 share/doc/imap-uw/CONFIG
-share/doc/imap-uw/FAQ.txt
 share/doc/imap-uw/FAQ.html
+share/doc/imap-uw/FAQ.txt
 share/doc/imap-uw/IPv6.txt
 share/doc/imap-uw/RELNOTES
 share/doc/imap-uw/SSLBUILD