From 5cbd24e9203279820dd991bd75453375fe372772 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sat, 22 May 2010 08:06:33 +0000
Subject: [PATCH] - remove mips64 workaround

---
 biology/nutdb/Makefile               | 11 ++---------
 biology/nutdb/patches/patch-Makefile | 16 +++++-----------
 comms/efax/Makefile                  | 11 +++--------
 comms/efax/patches/patch-Makefile    | 14 +++-----------
 4 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/biology/nutdb/Makefile b/biology/nutdb/Makefile
index f0f546fe4c2..c26830410bd 100644
--- a/biology/nutdb/Makefile
+++ b/biology/nutdb/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2010/02/09 12:23:59 jasper Exp $
+# $OpenBSD: Makefile,v 1.21 2010/05/22 08:06:33 jasper Exp $
 
 COMMENT=	record and analyze your meals for nutrient composition
 
 DISTNAME=	nut-14.4
-PKGNAME=	nutdb-14.4
+PKGNAME=	nutdb-14.4p0
 CATEGORIES=	biology
 HOMEPAGE=	http://nut.sourceforge.net/
 
@@ -22,11 +22,4 @@ ALL_TARGET=     nut
 
 USE_GMAKE=	Yes
 
-# gcc 3.3.5 internal compiler error
-.if ${MACHINE_ARCH:Mmips64*}
-EXTRA_CFLAGS=	-O0
-.endif
-
-MAKE_FLAGS+=	EXTRA_CFLAGS=${EXTRA_CFLAGS}
-
 .include <bsd.port.mk>
diff --git a/biology/nutdb/patches/patch-Makefile b/biology/nutdb/patches/patch-Makefile
index d5454284ab8..e9dabed2780 100644
--- a/biology/nutdb/patches/patch-Makefile
+++ b/biology/nutdb/patches/patch-Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.6 2009/04/02 13:24:30 jasper Exp $
---- Makefile.orig	Mon Dec 29 17:34:19 2008
-+++ Makefile	Thu Apr  2 15:23:45 2009
-@@ -1,14 +1,24 @@
+$OpenBSD: patch-Makefile,v 1.7 2010/05/22 08:06:33 jasper Exp $
+--- Makefile.orig	Sat May 22 10:06:07 2010
++++ Makefile	Sat May 22 10:06:10 2010
+@@ -1,9 +1,9 @@
  objects := $(patsubst %.c,%.o,$(wildcard *.c))
  
 -CFLAGS= -Os -s -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/local/lib/nut\" -ansi -pedantic
@@ -11,15 +11,9 @@ $OpenBSD: patch-Makefile,v 1.6 2009/04/02 13:24:30 jasper Exp $
 -	$(CC) ${CFLAGS} -o nut $(LDFLAGS) $(objects) -lm
 +	$(CC) ${CFLAGS} -o nut $(objects) -lm
  
-+anameal.o: anameal.c
-+	${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $< -o $@
-+
-+food.o: food.c
-+	${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $< -o $@
-+
  deps:
  	makedepend *.c
- 
+@@ -11,4 +11,8 @@ deps:
  clean:
  	rm -f *.o nut preprocess/*.o preprocess/dbjw
  
diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index e99249a2e32..8d683df42cb 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2010/02/09 12:23:59 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2010/05/22 08:09:19 jasper Exp $
 
 COMMENT=	small & simple FAX send/receive program
 
 DISTNAME=	efax-0.9
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	comms
 
 MAINTAINER=	Ian Darwin <ian@openbsd.org>
@@ -16,12 +16,7 @@ WANTLIB=		c
 
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/serialcomm/fax/}
 
-# gcc 3.3.5 internal compiler error
-.if ${MACHINE_ARCH:Mmips64*}
-EXTRA_CFLAGS=	-O0
-.endif
-
-MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS}" EXTRA_CFLAGS="${EXTRA_CFLAGS}"
+MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 NO_REGRESS=	Yes
 
diff --git a/comms/efax/patches/patch-Makefile b/comms/efax/patches/patch-Makefile
index 6ea19544254..7d699fcbf08 100644
--- a/comms/efax/patches/patch-Makefile
+++ b/comms/efax/patches/patch-Makefile
@@ -1,16 +1,8 @@
-$OpenBSD: patch-Makefile,v 1.3 2008/06/08 21:41:13 jasper Exp $
+$OpenBSD: patch-Makefile,v 1.4 2010/05/22 08:09:19 jasper Exp $
 --- Makefile.orig	Fri Mar 12 02:00:34 1999
-+++ Makefile	Wed Jan 30 07:11:19 2008
-@@ -23,13 +23,17 @@ MANDIR=/usr/man
++++ Makefile	Sat May 22 10:09:02 2010
+@@ -25,11 +25,9 @@ all:	efax efix
  
- all:	efax efix
- 
-+efax.o: efax.c
-+	${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $<
-+
-+efix.o: efix.c
-+	${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $<
-+
  efax:	efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
  	$(CC) -o efax $(LDFLAGS) efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o
 -	strip efax