Unbreak building of bundled tools.

Install the newly bundled tools: mailutil, dmail and tmail.
Tidy.
Add WITH_SSL_AND_PLAINTEXT knob, if you want to use plaintext
passwords.

Pointy hat to:	dougb

1 files changed, 25 insertions, 47 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 532292f50ad5..ce9ef57c0c4d 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/
 PKGNAMESUFFIX=	-uw
 DISTNAME=	imap-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.Z imap-utils.tar.Z
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	anders@FreeBSD.org
 
@@ -26,82 +26,60 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+MAN1=		dmail.1 mailutil.1 tmail.1
 MAN8=		ipopd.8 imapd.8
 
 ALL_TARGET=	bsf
-.if defined(WITH_SSL)
-MAKE_ARGS+=	SSLTYPE=unix.nopwd
+.if defined(WITHOUT_SSL)
+MAKE_ARGS+=	SSLTYPE=none
+.else
 USE_OPENSSL=	yes
+.if defined(WITH_SSL_AND_PLAINTEXT)
+MAKE_ARGS+=	SSLTYPE=unix
+.else
+MAKE_ARGS+=	SSLTYPE=unix.nopwd
 .endif
-
-# RFC 1730 (IMAP4 as opposed to IMAP4rev1) support
-.if defined(WITH_RFC1730)
-MAKE_ARGS+=	RFC1730="-DRFC1730"
-FORBIDDEN=	"RFC 1730 support enables remote buffer overflow."
 .endif
+
 # Define this to get somewhat better interoperability with Netscape.
 .if defined(WITH_NETSCAPE_BRAIN_DAMAGE)
 MAKE_ARGS+=	WITH_NETSCAPE_BRAIN_DAMAGE=yes
 .endif
-# Define this to get somewhat better interoperability with Microsoft
-# Outlook and Outlook Express.
-.if defined(WITH_MICROSOFT_BRAIN_DAMAGE)
-MAKE_ARGS+=	MSBD="-DMICROSOFT_BRAIN_DAMAGE"
+# Define this to get possibly better interoperability with Microsoft Entourage.
+.if defined(WITH_ENTOURAGE_BRAIN_DAMAGE)
+MAKE_ARGS+=	WITH_ENTOURAGE_BRAIN_DAMAGE=yes
 .endif
 # See src/imapd/Makefile for more information about these three options.
 
-SOURCEDIRS_IMAPUTILS=	chkmail dmail icat ifrom imapcopy imapxfer mbxcopy \
-			mbxcreat mbxcvt tmail
-.if defined(WITH_ALL_IMAPUTILS)
-MAN1=	chkmail.1 dmail.1 icat.1 ifrom.1 imapcopy.1 imapxfer.1 mbxcopy.1 \
-	mbxcreat.1 mbxcvt.1 tmail.1
-PLIST_SUB+=	IMAPUTILS=''
-.else
-PLIST_SUB+=	IMAPUTILS='@comment '
-.endif
-
 .include <bsd.port.pre.mk>
 
 pre-extract:
 	@${SH} ${PKGREQ}.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION}
 
 pre-build:
-.if defined(WITH_SSL)
+.if !defined(WITHOUT_SSL)
 	@${SH} ${PKGREQ}.ssl ${LOCALBASE}/include/c-client/portrevision.h yes
 .else
 	@${SH} ${PKGREQ}.ssl ${LOCALBASE}/include/c-client/portrevision.h no
 .endif
 
-post-build:
-	@(cd ${WRKDIR}/mlock; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
-.if defined(WITH_ALL_IMAPUTILS)
-.for d in ${SOURCEDIRS_IMAPUTILS}
-	@${ECHO} "Building ${d}."
-	(cd ${WRKDIR}/${d}; ${CC} ${CFLAGS} -I${LOCALBASE}/include/c-client \
-	-o ${d} ${d}.c -L${LOCALBASE}/lib -lc-client4 -lssl -lcrypto)
-.endfor
-.endif
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec
+	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec/
+	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec/
+	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec/
 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g mail -m 2711 \
-		${WRKDIR}/mlock/mlock ${PREFIX}/libexec
+		${WRKSRC}/mlock/mlock ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${PREFIX}/bin/mboxtest
 	${INSTALL_MAN} \
 		${WRKSRC}/src/imapd/imapd.8c ${PREFIX}/man/man8/imapd.8
 	${INSTALL_MAN} \
 		${WRKSRC}/src/ipopd/ipopd.8c ${PREFIX}/man/man8/ipopd.8
-.if defined(WITH_ALL_IMAPUTILS)
-.for d in ${SOURCEDIRS_IMAPUTILS}
-	@${ECHO} "Installing ${d}."
-	${INSTALL_PROGRAM} ${WRKDIR}/${d}/${d} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/${d}/${d}.1 ${PREFIX}/man/man1
-.endfor
-	(cd ${PREFIX}/bin; ${LN} -s imapcopy imapmove)
-	(cd ${PREFIX}/bin; ${LN} -s mbxcopy mbxmove)
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/man/man1/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
@@ -113,7 +91,7 @@ post-install:
 	@${ECHO} "localhost"
 	@${ECHO} "================================================================================"
 .endif
-.if defined(WITH_SSL)
+.if !defined(WITHOUT_SSL)
 	@${ECHO} "To create and install a new SSL certificate for imapd and ipop3d, type \"make"
 	@${ECHO} "cert\". Or install manually in ${PREFIX}/certs."
 	@${ECHO}