- Update maildrop to 3.0.3

- Remove FAM option due tro upstream dropping support
- Add new INOTIFY option (off by default) to enable using new inotify API provided by upstreeam, adds an optional dependency on devel/libinotify
- While here sort options list

5 files changed, 92 insertions, 42 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index b464994b1549..3e81c456bd39 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -16,8 +16,7 @@
 # MAILDROP_MBOX_DIR=<dir>	Specify DEFAULT mailbox location
 
 PORTNAME=	maildrop
-PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTVERSION=	3.0.3
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -65,17 +64,19 @@ OPTIONS_MULTI=		AUTHLIB
 AUTHLIB_DESC=		Courier Auth Library support
 .endif
 
-OPTIONS_DEFINE+=	DOVECOTAUTH FAM GDBM MAILWRAPPER DOCS
+OPTIONS_DEFINE+=	DOCS DOVECOTAUTH GDBM INOTIFY MAILWRAPPER
 
 DOVECOTAUTH_DESC=	Dovecot Authentication support
+INOTIFY_DESC=		Inotify support for IDLE command
 MAILWRAPPER_DESC=	Let configure guess which sendmail binary to use
 
 OPTIONS_SUB=		yes
-GDBM_CONFIGURE_ON=	--with-db=gdbm
+DOVECOTAUTH_CONFIGURE_ENABLE=	dovecotauth
 GDBM_CONFIGURE_OFF=	--with-db=db
+GDBM_CONFIGURE_ON=	--with-db=gdbm
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
+INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 MAILWRAPPER_CONFIGURE_OFF=	--enable-sendmail=/usr/sbin/sendmail
-DOVECOTAUTH_CONFIGURE_ENABLE=	dovecotauth
 
 .include <bsd.port.options.mk>
 
@@ -96,12 +97,6 @@ PLIST_SUB+=		MMODE='' MUID='root' MGID='mail'
 CONFIGURE_ARGS+=	--with-default-maildrop='${MAILDROP_MBOX_DIR}'
 .endif
 
-.if ${PORT_OPTIONS:MFAM}
-USES+=			fam
-.else
-CONFIGURE_ARGS+=	ac_cv_header_fam_h=no ac_cv_lib_fam_FAMOpen=no
-.endif
-
 .if defined(MAILDROP_TRUSTED_USERS)
 CONFIGURE_ARGS+=	--enable-trusted-users="${MAILDROP_TRUSTED_USERS}"
 .endif
@@ -127,6 +122,14 @@ CONFIGURE_ARGS+=	--enable-authlib
 CONFIGURE_ARGS+=	--disable-authlib
 .endif
 
+post-patch-INOTIFY-on:
+	@${REINPLACE_CMD} -e 's|LIBS = @LIBS@|& ${LOCALBASE}/lib/libinotify.a /usr/lib/libpthread.a|' \
+		${WRKSRC}/libs/maildir/Makefile.in
+
+post-configure-INOTIFY-on:
+	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT 1' >>${WRKSRC}/libs/maildir/config.h
+	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT1 1' >>${WRKSRC}/libs/maildir/config.h
+
 post-install:
 .if ${PORT_OPTIONS:MDOVECOTAUTH}
 	${INSTALL_DATA} ${WRKSRC}/README.dovecotauth ${STAGEDIR}${DOCSDIR}
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 26dac82a6a89..69553b621953 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612945179
-SHA256 (maildrop-3.0.2.tar.bz2) = 0b53d93da9851e520d218dce07c94c79754893a2f80de1036eebaa85cb2bd597
-SIZE (maildrop-3.0.2.tar.bz2) = 2129406
+TIMESTAMP = 1616238637
+SHA256 (maildrop-3.0.3.tar.bz2) = 09dc17ec706d5d2a5bde9f67b37b8f5bf9a5b6a6d9ac1ca3bd0698c3f29bfc3d
+SIZE (maildrop-3.0.3.tar.bz2) = 2129162
diff --git a/mail/maildrop/files/patch-Makefile.in b/mail/maildrop/files/patch-Makefile.in
index 61e8f2c95723..48dca9317c59 100644
--- a/mail/maildrop/files/patch-Makefile.in
+++ b/mail/maildrop/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2015-04-25 13:56:37 UTC
+--- Makefile.in.orig	2021-03-14 16:53:58 UTC
 +++ Makefile.in
-@@ -83,10 +83,10 @@ PRE_UNINSTALL = :
+@@ -93,10 +93,10 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -8,14 +8,14 @@
 -@HAVE_DBLIBRARY_TRUE@am__append_2 = makedat.1
 -@HAVE_DBLIBRARY_FALSE@am__append_3 = makedat.html
 -@HAVE_DBLIBRARY_FALSE@am__append_4 = makedat.1
