--- ripmime/Makefile	Fri Aug 27 14:32:33 2004
+++ ripmime/Makefile	Mon Jul 18 11:43:11 2005
@@ -6,7 +6,7 @@ 
 #
 
 PORTNAME=	ripmime
-PORTVERSION=	1.3.2.3
+PORTVERSION=	1.4.0.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.pldaniels.com/ripmime/
 
@@ -19,8 +19,9 @@ 
 
 pre-build:
 	@${REINPLACE_CMD} -e 's!CC=!CC?=!; s!/usr/local!${PREFIX}!; \
-		s!CFLAGS= -Wall -O2!CFLAGS+= -Wall!' \
-		${WRKSRC}/Makefile
+		s!^CFLAGS=!CFLAGS ?=!' \
+		${WRKSRC}/Makefile ${WRKSRC}/ripOLE/Makefile \
+		${WRKSRC}/tnef/Makefile
 
 do_install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${PREFIX}/bin/
--- ripmime/distinfo	Fri Aug 27 14:32:33 2004
+++ ripmime/distinfo	Mon Jul 18 11:07:34 2005
@@ -1,2 +1,2 @@ 
-MD5 (ripmime-1.3.2.3.tar.gz) = 9e0aef38aceb8468ac59aea8351f5313
-SIZE (ripmime-1.3.2.3.tar.gz) = 142762
+MD5 (ripmime-1.4.0.5.tar.gz) = 732b07890397d320f5f5835b5229190a
+SIZE (ripmime-1.4.0.5.tar.gz) = 160896
--- ripmime/files/patch-Makefile	Fri Jul 30 00:11:31 2004
+++ ripmime/files/patch-Makefile	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@ 
---- Makefile.orig	Mon Jun 28 09:31:17 2004
-+++ Makefile	Fri Jul 16 08:45:03 2004
-@@ -5,7 +5,7 @@
- # if there isn't already a default CFLAGS set,
- #	use our recommended settings.
- #CFLAGS ?= -Wall -g -O2 -Werror $(CPU_OPTS)
--CFLAGS=-Wall -g -O2 -Werror
-+#CFLAGS=-Wall -g -O2 -Werror
- 
- # OLE decoding is still considered to be 'beta' mode - so it 
- #	disabled in the stable release of ripMIME for now
--- ripmime/files/patch-ripOLE_Makefile	Thu Aug 12 02:43:06 2004
+++ ripmime/files/patch-ripOLE_Makefile	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@ 
---- ripOLE/Makefile.orig	Sat May 22 00:16:01 2004
-+++ ripOLE/Makefile	Sat Jul 24 01:05:45 2004
-@@ -1,7 +1,7 @@
- 
- OBJS= ole.o olestream-unwrap.o bytedecoders.o logger.o pldstr.o
- #CFLAGS ?= -Wall -Werror -g -O2
--CFLAGS=-Wall -Werror -g -O2
-+#CFLAGS=-Wall -Werror -g -O2
- #DEFINES ?= 
- #DEFINES=-DDEBUG_TIMETEST
-