diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index fcce34d7294c..0549095c1ca5 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -1,24 +1,16 @@ # Created by: Tom Hukins # $FreeBSD$ -NO_STAGE= yes -# The following compile-time options are available: -# WITH_AUTHLIB=yes Enable optional support for Courier Auth Library -# WITH_FAM=yes Enable optional support for File Alteration Monitor -# WITH_GDBM=yes Enable database extensions using GDBM (default: off) +# 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. # MAILDROP_TRUSTED_USERS= Specify users allowed to use the -d option -# NO_MAILWRAPPER=yes If defined, let configure guess which sendmail binary -# to use # MAILDROP_LOG_COLUMNS lenght of 'File:' line in log - 8; default: 72 -# WITH_DOVECOTAUTH=yes Enable optional support for Dovecot Authentication -# extension (http://wiki.dovecot.org/maildrop/) PORTNAME= maildrop -PORTVERSION= 2.6.0 -PORTREVISION= 3 +PORTVERSION= 2.7.0 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} @@ -37,63 +29,70 @@ CONFIGURE_ARGS= --enable-syslog=1 \ --enable-use-flock=1 \ --with-etcdir="${PREFIX}/etc" \ --enable-maildirquota +INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -SHEBANG_FILES= unicode/*.pl +SHEBANG_FILES= libs/unicode/*.pl CONFLICTS= courier-0.65* -LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre +LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre MAILDROP_LOG_COLUMNS?= 72 # lenght of 'File:' line in log -FIXDOCPATH= liblock/lockmail.1 maildir/deliverquota.8.in \ - maildir/maildir.5 maildir/maildiracl.1.in \ - maildir/maildirkw.1 maildir/maildirmake.1.in \ - maildir/maildirquota.7 maildrop/mailbot.1 \ - maildrop/maildrop.1.in maildrop/maildropex.7 \ - maildrop/maildropfilter.7.in maildrop/maildropgdbm.7 \ - maildrop/makedat.1 maildrop/reformail.1 \ - rfc2045/makemime.1 rfc2045/reformime.1 \ - rfc2045/rfc2045.3 rfc822/rfc822.3 +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/makedat.1 libs/maildrop/reformail.1 \ + libs/rfc2045/makemime.1 libs/rfc2045/reformime.1 \ + libs/rfc2045/rfc2045.3 libs/rfc822/rfc822.3 -MAN1+= lockmail.1 mailbot.1 maildrop-maildirmake.1 maildrop.1 makemime.1 \ - reformail.1 reformime.1 -MAN5= maildir.5 -MAN7= maildirquota.7 maildropex.7 maildropfilter.7 maildropgdbm.7 -MAN8+= maildrop-deliverquota.8 DOCS= AUTHORS INSTALL INSTALL.html README README.html README.postfix \ UPGRADE UPGRADE.html maildroptips.txt maildir/README.* -.if defined(WITH_AUTHLIB) .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" -.endif +OPTIONS_MULTI_AUTHLIB:= ${OPTIONS_DEFINE} +OPTIONS_DEFINE= AUTHLIB +OPTIONS_MULTI= AUTHLIB +AUTHLIB_DESC= Courier Auth Library support .endif -.include +OPTIONS_DEFINE+= DOVECOTAUTH FAM GDBM MAILWRAPPER -.if defined(WITH_GDBM) -LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm -CONFIGURE_ARGS+= --with-db=gdbm -.else -CONFIGURE_ARGS+= --with-db=db -.endif +DOVECOTAUTH_DESC= Dovecot Authentication support +MAILWRAPPER_DESC= Let configure guess which sendmail binary to use + +OPTIONS_SUB= yes +GDBM_CONFIGURE_ON= --with-db=gdbm +GDBM_CONFIGURE_OFF= --with-db=db +GDBM_LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm + +.include .if defined(MAILDROP_SUID) CONFIGURE_ARGS+= --enable-maildrop-uid="${MAILDROP_SUID}" +PLIST_SUB+= MSUID='' MUID='${MAILDROP_SUID}' +.else +PLIST_SUB+= MSUID='@comment ' MUID='root' .endif .if defined(MAILDROP_SGID) CONFIGURE_ARGS+= --enable-maildrop-gid="${MAILDROP_SGID}" +PLIST_SUB+= MSGID='' MGID='${MAILDROP_SGID}' +.else +PLIST_SUB+= MSGID='@comment ' MGID='mail' .endif -.if !defined(NO_MAILWRAPPER) +.if ! ${PORT_OPTIONS:MMAILWRAPPER} CONFIGURE_ARGS+= --enable-sendmail=/usr/sbin/sendmail .endif -.if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so.0) +.if ${PORT_OPTIONS:MFAM} || exists(${LOCALBASE}/lib/libfam.so.0) USE_FAM= yes .endif @@ -101,26 +100,23 @@ USE_FAM= yes CONFIGURE_ARGS+= --enable-trusted-users="${MAILDROP_TRUSTED_USERS}" .endif -.if defined(WITH_DOVECOTAUTH) -PATCH_SITES+= http://www.max.rs/ozone/ -PATCHFILES+= maildrop-2.3.0-dovecotauth.patch.txt +.if ${PORT_OPTIONS:MDOVECOTAUTH} +PATCH_SITES= http://www.madpilot.net/maildrop/ +PATCHFILES= maildrop-2.7.0-dovecotauth.patch.txt PATCH_DIST_STRIP= -p1 -PLIST_SUB+= DOVECOTAUTH="" -.else -PLIST_SUB+= DOVECOTAUTH="@comment " .endif post-patch: @${REINPLACE_CMD} -e "s/l= 72 - szbuf.Length();/l= ${MAILDROP_LOG_COLUMNS} - szbuf.Length();/" \ - ${WRKSRC}/maildrop/log.C + ${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 defined(WITH_AUTHLIB) +.if ${PORT_OPTIONS:MAUTHLIB} @${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -rpath=:${LOCALBASE}/lib/courier-authlib|' \ - ${WRKSRC}/maildrop/Makefile.in + ${WRKSRC}/libs/maildrop/Makefile.in .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif @@ -131,27 +127,18 @@ CONFIGURE_ARGS+= --enable-authlib CONFIGURE_ARGS+= --disable-authlib .endif -.if defined(NOPORTDOCS) -# Just install the binary and man pages, no extra documentation -INSTALL_TARGET= install-maildrop install-deliverquota install-man -.else -INSTALL_TARGET= install-strip -.endif - post-install: - ${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg \ - ${PREFIX}/etc/quotawarnmsg.sample -.if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.if defined(WITH_DOVECOTAUTH) - ${INSTALL_DATA} ${WRKSRC}/README.dovecotauth ${DOCSDIR} -.endif +.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} .if defined(MAILDROP_SUID) - ${CHMOD} u+s ${PREFIX}/bin/maildrop + ${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/lockmail ${STAGEDIR}${PREFIX}/bin/maildrop .endif .if defined(MAILDROP_SGID) - ${CHMOD} g+s ${PREFIX}/bin/maildrop + ${CHMOD} g+s ${STAGEDIR}${PREFIX}/bin/lockmail ${STAGEDIR}${PREFIX}/bin/maildrop .endif -.include +.include diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo index 0b617881f785..a144f508f46b 100644 --- a/mail/maildrop/distinfo +++ b/mail/maildrop/distinfo @@ -1,2 +1,4 @@ -SHA256 (maildrop-2.6.0.tar.bz2) = afc115119b2d3197c565002e158c2cb69d525288bf72c71919c3c74096b824a9 -SIZE (maildrop-2.6.0.tar.bz2) = 2174922 +SHA256 (maildrop-2.7.0.tar.bz2) = e7f81c66b7b70a775e6b6284a67d3e2468bdd0a1baa28514778355f6bafbf3e1 +SIZE (maildrop-2.7.0.tar.bz2) = 2212504 +SHA256 (maildrop-2.7.0-dovecotauth.patch.txt) = 2987e56071d78dc55ac2ce523fe041dbf6565a90e98410f9fa2219d7434b945b +SIZE (maildrop-2.7.0-dovecotauth.patch.txt) = 22063 diff --git a/mail/maildrop/files/patch-Makefile.in b/mail/maildrop/files/patch-Makefile.in index 988770c2823d..f75d084366f9 100644 --- a/mail/maildrop/files/patch-Makefile.in +++ b/mail/maildrop/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2012-09-06 02:51:53.000000000 +0200 -+++ Makefile.in 2012-09-26 23:19:25.396983800 +0200 -@@ -272,7 +272,7 @@ +--- Makefile.in.orig 2013-09-28 19:28:36.000000000 +0200 ++++ Makefile.in 2013-10-01 17:24:51.798480620 +0200 +@@ -372,7 +372,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ @@ -9,7 +9,7 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -@@ -305,16 +305,16 @@ +@@ -406,16 +406,16 @@ maildroptips.txt COPYING.GPL manpage.css pgpkeys.txt scriptdir = $(pkgdatadir)/scripts @@ -30,12 +30,12 @@ maildir.5 \ maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1 -@@ -1160,21 +1160,21 @@ +@@ -1255,21 +1255,21 @@ install-deliverquota: $(mkinstalldirs) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota -+ $(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/maildrop-deliverquota +- $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota ++ $(INSTALL_PROGRAM) libs/maildir/deliverquota $(DESTDIR)$(bindir)/maildrop-deliverquota cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota uninstall-deliverquota: @@ -46,29 +46,29 @@ uninstall-local: uninstall-deliverquota uninstall-maildrop --deliverquota.8: maildir/deliverquota.8 -- cp -f maildir/deliverquota.8 deliverquota.8 -+maildrop-deliverquota.8: maildir/deliverquota.8 -+ cp -f maildir/deliverquota.8 maildrop-deliverquota.8 +-deliverquota.8: libs/maildir/deliverquota.8 +- cp -f libs/maildir/deliverquota.8 deliverquota.8 ++maildrop-deliverquota.8: libs/maildir/deliverquota.8 ++ cp -f libs/maildir/deliverquota.8 maildrop-deliverquota.8 --deliverquota.html: maildir/deliverquota.html -- cp -f maildir/deliverquota.html deliverquota.html -+maildrop-deliverquota.html: maildir/deliverquota.html -+ cp -f maildir/deliverquota.html maildrop-deliverquota.html +-deliverquota.html: libs/maildir/deliverquota.html +- cp -f libs/maildir/deliverquota.html deliverquota.html ++maildrop-deliverquota.html: libs/maildir/deliverquota.html ++ cp -f libs/maildir/deliverquota.html maildrop-deliverquota.html # In maildrop 0.74, maildirmake was installed as bindir/maildrop.maildirmake # and a soft link was created from maildirmake to maildrop.maildirmake -@@ -1192,7 +1192,7 @@ - $(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \ +@@ -1287,7 +1287,7 @@ + $(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \ done - $(INSTALL_PROGRAM) liblock/lockmail $(DESTDIR)$(bindir)/lockmail -- $(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake -+ $(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildrop-maildirmake - $(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime - $(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime + $(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail +- $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake ++ $(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildrop-maildirmake + $(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime + $(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ -@@ -1203,7 +1203,7 @@ - . maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail +@@ -1298,7 +1298,7 @@ + . 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 \ @@ -76,19 +76,19 @@ rm -f $(DESTDIR)$(bindir)/$$f ; \ done test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ -@@ -1257,11 +1257,11 @@ - maildirkw.html: maildir/maildirkw.html - cp -f $(srcdir)/maildir/maildirkw.html maildirkw.html +@@ -1352,11 +1352,11 @@ + maildirkw.html: libs/maildir/maildirkw.html + cp -f $(srcdir)/libs/maildir/maildirkw.html maildirkw.html --maildirmake.html: maildir/maildirmake.html -- cp -f maildir/maildirmake.html maildirmake.html -+maildrop-maildirmake.html: maildir/maildirmake.html -+ cp -f maildir/maildirmake.html maildrop-maildirmake.html +-maildirmake.html: libs/maildir/maildirmake.html +- cp -f libs/maildir/maildirmake.html maildirmake.html ++maildrop-maildirmake.html: libs/maildir/maildirmake.html ++ cp -f libs/maildir/maildirmake.html maildrop-maildirmake.html --maildirmake.1: maildir/maildirmake.1 -- cp -f maildir/maildirmake.1 . -+maildrop-maildirmake.1: maildir/maildirmake.1 -+ cp -f maildir/maildirmake.1 maildrop-maildirmake.1 +-maildirmake.1: libs/maildir/maildirmake.1 +- cp -f libs/maildir/maildirmake.1 . ++maildrop-maildirmake.1: libs/maildir/maildirmake.1 ++ cp -f libs/maildir/maildirmake.1 maildrop-maildirmake.1 - maildropex.html: maildrop/maildropex.html - cp -f $(srcdir)/maildrop/maildropex.html maildropex.html + maildropex.html: libs/maildrop/maildropex.html + cp -f $(srcdir)/libs/maildrop/maildropex.html maildropex.html diff --git a/mail/maildrop/files/patch-filelock.C b/mail/maildrop/files/patch-filelock.C index 2ade3735cf9d..b5b1fee87813 100644 --- a/mail/maildrop/files/patch-filelock.C +++ b/mail/maildrop/files/patch-filelock.C @@ -1,6 +1,6 @@ ---- maildrop/filelock.C.orig Sat Apr 29 03:17:45 2000 -+++ maildrop/filelock.C Fri Apr 15 13:09:25 2005 -@@ -64,7 +64,7 @@ +--- libs/maildrop/filelock.C.orig 2013-08-25 20:54:20.000000000 +0200 ++++ libs/maildrop/filelock.C 2013-10-01 17:26:36.724456433 +0200 +@@ -63,7 +63,7 @@ // you're writing to a device file, you know what you're doing. if (fstat(fd, &stat_buf) >= 0 && ( diff --git a/mail/maildrop/pkg-descr b/mail/maildrop/pkg-descr index 500a9bdcaf1d..777c62893daf 100644 --- a/mail/maildrop/pkg-descr +++ b/mail/maildrop/pkg-descr @@ -12,4 +12,4 @@ similar to mail/procmail. maildrop can be used with sendmail, qmail, and other MTAs. -WWW: http://www.courier-mta.org/maildrop/ +WWW: http://www.courier-mta.org/maildrop/ diff --git a/mail/maildrop/pkg-plist b/mail/maildrop/pkg-plist index 69266c017bcb..abbc13bae9eb 100644 --- a/mail/maildrop/pkg-plist +++ b/mail/maildrop/pkg-plist @@ -1,4 +1,3 @@ -@comment $FreeBSD$ bin/maildrop-deliverquota bin/lockmail bin/mailbot @@ -10,6 +9,19 @@ bin/makemime bin/reformail bin/reformime etc/quotawarnmsg.sample +man/man1/lockmail.1.gz +man/man1/mailbot.1.gz +man/man1/maildrop-maildirmake.1.gz +man/man1/maildrop.1.gz +man/man1/makemime.1.gz +man/man1/reformail.1.gz +man/man1/reformime.1.gz +man/man5/maildir.5.gz +man/man7/maildirquota.7.gz +man/man7/maildropex.7.gz +man/man7/maildropfilter.7.gz +man/man7/maildropgdbm.7.gz +man/man8/maildrop-deliverquota.8.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html @@ -46,3 +58,7 @@ etc/quotawarnmsg.sample %%PORTDOCS%%%%DOCSDIR%%/rfc2045.html %%PORTDOCS%%%%DOCSDIR%%/rfc822.html %%PORTDOCS%%@dirrm %%DOCSDIR%% +@exec chown %%MUID%% %D/bin/lockmail %D/bin/maildrop +%%MSUID%%@exec chmod u+s %D/bin/lockmail %D/bin/maildrop +@exec chgrp %%MGID%% %D/bin/lockmail %D/bin/maildrop +%%MSGID%%@exec chmod g+s %D/bin/lockmail %D/bin/maildrop