o Improve previous fix for building on OSVERSION < 500000: simple

  patch instead of USE_GCC=3.4+
o Bump PORTREVISION due to dependency change

2 files changed, 14 insertions, 10 deletions

diff --git a/mail/normalizemime/Makefile b/mail/normalizemime/Makefile
index 3d2c44d5fd1d..a9784180ed5d 100644
--- a/mail/normalizemime/Makefile
+++ b/mail/normalizemime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	normalizemime
 PORTVERSION=	1.16.20050628
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://hyvatti.iki.fi/~jaakko/spam/
 DISTNAME=	normalizemime.cc
@@ -34,10 +35,4 @@ do-build:
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME:R} ${PREFIX}/bin
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-USE_GCC=3.4+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/normalizemime/files/patch-normalizemime.cc b/mail/normalizemime/files/patch-normalizemime.cc
index f8974d60cd14..f8a19545ae74 100644
--- a/mail/normalizemime/files/patch-normalizemime.cc
+++ b/mail/normalizemime/files/patch-normalizemime.cc
@@ -1,6 +1,15 @@
---- normalizemime.cc.orig	Tue Aug 30 21:31:02 2005
-+++ normalizemime.cc	Tue Aug 30 21:33:08 2005
-@@ -498,7 +498,7 @@
+--- normalizemime.cc.orig	Tue Sep 13 00:03:52 2005
++++ normalizemime.cc	Tue Sep 13 00:04:18 2005
+@@ -58,6 +58,8 @@
+ #include <map>
+ #include <string>
+ 
++#include <sys/types.h>
++
+ #include <regex.h>
+ #include <assert.h>
+ #include <ctype.h>
+@@ -498,7 +500,7 @@
    char *obuf = buf;
    memcpy (icopy, message.c_str(), in_left);
    message.erase ();