4 files changed, 99 insertions, 19 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 895c4053cda8..ff72344734ff 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	maildrop
-# Date created:		16 November 1998
-# Whom:			Tom Hukins <tom@eborcom.com>
-#
+# Created by: Tom Hukins <tom@eborcom.com>
 # $FreeBSD$
-#
 
 # The following compile-time options are available:
 # WITH_AUTHLIB=yes	Enable optional support for Courier Auth Library
@@ -20,12 +16,11 @@
 #			extension (http://wiki.dovecot.org/maildrop/)
 
 PORTNAME=	maildrop
-PORTVERSION=	2.5.5
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Mail delivery agent (MDA) with filtering abilities
 
 LICENSE=	GPLv3
@@ -42,6 +37,8 @@ CONFIGURE_ARGS=	--enable-syslog=1 \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+CONFLICTS=      courier-0.65*
+
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 
 MAILDROP_LOG_COLUMNS?=	72	# lenght of 'File:' line in log
@@ -113,11 +110,11 @@ INSTALL_TARGET=	install-maildrop install-deliverquota install-man
 INSTALL_TARGET=	install-strip
 .endif
 
-MAN1+=	lockmail.1 mailbot.1 maildirmake.1 maildrop.1 makemime.1 \
+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+=	deliverquota.8
+MAN8+=	maildrop-deliverquota.8
 DOCS=	AUTHORS INSTALL INSTALL.html README README.html README.postfix \
 	UPGRADE UPGRADE.html maildroptips.txt maildir/README.*
 
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 60e787e261e2..0b617881f785 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (maildrop-2.5.5.tar.bz2) = 7484382852075f452850a082454c8c47a65d52f00fe64e0b1a63ed7ccf25288c
-SIZE (maildrop-2.5.5.tar.bz2) = 2158846
+SHA256 (maildrop-2.6.0.tar.bz2) = afc115119b2d3197c565002e158c2cb69d525288bf72c71919c3c74096b824a9
+SIZE (maildrop-2.6.0.tar.bz2) = 2174922
diff --git a/mail/maildrop/files/patch-Makefile.in b/mail/maildrop/files/patch-Makefile.in
index ea3c17aa3592..988770c2823d 100644
--- a/mail/maildrop/files/patch-Makefile.in
+++ b/mail/maildrop/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2009-06-28 04:13:40.000000000 +0900
-+++ Makefile.in	2009-07-01 18:21:44.000000000 +0900
-@@ -259,7 +259,7 @@
+--- 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 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -9,3 +9,86 @@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
+@@ -305,16 +305,16 @@
+ 	maildroptips.txt COPYING.GPL manpage.css pgpkeys.txt
+ 
+ scriptdir = $(pkgdatadir)/scripts
+-DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
++DELIVERQUOTAHTMLSOURCE = maildirquota.html maildrop-deliverquota.html
+ DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
+-DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
++DELIVERQUOTAMAN = maildirquota.7 maildrop-deliverquota.8
+ MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \
+-	maildirmake.html maildropex.html \
++	maildrop-maildirmake.html maildropex.html \
+ 	maildir.html \
+ 	maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
+ 	makemime.html reformail.html reformime.html
+ 
+-MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
++MAILDROPMAN = lockmail.1 maildrop-maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
+ 	maildir.5 \
+ 	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
+ 
+@@ -1160,21 +1160,21 @@
+ 
+ install-deliverquota:
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+-	$(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
++	$(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/maildrop-deliverquota
+ 	cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
+ 
+ uninstall-deliverquota:
+-	rm -f $(DESTDIR)$(bindir)/deliverquota
++	rm -f $(DESTDIR)$(bindir)/maildrop-deliverquota
+ 
+ install-data-local: install-man install-deliverquota install-maildrop
+ 
+ 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.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
+ 
+ #  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 ; \
+ 	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
+ 	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
+ 
+ uninstall-maildrop:
+-	for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \
++	for f in maildrop mailbot maildrop-maildirmake reformail lockmail makemime reformime; do \
+ 		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
+ 
+-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.1: maildir/maildirmake.1
+-	cp -f maildir/maildirmake.1 .
++maildrop-maildirmake.1: maildir/maildirmake.1
++	cp -f maildir/maildirmake.1 maildrop-maildirmake.1
+ 
+ maildropex.html: maildrop/maildropex.html
+ 	cp -f $(srcdir)/maildrop/maildropex.html maildropex.html
diff --git a/mail/maildrop/pkg-plist b/mail/maildrop/pkg-plist
index 4b3becad2950..69266c017bcb 100644
--- a/mail/maildrop/pkg-plist
+++ b/mail/maildrop/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
-bin/deliverquota
+bin/maildrop-deliverquota
 bin/lockmail
 bin/mailbot
-bin/maildirmake
+bin/maildrop-maildirmake
 bin/maildrop
 bin/makedat
 bin/makedatprog
@@ -25,13 +25,13 @@ etc/quotawarnmsg.sample
 %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE.html
-%%PORTDOCS%%%%DOCSDIR%%/deliverquota.html
+%%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%%/maildirmake.html
+%%PORTDOCS%%%%DOCSDIR%%/maildrop-maildirmake.html
 %%PORTDOCS%%%%DOCSDIR%%/maildirquota.html
 %%PORTDOCS%%%%DOCSDIR%%/maildrop.html
 %%PORTDOCS%%%%DOCSDIR%%/maildropex.html