- update to 1.5.2

- document port options at the top of the Makefile
- install documentation

PR:		49974
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

3 files changed, 60 insertions, 26 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>
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index e0b840e91eed..863f084a6054 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1 +1 @@
-MD5 (maildrop-1.5.0.tar.bz2) = 2362ece1de4f14a77ae3014fef319f7f
+MD5 (maildrop-1.5.2.tar.bz2) = 45ce438482780861ec43ce3af55b99cd
diff --git a/mail/maildrop/pkg-plist b/mail/maildrop/pkg-plist
index 90cbe02a8ca2..82f434f0f5e9 100644
--- a/mail/maildrop/pkg-plist
+++ b/mail/maildrop/pkg-plist
@@ -1,3 +1,4 @@
+%%MAILDIRQUOTA%%bin/deliverquota
 bin/lockmail
 bin/mailbot
 bin/maildirmake
@@ -5,14 +6,31 @@ bin/maildrop
 bin/makemime
 bin/reformail
 bin/reformime
+%%PORTDOCS%%share/doc/maildrop/INSTALL
+%%PORTDOCS%%share/doc/maildrop/INSTALL.html
+%%PORTDOCS%%share/doc/maildrop/README
+%%PORTDOCS%%share/doc/maildrop/README.html
+%%PORTDOCS%%share/doc/maildrop/README.maildirfilter.html
+%%PORTDOCS%%share/doc/maildrop/README.maildirquota.html
+%%PORTDOCS%%share/doc/maildrop/README.maildirquota.txt
+%%PORTDOCS%%share/doc/maildrop/README.postfix
+%%PORTDOCS%%share/doc/maildrop/README.sharedfolders.html
+%%PORTDOCS%%share/doc/maildrop/README.sharedfolders.txt
+%%PORTDOCS%%share/doc/maildrop/UPGRADE
+%%PORTDOCS%%share/doc/maildrop/UPGRADE.html
+%%MAILDIRQUOTA%%%%PORTDOCS%%share/doc/maildrop/deliverquota.html
 %%PORTDOCS%%share/doc/maildrop/lockmail.html
 %%PORTDOCS%%share/doc/maildrop/mailbot.html
+%%PORTDOCS%%share/doc/maildrop/maildir.html
 %%PORTDOCS%%share/doc/maildrop/maildirmake.html
+%%MAILDIRQUOTA%%%%PORTDOCS%%share/doc/maildrop/maildirquota.html
 %%PORTDOCS%%share/doc/maildrop/maildrop.html
 %%PORTDOCS%%share/doc/maildrop/maildropex.html
 %%PORTDOCS%%share/doc/maildrop/maildropfilter.html
 %%PORTDOCS%%share/doc/maildrop/maildropgdbm.html
+%%PORTDOCS%%share/doc/maildrop/maildroptips.txt
 %%PORTDOCS%%share/doc/maildrop/makemime.html
+%%PORTDOCS%%share/doc/maildrop/manpage.css
 %%PORTDOCS%%share/doc/maildrop/reformail.html
 %%PORTDOCS%%share/doc/maildrop/reformime.html
 %%PORTDOCS%%share/doc/maildrop/rfc2045.html