-+@HAVE_DBLIBRARY_TRUE@am__append_1 = 
-+@HAVE_DBLIBRARY_TRUE@am__append_2 = 
-+@HAVE_DBLIBRARY_FALSE@am__append_3 = 
-+@HAVE_DBLIBRARY_FALSE@am__append_4 = 
++@HAVE_DBLIBRARY_TRUE@am__append_1 =
++@HAVE_DBLIBRARY_TRUE@am__append_2 =
++@HAVE_DBLIBRARY_FALSE@am__append_3 =
++@HAVE_DBLIBRARY_FALSE@am__append_4 =
  subdir = .
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(top_srcdir)/configure $(am__configure_deps) \
-@@ -376,7 +376,7 @@ host_alias = @host_alias@
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+@@ -392,7 +392,7 @@ host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -24,7 +24,7 @@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
-@@ -412,15 +412,15 @@ EXTRA_DIST = README.html INSTALL.html UP
+@@ -428,16 +428,16 @@ EXTRA_DIST = README.html INSTALL.html UPGRADE.html REA
  	maildroptips.txt COPYING.GPL manpage.css $(HTMLWWW)
  
  scriptdir = $(pkgdatadir)/scripts
@@ -32,19 +32,22 @@
 +DELIVERQUOTAHTMLSOURCE = maildirquota.html maildrop-deliverquota.html
  DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
 -DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
+-MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \
+-	maildirwatch.html maildirmake.html maildropex.html \
 +DELIVERQUOTAMAN = maildirquota.7 maildrop-deliverquota.8
- MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \
--	maildirmake.html maildropex.html maildir.html \
-+	maildrop-maildirmake.html maildropex.html \
- 	maildropfilter.html maildropgdbm.html maildrop.html \
- 	mailbot.html makemime.html reformail.html reformime.html \
- 	$(am__append_1)
++MAILDROPHTML = lockmail.html maildiracl.html maildrop-maildirkw.html \
++	maildirwatch.html maildrop-maildirmake.html maildropex.html \
+ 	maildir.html maildropfilter.html maildropgdbm.html \
+ 	maildrop.html mailbot.html makemime.html reformail.html \
+ 	reformime.html $(am__append_1)
 -MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 \
+-	maildropex.7 maildirkw.1 maildirwatch.1 maildir.5 \
 +MAILDROPMAN = lockmail.1 maildrop-maildirmake.1 maildrop.1 mailbot.1 \
- 	maildropex.7 maildir.5 maildropfilter.7 maildropgdbm.7 \
- 	makemime.1 reformail.1 reformime.1 $(am__append_2)
++	maildropex.7 maildrop-maildirkw.1 maildirwatch.1 maildir.5 \
+ 	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 \
+ 	reformime.1 $(am__append_2)
  EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
-@@ -1265,21 +1265,21 @@ uninstall-man: uninstall-man1 uninstall-
+@@ -1292,21 +1292,21 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall
  
  install-deliverquota:
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -72,12 +75,15 @@
  
  #  In maildrop 0.74, maildirmake was installed as bindir/maildrop.maildirmake
  #  and a soft link was created from maildirmake to maildrop.maildirmake
