diff options
Diffstat (limited to 'mail/maildrop')
| -rw-r--r-- | mail/maildrop/Makefile | 6 | ||||
| -rw-r--r-- | mail/maildrop/distinfo | 4 | ||||
| -rw-r--r-- | mail/maildrop/files/patch-Makefile.in | 40 | ||||
| -rw-r--r-- | mail/maildrop/files/patch-libs_maildrop_filelock.C (renamed from mail/maildrop/files/patch-filelock.C) | 6 | ||||
| -rw-r--r-- | mail/maildrop/pkg-plist | 4 |
5 files changed, 39 insertions, 21 deletions
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index 6d53f41c0ef3..252a6f9c7157 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -15,7 +15,7 @@ # MAILDROP_LOG_COLUMNS lenght of 'File:' line in log - 8; default: 72 PORTNAME= maildrop -PORTVERSION= 2.8.1 +PORTVERSION= 2.8.2 CATEGORIES= mail MASTER_SITES= SF/courier/${PORTNAME}/${PORTVERSION} @@ -38,7 +38,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS= courier-0.65* libunicode-[0-9]* LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ - libunicode.so:${PORTSDIR}/devel/courier-unicode + libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode MAILDROP_LOG_COLUMNS?= 72 # lenght of 'File:' line in log @@ -48,7 +48,7 @@ FIXDOCPATH= libs/liblock/lockmail.1 libs/maildir/deliverquota.8.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/maildrop/reformail.1 \ libs/rfc2045/makemime.1 libs/rfc2045/reformime.1 \ libs/rfc2045/rfc2045.3 libs/rfc822/rfc822.3 diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo index 1542d2cbbb4e..3b07d2a4f756 100644 --- a/mail/maildrop/distinfo +++ b/mail/maildrop/distinfo @@ -1,2 +1,2 @@ -SHA256 (maildrop-2.8.1.tar.bz2) = e1dbdc83ca92c614b05feea837dbae6d275e11b9a35728f68c2d4b8042153b64 -SIZE (maildrop-2.8.1.tar.bz2) = 1989926 +SHA256 (maildrop-2.8.2.tar.bz2) = ab505c4c75ec5566f0626ae477c21ca3069ac37f8f31c41b318025d4ee549654 +SIZE (maildrop-2.8.2.tar.bz2) = 1989913 diff --git a/mail/maildrop/files/patch-Makefile.in b/mail/maildrop/files/patch-Makefile.in index 708853cfb655..61e8f2c95723 100644 --- a/mail/maildrop/files/patch-Makefile.in +++ b/mail/maildrop/files/patch-Makefile.in @@ -1,6 +1,21 @@ ---- Makefile.in.orig 2014-09-01 14:50:09.000000000 +0200 -+++ Makefile.in 2014-09-02 00:46:38.638094906 +0200 -@@ -376,7 +376,7 @@ +--- Makefile.in.orig 2015-04-25 13:56:37 UTC ++++ Makefile.in +@@ -83,10 +83,10 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-@HAVE_DBLIBRARY_TRUE@am__append_1 = makedat.html +-@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 = + subdir = . + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ +@@ -376,7 +376,7 @@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ @@ -9,7 +24,7 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -@@ -411,15 +411,15 @@ +@@ -412,15 +412,15 @@ EXTRA_DIST = README.html INSTALL.html UP maildroptips.txt COPYING.GPL manpage.css $(HTMLWWW) scriptdir = $(pkgdatadir)/scripts @@ -29,7 +44,7 @@ maildropex.7 maildir.5 maildropfilter.7 maildropgdbm.7 \ makemime.1 reformail.1 reformime.1 $(am__append_2) EXTRA_LTLIBRARIES = librfc822.la librfc2045.la -@@ -1257,21 +1257,21 @@ +@@ -1265,21 +1265,21 @@ uninstall-man: uninstall-man1 uninstall- install-deliverquota: $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -57,7 +72,7 @@ # In maildrop 0.74, maildirmake was installed as bindir/maildrop.maildirmake # and a soft link was created from maildirmake to maildrop.maildirmake -@@ -1289,7 +1289,7 @@ +@@ -1297,18 +1297,18 @@ install-maildrop: $(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \ done $(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail @@ -65,8 +80,15 @@ + $(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; \ -@@ -1300,7 +1300,7 @@ +- test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ +- $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog +- test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ +- $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(bindir)/makedat ++# test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ ++# $(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog ++# test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ ++# $(INSTALL_SCRIPT) libs/makedat/makedat $(DESTDIR)$(bindir)/makedat + . libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail . 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: @@ -75,7 +97,7 @@ rm -f $(DESTDIR)$(bindir)/$$f ; \ done test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \ -@@ -1354,11 +1354,11 @@ +@@ -1362,11 +1362,11 @@ maildiracl.html: libs/maildir/maildiracl maildirkw.html: libs/maildir/maildirkw.html cp -f $(srcdir)/libs/maildir/maildirkw.html maildirkw.html diff --git a/mail/maildrop/files/patch-filelock.C b/mail/maildrop/files/patch-libs_maildrop_filelock.C index b5b1fee87813..8356f0f9f1fe 100644 --- a/mail/maildrop/files/patch-filelock.C +++ b/mail/maildrop/files/patch-libs_maildrop_filelock.C @@ -1,6 +1,6 @@ ---- 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 @@ +--- libs/maildrop/filelock.C.orig 2013-08-25 18:54:20 UTC ++++ libs/maildrop/filelock.C +@@ -63,7 +63,7 @@ int flockrc; // 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-plist b/mail/maildrop/pkg-plist index 93a98de08fec..4ecc11cc3178 100644 --- a/mail/maildrop/pkg-plist +++ b/mail/maildrop/pkg-plist @@ -9,8 +9,6 @@ bin/maildrop bin/maildrop-deliverquota bin/mailbot bin/maildrop-maildirmake -bin/makedat -bin/makedatprog bin/makemime bin/reformail bin/reformime @@ -19,7 +17,6 @@ man/man1/lockmail.1.gz man/man1/mailbot.1.gz man/man1/maildrop-maildirmake.1.gz man/man1/maildrop.1.gz -man/man1/makedat.1.gz man/man1/makemime.1.gz man/man1/reformail.1.gz man/man1/reformime.1.gz @@ -56,7 +53,6 @@ man/man8/maildrop-deliverquota.8.gz %%PORTDOCS%%%%DOCSDIR%%/maildropfilter.html %%PORTDOCS%%%%DOCSDIR%%/maildropgdbm.html %%PORTDOCS%%%%DOCSDIR%%/maildroptips.txt -%%PORTDOCS%%%%DOCSDIR%%/makedat.html %%PORTDOCS%%%%DOCSDIR%%/makemime.html %%PORTDOCS%%%%DOCSDIR%%/manpage.css %%PORTDOCS%%%%DOCSDIR%%/reformail.html |