3 files changed, 39 insertions, 30 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index a3333f11471c..f6c10a548222 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	4.5.0
+PORTVERSION=	4.5.1
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index ae02d6503da6..cffe67ccecd1 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,3 +1,3 @@
-MD5 (courier-imap-4.5.0.tar.bz2) = da35725325bacaea20f7bc16a871722b
-SHA256 (courier-imap-4.5.0.tar.bz2) = 3d7de2ba6d5f7fa2e7ac4bfeb053055e127234c3442a09f36aa5dd71b9f44ffa
-SIZE (courier-imap-4.5.0.tar.bz2) = 3565751
+MD5 (courier-imap-4.5.1.tar.bz2) = 2fde05e53764d7b7e5b5a0621f424386
+SHA256 (courier-imap-4.5.1.tar.bz2) = 4faf4d6e755af9e87bead8bbbf9542369cf3151f7edc876442c918858640c6aa
+SIZE (courier-imap-4.5.1.tar.bz2) = 3398855
diff --git a/mail/courier-imap/files/patch-Makefile.in b/mail/courier-imap/files/patch-Makefile.in
index 7bb398f7c107..d5e6c2cf6650 100644
--- a/mail/courier-imap/files/patch-Makefile.in
+++ b/mail/courier-imap/files/patch-Makefile.in
@@ -1,33 +1,42 @@
---- Makefile.in.orig	Thu Dec  9 03:07:01 2004
-+++ Makefile.in	Sun Jan  2 21:17:35 2005
-@@ -248,7 +248,7 @@
- 	COPYING.GPL NEWS.html $(TEMPLFILES)\
- sysconftool
+--- Makefile.in.orig	2009-06-27 19:26:28.000000000 +0200
++++ Makefile.in	2009-07-27 19:19:27.000000000 +0200
+@@ -307,7 +307,7 @@
+ EXTRA_DIST = 00README.NOW.OR.SUFFER README README.cygwin COPYING.GPL \
+ 	NEWS.html $(TEMPLFILES) pgpkeys.txt sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -	imapd.cnf pop3d.cnf quotawarnmsg.example
 +	quotawarnmsg.example
  
  libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
- HTML2TXT = `which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"`
-@@ -506,8 +506,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
+ HTML2TXT = links -dump -no-numbering -no-references
+@@ -659,8 +659,8 @@
+ 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ 	while read files; do \
+ 	  test -z "$$files" || { \
+-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
++	    echo " %%INSTALL_MAN%% $$files '$(DESTDIR)$(man1dir)'"; \
++	    %%INSTALL_MAN%% $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+ 	done; }
+ 
  uninstall-man1:
- 	@$(NORMAL_UNINSTALL)
-@@ -551,8 +551,8 @@
- 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
- 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
--	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
--	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-+	  echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+	  %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
- 	done
+@@ -690,15 +690,15 @@
+ 	sed 'N;N;s,\n, ,g' | { \
+ 	list=; while read file base inst; do \
+ 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
++	    echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
++	    %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
+ 	  fi; \
+ 	done; \
+ 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ 	while read files; do \
+ 	  test -z "$$files" || { \
+-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
+-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
++	    echo " %%INSTALL_MAN%% $$files '$(DESTDIR)$(man8dir)'"; \
++	    %%INSTALL_MAN%% $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
+ 	done; }
+ 
  uninstall-man8:
- 	@$(NORMAL_UNINSTALL)