1 files changed, 41 insertions, 25 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 191ce4f8fa95..96b0efa97277 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -5,8 +5,20 @@
 # $FreeBSD$
 #
 
+# The following compile-time options are available:
+# WITHOUT_GDBM=yes	Disable building maildrop gdbm extensions.
+#			(default: enabled)
+# WITH_MAILDIRQUOTA=yes Enable optional support for maildir quotas
+#			(default: disabled)
+# MAILDROP_SUID=<uid>,
+# MAILDROP_SGID=<gid>	Maildrop will be installed with suid permissions for
+#			MAILDROP_SUID, and sgid permissions for MAILDROP_SGID.
+#			If undefined, these values default to "root" and "mail"
+#			respectively, which should be suitable for most
+#			systems.
+
 PORTNAME=	maildrop
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -14,51 +26,55 @@ MASTER_SITE_SUBDIR=	courier
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Replacement local mail delivery agent, similar to procmail
 
-# Maildrop is usually installed with gdbm extensions. If you do not
-# want these extensions installed, define WITHOUT_GDBM.
-#
 .if !defined(WITHOUT_GDBM)
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
+.else
+CONFIGURE_ARGS+=	--without-db
 .endif
 
-INSTALL_TARGET=	install-strip
-
-# Maildrop will be installed with suid permissions for MAILDROP_SUID,
-# and sgid permissions for MAILDROP_SGID. If undefined, these values
-# default to "root" and "mail" respectively, which should be suitable
-# for most systems.
-#
-MAILDROP_SUID?=	root
-MAILDROP_SGID?=	mail
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_PERL5_BUILD=yes
+USE_PERL5_RUN=	yes
 
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--enable-syslog=1 \
 		--enable-use-flock \
 		--with-etcdir="${PREFIX}/etc" \
 		--enable-maildrop-uid="${MAILDROP_SUID}" \
 		--enable-maildrop-gid="${MAILDROP_SGID}"
-.if defined(MAILDROPDEFAULT)
-CONFIGURE_ARGS+=	--with-default-maildrop=${MAILDROPDEFAULT}
+
+.if defined(WITH_MAILDIRQUOTA)
+CONFIGURE_ARGS+=	--enable-maildirquota
+PLIST_SUB+=	MAILDIRQUOTA=""
+.else
+PLIST_SUB+=	MAILDIRQUOTA="@comment "
 .endif
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib"
-GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
-USE_PERL5_RUN=	yes
 
-.if defined(NOPORTDOCS)
+MAILDROP_SUID?=	root
+MAILDROP_SGID?=	mail
+
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET=	install-strip
+.else
 # Just install the binary and man pages, no extra documentation
 INSTALL_TARGET=	install-maildrop install-man
 .endif
 
 MAN1=		lockmail.1 mailbot.1 maildirmake.1 maildrop.1 makemime.1 \
 		reformail.1 reformime.1
-MAN5=		maildropex.5 maildropfilter.5 maildropgdbm.5
+MAN5=		maildir.5 maildropex.5 maildropfilter.5 maildropgdbm.5
 MAN7=		maildirquota.7
 MAN8=		deliverquota.8
+INSTALL_DOCS=	INSTALL INSTALL.html README README.html README.postfix \
+		UPGRADE UPGRADE.html maildroptips.txt \
+		maildir/README.*.html maildir/README.*.txt
 
-.if defined(WITHOUT_GDBM)
-CONFIGURE_ARGS+=	--without-db
+.if !defined(NOPORTDOCS)
+post-install:
+	cd ${WRKSRC} && ${INSTALL_DATA} ${INSTALL_DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>