1 files changed, 82 insertions, 15 deletions

diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index f7858e7ced7f..4245a3bcc983 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -6,38 +6,105 @@
 #
 
 PORTNAME=	smail
-PORTVERSION=	3.2.0.114
+PORTVERSION=	3.2.0.121
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/OLD/ \
-		ftp://ftp.planix.com/pub/Smail/OLD/ \
-		ftp://ftp.fu-berlin.de/unix/mail/smail/OLD/
+MASTER_SITES=	ftp://ftp.planix.com/pub/Smail/%SUBDIR%/ \
+		ftp://ftp.fu-berlin.de/unix/mail/smail/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. OLD
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program used for receiving and delivering mail
 
-CONFLICTS=	bsmtp-*
-
 BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* zmailer-2.*
-INSTALL_TARGET=	install installman
+CONFLICTS=	bsmtp-1.* courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* zmailer-2.*
 
+.if !defined(NO_INSTALL_MANPAGES)
 MAN1=		pathto.1 uuwho.1 uupath.1
 MAN5=		smailconf.5 smail.5 smaildrct.5 smailmeth.5 smailqual.5 \
-		smailrtrs.5 smailrtry.5 smailtrns.5
+		smailrtrs.5 smailrtry.5 smailtrns.5 aliases.5
 MAN8=		pathalias.8 mkdbm.8 mkline.8 mksort.8 mkaliases.8 smail.8 \
 		mkpath.8 pathmerge.8 checkerr.8 getmap.8 mkhpath.8 savelog.8 \
 		mkuuwho.8 mailq.8 sendmail.8 runq.8 rmail.8 rsmtp.8 smtpd.8 \
-		newaliases.8 smailbug.8 unfreezemail.8 bouncemail.8
+		newaliases.8 smailbug.8 unfreezemail.8 bouncemail.8 logsumm.8
+.endif
 
-post-install:
-	@${ECHO_MSG} "If you want to replace sendmail with links to smail, type"
-	@${ECHO_MSG} "the following command as \"root\":"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "      make replace"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-lident -lwrap -lpcre
+
+CYRUS_USER?=	cyrus
+CYRUS_GROUP?=	cyrus
+CYRUS_DELIVER_PATH?=	${LOCALBASE}/cyrus/bin/deliver
+
+OPTIONS=	CYRUS22 "Use mail/cyrus-imapd22 as local transport" off \
+		CYRUS23 "Use mail/cyrus-imapd23 as local transport" off \
+		REPLACE_CONF "Replace /etc/mail/mailer.conf" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_CYRUS22) && defined(WITH_CYRUS23)
+IGNORE=		WITH_CYRUS22 and WITH_CYRUS23 are mutually exclusive. Please run make options again
+.endif
+
+.if defined(WITH_CYRUS22)
+CYRUS_PORT=	${PORTSDIR}/mail/cyrus-imapd22
+.else
+CYRUS_PORT=	${PORTSDIR}/mail/cyrus-imapd23
+.endif
+
+.if defined(WITH_CYRUS22) || defined(WITH_CYRUS23)
+RUN_DEPENDS+=	cyrus/bin/deliver:${CYRUS_PORT}
+CYRUS_IMAPD=	USE_CYRUS_IMAPD
+PLIST_SUB+=	CYRUS_DELIVER=""
+.else
+PLIST_SUB+=	CYRUS_DELIVER="@comment "
+.endif
+
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
+ARCH_TYPE=64bit
+.else
+ARCH_TYPE=32bit
+.endif
+
+do-configure:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		-e 's|%%MANPREFIX%%|${MANPREFIX}|g' \
+		-e 's|%%CFLAGS%%|${CFLAGS}|g' \
+		-e 's|%%CPPFLAGS%%|${CPPFLAGS}|g' \
+		-e 's|%%LDFLAGS%%|${LDFLAGS}|g' \
+		-e 's|%%LIBS%%|${LIBS}|g' \
+		-e 's|%%ARCH_TYPE%%|${ARCH_TYPE}|g' \
+		-e 's|%%CYRUS_IMAPD%%|${CYRUS_IMAPD}|g' \
+		${FILESDIR}/freebsd5.in > ${WRKSRC}/conf/os/freebsd5
+	@${ECHO_CMD} OS_TYPE=freebsd5 > ${WRKSRC}/conf/EDITME
+	@${ECHO_CMD} STRIP=yes >> ${WRKSRC}/conf/EDITME
+	@${ECHO_CMD} CYRUS_USER="${CYRUS_USER}" >> ${WRKSRC}/conf/EDITME
+	@${ECHO_CMD} CYRUS_GROUP="${CYRUS_GROUP}" >> ${WRKSRC}/conf/EDITME
+	@${ECHO_CMD} CYRUS_DELIVER_PATH="${CYRUS_DELIVER_PATH}" >> ${WRKSRC}/conf/EDITME
+	@${LN} -sf ${WRKSRC}/conf/Make.local-BSD ${WRKSRC}/conf/Make.local
+	@${REINPLACE_CMD} -e 's|defs install|defs|g' \
+		${WRKSRC}/man/Makefile
+	@${ECHO_CMD} >> ${WRKSRC}/man/Makefile
+	@${ECHO_CMD} install: >> ${WRKSRC}/man/Makefile
+
+pre-install:
+	@${MKDIR} ${PREFIX}/etc/smail
+
+post-install:
+.if defined(WITH_REPLACE_CONF)
+	@make replace
+.endif
+
+.if defined(WITH_CYRUS22) || defined(WITH_CYRUS23)
+	@cd ${WRKSRC}/util && make install-cyrus-bins
+.endif
+
+.if !defined(NO_INSTALL_MANPAGES)
+	@cd ${WRKSRC}/man && make installman
+.endif
+
 replace:
 .if ${OSVERSION} >= 400014
 	@${ECHO_MSG} "===> Activating smail in /etc/mail/mailer.conf"