5 files changed, 27 insertions, 25 deletions

diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 8cc4f76e5ffd..7ef5f184c35a 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -18,7 +18,7 @@
 # MAILDROP_LOG_COLUMNS	lenght of 'File:' line in log - 8; default: 72
 
 PORTNAME=	maildrop
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 30c24681b70e..71dc95dfc027 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,3 +1,3 @@
-MD5 (maildrop-2.0.4.tar.bz2) = 6a760efe429716ab0be67a1ddc554ed7
-SHA256 (maildrop-2.0.4.tar.bz2) = 573032d6525ac7454377eb400372c363446bb3d9abd9249da9cf6676aef85671
-SIZE (maildrop-2.0.4.tar.bz2) = 2286125
+MD5 (maildrop-2.2.0.tar.bz2) = 1fd5293c73adb64a01cb3d3e59e54618
+SHA256 (maildrop-2.2.0.tar.bz2) = 15c99c3c1e7b1d7c078da92bcf643da411be414994eff7f387e3302baa189b3f
+SIZE (maildrop-2.2.0.tar.bz2) = 2412329
diff --git a/mail/maildrop/files/patch-Makefile.in b/mail/maildrop/files/patch-Makefile.in
index d9bc6c441847..ea3c17aa3592 100644
--- a/mail/maildrop/files/patch-Makefile.in
+++ b/mail/maildrop/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sat Jan 22 23:54:33 2005
-+++ Makefile.in	Sat Jan 22 23:54:58 2005
-@@ -230,7 +230,7 @@
- SUBDIRS = numlib liblock unicode rfc822 rfc2045 gdbmobj bdbobj maildir maildrop
- EXTRA_DIST = README.html INSTALL.html UPGRADE.html README.postfix maildroptips.txt automake.fix COPYING.GPL manpage.css
- scriptdir = $(pkgdatadir)/scripts
+--- 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 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 -htmldir = $(pkgdatadir)/html
 +htmldir = $(datadir)/doc/@PACKAGE@
- DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
- @INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAHTML = 
- @INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
diff --git a/mail/maildrop/files/patch-dbobj.h.in b/mail/maildrop/files/patch-dbobj.h.in
new file mode 100644
index 000000000000..2f67d3a8ebdf
--- /dev/null
+++ b/mail/maildrop/files/patch-dbobj.h.in
@@ -0,0 +1,14 @@
+--- dbobj.h.in.orig	2000-07-02 08:41:53.000000000 +0900
++++ dbobj.h.in	2009-07-01 19:58:56.000000000 +0900
+@@ -29,9 +29,9 @@
+ #define	dbobj_nextkey	gdbmobj_nextkey
+ 
+ #define	DBNAME	"gdbm"
+-#endif
+ 
+-#if	@USE_DB@
++#else
++
+ #include	"bdbobj/bdbobj.h"
+ #define	DbObj	BDbObj
+ 
diff --git a/mail/maildrop/files/patch-makedat-Makefile.in b/mail/maildrop/files/patch-makedat-Makefile.in
deleted file mode 100644
index 0e62831e03d9..000000000000
--- a/mail/maildrop/files/patch-makedat-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- makedat/Makefile.in.orig	Sat Apr 28 12:58:01 2007
-+++ makedat/Makefile.in	Sat Apr 28 12:58:31 2007
-@@ -41,8 +41,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--noinst_PROGRAMS = @makedatprog_target@
--EXTRA_PROGRAMS = makedatprog$(EXEEXT)
-+noinst_PROGRAMS = makedatprog$(EXEEXT)
- DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \
- 	$(srcdir)/../config.sub $(srcdir)/../depcomp \
- 	$(srcdir)/../install-sh $(srcdir)/../ltmain.sh \