diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index ffacab26557a..82b3d9d28ebf 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -1,141 +1,141 @@ # Created by: Tom Hukins # You can define the following to enable further compile time # customizations: # MAILDROP_SUID=, # MAILDROP_SGID= Maildrop will be installed with suid # permissions for MAILDROP_SUID, and sgid # permissions for MAILDROP_SGID. # NOTE: must be a valid username/groupname # at installation time, numeric uids/gids # and non existing users will cause the # installed package to miss files. # MAILDROP_TRUSTED_USERS= Specify users allowed to use the -d option # MAILDROP_LOG_COLUMNS lenght of 'File:' line in log - 8; default: 72 # MAILDROP_MBOX_DIR= Specify DEFAULT mailbox location PORTNAME= maildrop -PORTVERSION= 3.0.7 +PORTVERSION= 3.0.8 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Mail delivery agent (MDA) with filtering abilities LICENSE= GPLv3 LIB_DEPENDS= libpcre.so:devel/pcre \ libcourier-unicode.so:devel/courier-unicode \ libidn.so:dns/libidn \ libpcre2-8.so:devel/pcre2 USES= compiler:c++11-lang cpe iconv localbase:ldflags perl5 pkgconfig \ tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-syslog=1 \ --enable-use-flock=1 \ --with-etcdir="${PREFIX}/etc" \ --enable-maildirquota INSTALL_TARGET= install-strip CONFLICTS= courier-0.65* libunicode MAILDROP_LOG_COLUMNS?= 72 # lenght of 'File:' line in log FIXDOCPATH= libs/liblock/lockmail.1 libs/maildir/deliverquota.8.in \ libs/maildir/maildir.5 libs/maildir/maildiracl.1.in \ libs/maildir/maildirkw.1 libs/maildir/maildirmake.1.in \ libs/maildir/maildirquota.7 libs/maildrop/mailbot.1 \ libs/maildrop/maildrop.1.in libs/maildrop/maildropex.7 \ libs/maildrop/maildropfilter.7.in libs/maildrop/maildropgdbm.7 \ libs/maildrop/reformail.1 \ libs/rfc2045/makemime.1 libs/rfc2045/reformime.1 \ libs/rfc2045/rfc2045.3 libs/rfc822/rfc822.3 DOCS= AUTHORS INSTALL INSTALL.html README README.html README.postfix \ UPGRADE UPGRADE.html maildroptips.txt maildir/README.* .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" OPTIONS_MULTI_AUTHLIB:= ${OPTIONS_DEFINE:NDOCS} OPTIONS_DEFINE= AUTHLIB OPTIONS_MULTI= AUTHLIB AUTHLIB_DESC= Courier Auth Library support .endif 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 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 .include .if defined(MAILDROP_SUID) && defined(MAILDROP_SGID) CONFIGURE_ARGS+= --enable-maildrop-uid="${MAILDROP_SUID}" --enable-maildrop-gid="${MAILDROP_SGID}" PLIST_SUB+= MMODE='6755' MUID='${MAILDROP_SUID}' MGID='${MAILDROP_SGID}' .elif defined(MAILDROP_SUID) CONFIGURE_ARGS+= --enable-maildrop-uid="${MAILDROP_SUID}" PLIST_SUB+= MMODE='4755' MUID='${MAILDROP_SUID}' MGID='mail' .elif defined(MAILDROP_SGID) CONFIGURE_ARGS+= --enable-maildrop-gid="${MAILDROP_SGID}" PLIST_SUB+= MMODE='2755' MGID='${MAILDROP_SGID}' MUID='root' .else PLIST_SUB+= MMODE='' MUID='root' MGID='mail' .endif .if defined(MAILDROP_MBOX_DIR) CONFIGURE_ARGS+= --with-default-maildrop='${MAILDROP_MBOX_DIR}' .endif .if defined(MAILDROP_TRUSTED_USERS) CONFIGURE_ARGS+= --enable-trusted-users="${MAILDROP_TRUSTED_USERS}" .endif post-patch: @${REINPLACE_CMD} -e "s/l= 72 - szbuf.Length();/l= ${MAILDROP_LOG_COLUMNS} - szbuf.Length();/" \ ${WRKSRC}/libs/maildrop/log.C .for f in ${FIXDOCPATH} @${REINPLACE_CMD} -e "s|\\\%\[set \$$man\.base\.url\.for\.relative\.links\]|${DOCSDIR}|" \ -e "s/\(maildirmake.html\)/maildrop-\1/" \ -e "s/\(deliverquota.html\)/maildrop-\1/" ${WRKSRC}/${f} .endfor .if ${PORT_OPTIONS:MAUTHLIB} @${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -L${LOCALBASE}/lib/courier-authlib|' \ ${WRKSRC}/libs/maildrop/Makefile.in .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif BUILD_DEPENDS+= courierauthconfig:security/courier-authlib-base RUN_DEPENDS+= courierauthconfig:security/courier-authlib-base CONFIGURE_ARGS+= --enable-authlib .else 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} .endif ${INSTALL_DATA} ${WRKSRC}/libs/maildir/quotawarnmsg \ ${STAGEDIR}${PREFIX}/etc/quotawarnmsg.sample cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS:S/maildir\//libs\/&/} ${STAGEDIR}${DOCSDIR} .include diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo index f32e9012839b..c211f6d9f8e2 100644 --- a/mail/maildrop/distinfo +++ b/mail/maildrop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642454224 -SHA256 (maildrop-3.0.7.tar.bz2) = 605ce81c3939044732dae4724219534e5dbb515c80760be3611914ab5c1f7825 -SIZE (maildrop-3.0.7.tar.bz2) = 2129611 +TIMESTAMP = 1654070877 +SHA256 (maildrop-3.0.8.tar.bz2) = b8855e280b8922d18fb37b3e49375272782c8fe6b9190aa1096b97e500010cb5 +SIZE (maildrop-3.0.8.tar.bz2) = 2142001 diff --git a/mail/maildrop/files/patch-libs_maildir_configure b/mail/maildrop/files/patch-libs_maildir_configure index b46576da9afc..852c46b7cc20 100644 --- a/mail/maildrop/files/patch-libs_maildir_configure +++ b/mail/maildrop/files/patch-libs_maildir_configure @@ -1,22 +1,23 @@ ---- libs/maildir/configure.orig 2021-03-14 16:54:15 UTC +--- libs/maildir/configure.orig 2022-05-25 17:52:51 UTC +++ libs/maildir/configure -@@ -17924,19 +17924,6 @@ fi - done +@@ -18965,20 +18965,6 @@ fi + fi --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 +-ac_fn_c_check_func "$LINENO" "inotify_init" "ac_cv_func_inotify_init" +-if test "x$ac_cv_func_inotify_init" = xyes +-then : +- printf "%s\n" "#define HAVE_INOTIFY_INIT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "inotify_init1" "ac_cv_func_inotify_init1" +-if test "x$ac_cv_func_inotify_init1" = xyes +-then : +- printf "%s\n" "#define HAVE_INOTIFY_INIT1 1" >>confdefs.h - -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 : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for missing gethostname prototype" >&5 + printf %s "checking for missing gethostname prototype... " >&6; } + if test ${maildir_cv_SYS_GETHOSTNAME+y}