-@@ -1297,18 +1297,18 @@ install-maildrop:
+@@ -1324,20 +1324,20 @@ install-maildrop:
  		$(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	$(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
 -	$(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
+-	$(INSTALL_PROGRAM) libs/maildir/maildirkw $(DESTDIR)$(bindir)/maildirkw
 +	$(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildrop-maildirmake
++	$(INSTALL_PROGRAM) libs/maildir/maildirkw $(DESTDIR)$(bindir)/maildrop-maildirkw
+ 	$(INSTALL_PROGRAM) libs/maildir/maildirwatch $(DESTDIR)$(bindir)/maildirwatch
  	$(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
  	$(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
 -	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
@@ -92,14 +98,22 @@
  	. libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
  
  uninstall-maildrop:
--	for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \
-+	for f in maildrop mailbot maildir-maildirmake reformail lockmail makemime reformime; do \
+-	for f in maildrop mailbot maildirmake reformail lockmail makemime reformime maildirkw maildirwatch; do \
++	for f in maildrop mailbot maildrop-maildirmake reformail lockmail makemime reformime maildrop-maildirkw maildirwatch; do \
  		rm -f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-@@ -1362,11 +1362,11 @@ maildiracl.html: libs/maildir/maildiracl
- maildirkw.html: libs/maildir/maildirkw.html
- 	cp -f $(srcdir)/libs/maildir/maildirkw.html maildirkw.html
+@@ -1388,20 +1388,20 @@ maildir.5: libs/maildir/maildir.5
+ maildiracl.html: libs/maildir/maildiracl.html
+ 	cp -f libs/maildir/maildiracl.html maildiracl.html
+ 
+-maildirkw.html: libs/maildir/maildirkw.html
+-	cp -f $(srcdir)/libs/maildir/maildirkw.html maildirkw.html
++maildrop-maildirkw.html: libs/maildir/maildirkw.html
++	cp -f $(srcdir)/libs/maildir/maildirkw.html maildrop-maildirkw.html
+ 
+ maildirwatch.html: libs/maildir/maildirwatch.html
+ 	cp -f $(srcdir)/libs/maildir/maildirwatch.html maildirwatch.html
  
 -maildirmake.html: libs/maildir/maildirmake.html
 -	cp -f libs/maildir/maildirmake.html maildirmake.html
@@ -111,5 +125,10 @@
 +maildrop-maildirmake.1: libs/maildir/maildirmake.1
 +	cp -f libs/maildir/maildirmake.1 maildrop-maildirmake.1
  
- maildropex.html: libs/maildrop/maildropex.html
- 	cp -f $(srcdir)/libs/maildrop/maildropex.html maildropex.html
+-maildirkw.1: libs/maildir/maildirkw.1
+-	cp -f $(srcdir)/libs/maildir/maildirkw.1 .
++maildrop-maildirkw.1: libs/maildir/maildirkw.1
++	cp -f $(srcdir)/libs/maildir/maildirkw.1 maildrop-maildirkw.1
+ 
+ maildirwatch.1: libs/maildir/maildirwatch.1
+ 	cp -f $(srcdir)/libs/maildir/maildirwatch.1 .
diff --git a/mail/maildrop/files/patch-libs_maildir_configure b/mail/maildrop/files/patch-libs_maildir_configure
new file mode 100644
index 000000000000..b46576da9afc
--- /dev/null
+++ b/mail/maildrop/files/patch-libs_maildir_configure
@@ -0,0 +1,22 @@
+--- libs/maildir/configure.orig	2021-03-14 16:54:15 UTC
++++ libs/maildir/configure
+@@ -17924,19 +17924,6 @@ fi
+ done
+ 
+ 
+-for ac_func in inotify_init inotify_init1
+-do :
+-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for missing gethostname prototype" >&5
+ $as_echo_n "checking for missing gethostname prototype... " >&6; }
+ if ${maildir_cv_SYS_GETHOSTNAME+:} false; then :
diff --git a/mail/maildrop/pkg-plist b/mail/maildrop/pkg-plist
index 4ecc11cc3178..3abdae1a25ac 100644
--- a/mail/maildrop/pkg-plist
+++ b/mail/maildrop/pkg-plist
@@ -2,7 +2,9 @@
 @group %%MGID%%
 @mode %%MMODE%%
 bin/lockmail
+bin/maildirwatch
 bin/maildrop
+bin/maildrop-maildirkw
 @owner
 @group
 @mode
@@ -15,6 +17,8 @@ bin/reformime
 etc/quotawarnmsg.sample
 man/man1/lockmail.1.gz
 man/man1/mailbot.1.gz
+man/man1/maildrop-maildirkw.1.gz
+man/man1/maildirwatch.1.gz
 man/man1/maildrop-maildirmake.1.gz
 man/man1/maildrop.1.gz
 man/man1/makemime.1.gz
@@ -44,8 +48,10 @@ man/man8/maildrop-deliverquota.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/maildrop-deliverquota.html
 %%PORTDOCS%%%%DOCSDIR%%/lockmail.html
 %%PORTDOCS%%%%DOCSDIR%%/mailbot.html
+%%PORTDOCS%%%%DOCSDIR%%/maildir.html
 %%PORTDOCS%%%%DOCSDIR%%/maildiracl.html
-%%PORTDOCS%%%%DOCSDIR%%/maildirkw.html
+%%PORTDOCS%%%%DOCSDIR%%/maildrop-maildirkw.html
+%%PORTDOCS%%%%DOCSDIR%%/maildirwatch.html
 %%PORTDOCS%%%%DOCSDIR%%/maildrop-maildirmake.html
 %%PORTDOCS%%%%DOCSDIR%%/maildirquota.html
 %%PORTDOCS%%%%DOCSDIR%%/maildrop.html