4 files changed, 32 insertions, 30 deletions
diff --git a/mail/gmime24-sharp/Makefile b/mail/gmime24-sharp/Makefile
index 3b30654ff63a..9a58c9f0d78d 100644
--- a/mail/gmime24-sharp/Makefile
+++ b/mail/gmime24-sharp/Makefile
@@ -6,7 +6,7 @@
 #   $Id: Makefile,v 1.17 2006/10/26 18:37:29 tmclau02 Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-24-sharp
 
diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
index c81e122ee659..2a45e9bbf2bc 100644
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmime
-PORTVERSION=	2.4.10
+PORTVERSION=	2.4.15
 PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	GNOME
diff --git a/mail/gmime24/distinfo b/mail/gmime24/distinfo
index 4f776b8d1e96..8d4c54c90f90 100644
--- a/mail/gmime24/distinfo
+++ b/mail/gmime24/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmime-2.4.10.tar.gz) = d7fe1c046a2bb08606a2a8be0506735c
-SHA256 (gmime-2.4.10.tar.gz) = f40fbcc927f7ab1f26ab5b5d4915442106dde77a2d091dfeab6411f8422f305b
-SIZE (gmime-2.4.10.tar.gz) = 1083731
+MD5 (gmime-2.4.15.tar.gz) = f0f8ea95d1a6b5f8012fd0a340a8021a
+SHA256 (gmime-2.4.15.tar.gz) = 250e8d1f0404ecac7d97b8802bd412ca5438a2a655c901f0d9edb82fdd7ac28e
+SIZE (gmime-2.4.15.tar.gz) = 1108187
diff --git a/mail/gmime24/files/patch-src_Makefile.in b/mail/gmime24/files/patch-src_Makefile.in
index e5c0b5b59f3a..d5e0116235b9 100644
--- a/mail/gmime24/files/patch-src_Makefile.in
+++ b/mail/gmime24/files/patch-src_Makefile.in
@@ -1,11 +1,13 @@
-#
-# http://www.freebsd.org/cgi/query-pr.cgi?pr=118092
-#
-# Rename uudecode and uuencode to gmime-* to not conflict with userland
-#
---- src/Makefile.in.orig	2008-07-19 20:57:47.000000000 -0300
-+++ src/Makefile.in	2008-07-20 21:29:18.000000000 -0300
-@@ -24,6 +24,7 @@
+
+$FreeBSD$
+
+http://www.freebsd.org/cgi/query-pr.cgi?pr=118092
+
+Rename uudecode and uuencode to gmime-* to not conflict with userland
+
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -26,6 +26,7 @@
  install_sh_SCRIPT = $(install_sh) -c
  INSTALL_HEADER = $(INSTALL_DATA)
  transform = $(program_transform_name)
@@ -13,21 +15,21 @@
  NORMAL_INSTALL = :
  PRE_INSTALL = :
  POST_INSTALL = :
-@@ -293,7 +294,7 @@
- 	  if test -f $$p \
- 	     || test -f $$p1 \
- 	  ; then \
--	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/;$(add_gmime)'`; \
- 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- 	  else :; fi; \
-@@ -302,7 +303,7 @@
- uninstall-binPROGRAMS:
+@@ -333,7 +334,7 @@
+ 	  then echo "$$p"; echo "$$p"; else :; fi; \
+ 	done | \
+ 	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
++	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/;$(add_gmime)' | \
+ 	sed 'N;N;N;s,\n, ,g' | \
+ 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ 	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+@@ -352,7 +353,7 @@
  	@$(NORMAL_UNINSTALL)
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/;$(add_gmime)'`; \
- 	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
- 	done
+ 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ 	files=`for p in $$list; do echo "$$p"; done | \
+-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
++	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform);$(add_gmime)' \
+ 	      -e 's/$$/$(EXEEXT)/' `; \
+ 	test -n "$$list" || exit 0; \
+ 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \