work around pmax compiler bug (c++ -O2) by not using -O2 on the remaining

3 problem files when compiling on pmax.

5 files changed, 57 insertions, 5 deletions

diff --git a/audio/festival/files/patch-sum b/audio/festival/files/patch-sum
index 55450606687..735ef4286da 100644
--- a/audio/festival/files/patch-sum
+++ b/audio/festival/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/05/30 17:18:37 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.6 2000/05/31 14:51:15 dmcmahill Exp $
 
 MD5 (patch-aa) = 0d4fab38dd5a45ac637f3196fa33e82d
 MD5 (patch-ab) = 9e0d5be3ad91d3c9a36843273f5880c3
@@ -8,4 +8,7 @@ MD5 (patch-ae) = 3256017d1e235bc08729a2cd40213a51
 MD5 (patch-af) = 39ba57b0b3ce741c0d75d44afb072714
 MD5 (patch-ag) = db17e06d5acc364387364cbd9ecc98af
 MD5 (patch-ah) = b522e2db8b44288d4c26aea4c872ddbc
-MD5 (patch-ai) = 82a9626829b1c0f805b02b259b4e0cd3
+MD5 (patch-ai) = 329f770a23aafd27000ce689440e91fd
+MD5 (patch-aj) = 24da123e7cc45ae3604b7e5f022ff1b8
+MD5 (patch-ak) = d71ba6d9a25d8e7b83116c2a3f3e5486
+MD5 (patch-al) = 6465aedf28014932650fa7dbb98b86de
diff --git a/audio/festival/patches/patch-ai b/audio/festival/patches/patch-ai
index c8b63692c29..a20edf01ef0 100644
--- a/audio/festival/patches/patch-ai
+++ b/audio/festival/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.1 2000/05/30 17:18:36 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.2 2000/05/31 14:51:16 dmcmahill Exp $
 
 work around pmax compiler bug
 
---- /usr/build/pkgsrc/audio/festival/work.mipsel/speech_tools/grammar/ngram/Makefile.orig	Sun May 30 06:59:41 1999
-+++ /usr/build/pkgsrc/audio/festival/work.mipsel/speech_tools/grammar/ngram/Makefile	Tue May 30 12:41:32 2000
+--- speech_tools/grammar/ngram/Makefile.orig	Sun May 30 06:59:41 1999
++++ speech_tools/grammar/ngram/Makefile	Tue May 30 12:41:32 2000
 @@ -49,3 +49,10 @@
  include $(TOP)/config/common_make_rules
  
diff --git a/audio/festival/patches/patch-aj b/audio/festival/patches/patch-aj
new file mode 100644
index 00000000000..01755632b6a
--- /dev/null
+++ b/audio/festival/patches/patch-aj
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.1 2000/05/31 14:51:16 dmcmahill Exp $
+
+work around pmax compiler bug
+
+--- festival/src/modules/OGIcommon/Makefile.orig	Thu Aug 26 11:56:36 1999
++++ festival/src/modules/OGIcommon/Makefile	Tue May 30 21:08:30 2000
+@@ -54,2 +54,9 @@
+ include $(TOP)/config/common_make_rules
+ 
++ifeq ($(MACHINETYPE),pmax)
++
++OGI_Track.o: OGI_Track.cc
++	${CXX} -c -fno-implicit-templates -fguiding-decls  -Wall -I../../../src/include -I../../../../speech_tools/include ${OS_INCLUDES} OGI_Track.cc
++
++endif
++
diff --git a/audio/festival/patches/patch-ak b/audio/festival/patches/patch-ak
new file mode 100644
index 00000000000..0f266f84892
--- /dev/null
+++ b/audio/festival/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1 2000/05/31 14:51:17 dmcmahill Exp $
+
+work around pmax compiler bug
+
+--- festival/src/modules/OGIresLPC/Makefile.orig	Thu Aug  5 13:01:02 1999
++++ festival/src/modules/OGIresLPC/Makefile	Wed May 31 01:20:01 2000
+@@ -53,2 +53,10 @@
+ include $(TOP)/config/common_make_rules
+ 
++ifeq ($(MACHINETYPE),pmax)
++
++resLPC_mod.o: resLPC_mod.cc
++	${CXX} -c -fno-implicit-templates -fguiding-decls  -Wall -I../../../src/include -I../OGIdbase -I ../OGIcommon -I../../../../speech_tools/include ${OS_INCLUDES} resLPC_mod.cc
++
++endif
++
++
diff --git a/audio/festival/patches/patch-al b/audio/festival/patches/patch-al
new file mode 100644
index 00000000000..40bc2e8906a
--- /dev/null
+++ b/audio/festival/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.1 2000/05/31 14:51:17 dmcmahill Exp $
+
+work around pmax compiler bug
+
+--- festival/src/modules/Duration/Makefile.orig	Sun May 30 08:07:31 1999
++++ festival/src/modules/Duration/Makefile	Wed May 31 09:22:01 2000
+@@ -51,3 +51,9 @@
+ include $(TOP)/config/common_make_rules
+ 
++ifeq ($(MACHINETYPE),pmax)
++
++duration.o:duration.cc
++	${CXX} -c -fno-implicit-templates -fguiding-decls  -Wall -I../include -I../../../src/include -I../../../../speech_tools/include ${OS_INCLUDES} duration.cc
++
++endif
+