Pick a less aggressive optimizer default. Clang's -O4 enables LTO and ld

can't deal with that by default.

4 files changed, 43 insertions, 20 deletions

diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo
index a01d0bcbaab..e8324ea42c7 100644
--- a/x11/xforms/distinfo
+++ b/x11/xforms/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.18 2008/04/16 05:42:46 obache Exp $
+$NetBSD: distinfo,v 1.19 2011/09/08 00:24:42 joerg Exp $
 
 SHA1 (xforms-1.0.tar.gz) = 865086d2885331ce30b05c7aa07cd8c3d02ce87b
 RMD160 (xforms-1.0.tar.gz) = 2972fb4534d3794b2027e81f4222f20a04cc81f8
 Size (xforms-1.0.tar.gz) = 1012878 bytes
-SHA1 (patch-aa) = a7d53b076197d36a6f2cf18e23b5f102fe0182ec
-SHA1 (patch-ab) = 5f0dedd0e35b952d0e4512c5e396ededcf85f994
-SHA1 (patch-ac) = 55c32e091b1da5441e4c652d3e4a002202a6d076
+SHA1 (patch-aa) = e0ae2f68d13beb4cba5370350dd2dcfcafe2acdc
+SHA1 (patch-ab) = b0419c46f31f54ae1c9415c4c47335a70dceda08
+SHA1 (patch-ac) = 2fe4b26e4f4f0b4c020b68b01d95cbe38b6cbceb
 SHA1 (patch-ad) = 324100fb05e723fbaa92126e279074860c842f1b
 SHA1 (patch-ae) = ba8b68d7e886311cb2fbfe4e0a45e975e7790821
 SHA1 (patch-af) = f3fdbbb2a103505e6f18608f0c3882cc1d264b00
diff --git a/x11/xforms/patches/patch-aa b/x11/xforms/patches/patch-aa
index d39c3c713e0..56893a476b6 100644
--- a/x11/xforms/patches/patch-aa
+++ b/x11/xforms/patches/patch-aa
@@ -1,10 +1,15 @@
-$NetBSD: patch-aa,v 1.8 2002/12/28 19:49:08 jschauma Exp $
+$NetBSD: patch-aa,v 1.9 2011/09/08 00:24:43 joerg Exp $
 
---- Imakefile.orig	2002-12-25 09:50:16.000000000 -0800
-+++ Imakefile	2002-12-25 09:59:05.000000000 -0800
-@@ -6,9 +6,9 @@
+--- Imakefile.orig	2002-12-03 17:25:43.000000000 +0000
++++ Imakefile
+@@ -2,13 +2,13 @@
+ 
+ /* Fairly important stuff */
+ 
+-#define OptimizationLevel -O4
++#define OptimizationLevel -O2
  #define DoWall NO
-
+ 
  #define BuildShared YES
 -#define StaticLink YES
 +#define StaticLink NO
diff --git a/x11/xforms/patches/patch-ab b/x11/xforms/patches/patch-ab
index 970813dee33..7a6e6253aa7 100644
--- a/x11/xforms/patches/patch-ab
+++ b/x11/xforms/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.6 2002/12/28 19:49:09 jschauma Exp $
-
---- demos/Imakefile.orig	2002-11-19 12:50:52.000000000 -0800
-+++ demos/Imakefile	2002-12-25 10:38:30.000000000 -0800
-@@ -109,7 +109,7 @@
+$NetBSD: patch-ab,v 1.7 2011/09/08 00:24:43 joerg Exp $
 
+--- demos/Imakefile.orig	2002-11-19 20:50:52.000000000 +0000
++++ demos/Imakefile
+@@ -109,7 +109,7 @@ UNSTATIC	= -Xlinker -Bdynamic
+ 
  FORMSLIBDIR     = $(TOP)/lib
  FORMSINCDIR     = $(FORMSLIBDIR)       
 -FORMSLIB        = -L$(FORMSLIBDIR) -lforms
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2002/12/28 19:49:09 jschauma Exp $
  DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
  
  IMAGELIBDIR     = $(TOP)/image
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ EXTRA_INCLUDES  = \
  		  -I.
  
  DEPEND_DEFINES	= \
@@ -20,3 +20,12 @@ $NetBSD: patch-ab,v 1.6 2002/12/28 19:49:09 jschauma Exp $
  
  EXTRA_LIBRARIES	= \
  		  $(STATIC) \
+@@ -176,7 +176,7 @@ CDEBUGFLAGS	= -g $(OPTIMIZER)
+ 
+ #if Optimize
+ IMAKE_OPTIMIZE  = -DDoOptimize=1
+-OPTIMIZER	= -O4
++OPTIMIZER	= -O2
+ #else
+ OPTIMIZER	=
+ #endif
diff --git a/x11/xforms/patches/patch-ac b/x11/xforms/patches/patch-ac
index 0ef222471b8..b922a0cecbd 100644
--- a/x11/xforms/patches/patch-ac
+++ b/x11/xforms/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2002/12/28 19:49:09 jschauma Exp $
+$NetBSD: patch-ac,v 1.5 2011/09/08 00:24:43 joerg Exp $
 
---- fd2ps/Imakefile.orig	2002-10-01 09:40:02.000000000 -0700
-+++ fd2ps/Imakefile	2002-12-25 10:39:45.000000000 -0800
-@@ -32,7 +32,7 @@
+--- fd2ps/Imakefile.orig	2002-10-01 16:40:02.000000000 +0000
++++ fd2ps/Imakefile
+@@ -32,7 +32,7 @@ OBJS	= $(SRCS:.c=.o)
  #if !defined( PpcDarwinArchitecture )
  FORMSLIBDIR     = $(TOP)/lib
  FORMSINCDIR     = $(FORMSLIBDIR)       
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2002/12/28 19:49:09 jschauma Exp $
  DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
  #endif
  
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ EXTRA_INCLUDES  = \
  		  -I.
  
  DEPEND_DEFINES	= \
@@ -20,3 +20,12 @@ $NetBSD: patch-ac,v 1.4 2002/12/28 19:49:09 jschauma Exp $
  
  EXTRA_LIBRARIES	= \
  		  $(STATIC) \
+@@ -83,7 +83,7 @@ PSRCS	= $(SPLSRCS) \
+ CDEBUGFLAGS	= -g $(OPTIMIZER)
+ #if Optimize
+ IMAKE_OPTIMIZE  = -DDoOptimize=1
+-OPTIMIZER	= -O4
++OPTIMIZER	= -O2
+ #else
+ OPTIMIZER	=
+ #endif