Honour user CFLAGS.

8 files changed, 85 insertions, 20 deletions

diff --git a/graphics/lprof/distinfo b/graphics/lprof/distinfo
index 85d88f9129e..f4ad6ae4b77 100644
--- a/graphics/lprof/distinfo
+++ b/graphics/lprof/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.4 2011/12/22 16:31:15 joerg Exp $
+$NetBSD: distinfo,v 1.5 2012/12/24 21:11:17 joerg Exp $
 
 SHA1 (lprof-1.10.1.tar.gz) = ad7cc5fff5d6dfff9d0993d201232d7bb71a46aa
 RMD160 (lprof-1.10.1.tar.gz) = d4a20cffe42a2ca12a1321a2e6013756e447300f
 Size (lprof-1.10.1.tar.gz) = 1244587 bytes
-SHA1 (patch-aa) = 8ce9546f07a51ed058764bffb1a6ece5d71c5273
-SHA1 (patch-ab) = 985c93fb70f1a947d0feb1785eb5a00d46ade8a2
-SHA1 (patch-ac) = 24fe5629f7f02b4c737b5cbbe81edff01c5a33e9
-SHA1 (patch-ad) = 48c7e62c4bed40607dfce8dfb557f172d2c9b85a
-SHA1 (patch-ae) = 95ea6012a05500ad6ef0c919ac8d818b23ddc6a7
-SHA1 (patch-af) = 4858e11e9905beb95bb89949c6a03067babf8c9a
+SHA1 (patch-aa) = 5ee77dffc9d5f30fe72dca7262903fc88988a8f9
+SHA1 (patch-ab) = 727da3358b8595c49b4e470a60808685a9b84ac9
+SHA1 (patch-ac) = cffb4deaf8073ea3b12531c6ab0b8de655cad07e
+SHA1 (patch-ad) = 711c753f811fdf598b1ec6cb103e7404099847c8
+SHA1 (patch-ae) = d7631e2f1ca3c206ca604fc71c6706a767f01a42
+SHA1 (patch-af) = 1e8c4dbe4650bfffb892d831ed94b2317e83ae1d
 SHA1 (patch-ag) = b6fcbffc42a5d2621c48b3f42c7b9da99294ce41
 SHA1 (patch-src_liblprof_lcmsprf.h) = c87f25db911674f5939844dc0f56fe70bd1cd12a
+SHA1 (patch-src_libqtlcmswidgets_Makefile) = 48631cf675443692845f23c60e614d87186905ca
diff --git a/graphics/lprof/patches/patch-aa b/graphics/lprof/patches/patch-aa
index 66c5c7afa85..05ae3f10f3d 100644
--- a/graphics/lprof/patches/patch-aa
+++ b/graphics/lprof/patches/patch-aa
@@ -1,7 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/11/06 00:51:48 gdt Exp $
+$NetBSD: patch-aa,v 1.2 2012/12/24 21:11:17 joerg Exp $
 
---- src/liblprof/Makefile.orig	2005-08-19 21:11:53.000000000 -0400
+--- src/liblprof/Makefile.orig	2005-08-20 01:11:53.000000000 +0000
 +++ src/liblprof/Makefile
+@@ -1,6 +1,6 @@
+ SHELL = /bin/sh
+ 
+-CFLAGS  = -g -O4 -fomit-frame-pointer -Wall
++CFLAGS  += -fomit-frame-pointer -Wall
+ 
+ ifndef BASEDIR
+ BASEDIR = $(DESTDIR)/usr/local
 @@ -50,7 +50,7 @@ clean:
  
  install: liblprof.a
diff --git a/graphics/lprof/patches/patch-ab b/graphics/lprof/patches/patch-ab
index a66199f3a41..3e9d5c35dfa 100644
--- a/graphics/lprof/patches/patch-ab
+++ b/graphics/lprof/patches/patch-ab
@@ -1,8 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2005/11/06 01:47:47 gdt Exp $
+$NetBSD: patch-ab,v 1.2 2012/12/24 21:11:17 joerg Exp $
 
---- src/ICCtoIT8/Makefile.orig	2005-08-19 21:11:52.000000000 -0400
+--- src/ICCtoIT8/Makefile.orig	2005-08-20 01:11:52.000000000 +0000
 +++ src/ICCtoIT8/Makefile
-@@ -30,7 +30,7 @@ PROGRAM=icc2it8
+@@ -24,13 +24,13 @@ ifndef EXESUFFIX
+ EXESUFFIX=
+ endif
+ 
+-CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../liblprof -L../liblprof
++CFLAGS += -fomit-frame-pointer -Wall -I../liblprof -L../liblprof
+ PROGRAM=icc2it8
+ 
  all:	icc2it8
  
  icc2it8: icc2it8.o getopt.o
diff --git a/graphics/lprof/patches/patch-ac b/graphics/lprof/patches/patch-ac
index 224be3636ab..edae3f5440f 100644
--- a/graphics/lprof/patches/patch-ac
+++ b/graphics/lprof/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.1 2005/11/06 01:47:47 gdt Exp $
+$NetBSD: patch-ac,v 1.2 2012/12/24 21:11:17 joerg Exp $
 
---- src/qtMeasurementTool/Makefile.orig	2005-08-19 21:11:46.000000000 -0400
+--- src/qtMeasurementTool/Makefile.orig	2005-08-20 01:11:46.000000000 +0000
 +++ src/qtMeasurementTool/Makefile
+@@ -63,7 +63,7 @@ endif
+ # some settings
+ INCLUDES = -I../liblprof -I../libqtlcmswidgets -I$(QT_INCDIR) -I. $(KDEINCLUDE)
+ LIBS     = -L$(QT_LIBDIR) -L../liblprof -L../libqtlcmswidgets $(KDELIBDIR)
+-CFLAGS   = -O4 -Wall $(KDEFLAGS)
++CFLAGS   += -Wall $(KDEFLAGS)
+ POSTLIB  = $(KDEPOSTLIB) -lqt-mt -llcms -lm -lqtlcmswidgets -llprof -ltiff
+ 
+ OBJECTS=main.o qtmeasurementtooldialog.o qtmeasurementtooldialogbase.o moc_qtmeasurementtooldialog.o moc_qtmeasurementtooldialogbase.o qtiffio.o
 @@ -73,7 +73,7 @@ all: $(PROGRAM)
  
  $(PROGRAM):  $(OBJECTS)
diff --git a/graphics/lprof/patches/patch-ad b/graphics/lprof/patches/patch-ad
index 473f71da561..e26c2c1b37a 100644
--- a/graphics/lprof/patches/patch-ad
+++ b/graphics/lprof/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2005/11/06 01:47:47 gdt Exp $
+$NetBSD: patch-ad,v 1.2 2012/12/24 21:11:17 joerg Exp $
 
---- src/qtMonitorProfiler/Makefile.orig	2005-08-19 21:11:31.000000000 -0400
+--- src/qtMonitorProfiler/Makefile.orig	2005-08-20 01:11:31.000000000 +0000
 +++ src/qtMonitorProfiler/Makefile
+@@ -64,7 +64,7 @@ endif
+ # some settings
+ INCLUDES = -I../liblprof -I../libqtlcmswidgets -I$(QT_INCDIR) -I. $(KDEINCLUDE)
+ LIBS     = -L$(QT_LIBDIR) -L../liblprof -L../libqtlcmswidgets $(KDELIBDIR)
+-CFLAGS   = -O4 -Wall $(KDEFLAGS)
++CFLAGS   += -Wall $(KDEFLAGS)
+ POSTLIB  = $(KDEPOSTLIB) -lqt-mt -lqtlcmswidgets -llprof -llcms -lm
+ OBJECTS=main.o qtmonitorprofilerdialog.o qtmonitorprofilerdialogbase.o moc_qtmonitorprofilerdialog.o moc_qtmonitorprofilerdialogbase.o
+ 
 @@ -73,7 +73,7 @@ all: $(PROGRAM)
  
  $(PROGRAM):  $(OBJECTS)
diff --git a/graphics/lprof/patches/patch-ae b/graphics/lprof/patches/patch-ae
index 2a9e37a5bc7..216d79b30bc 100644
--- a/graphics/lprof/patches/patch-ae
+++ b/graphics/lprof/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2005/11/06 01:47:47 gdt Exp $
+$NetBSD: patch-ae,v 1.2 2012/12/24 21:11:17 joerg Exp $
 
---- src/qtProfileChecker/Makefile.orig	2005-08-19 21:11:25.000000000 -0400
+--- src/qtProfileChecker/Makefile.orig	2005-08-20 01:11:25.000000000 +0000
 +++ src/qtProfileChecker/Makefile
+@@ -65,7 +65,7 @@ endif
+ INCLUDES = -I../liblprof -I../libqtlcmswidgets -I$(QT_INCDIR) -I. $(KDEINCLUDE)
+ LIBS     = -L$(QT_LIBDIR) -L../liblprof -L../libqtlcmswidgets $(KDELIBDIR)
+ 
+-CFLAGS   = -O4 -Wall $(KDEFLAGS)
++CFLAGS   += -Wall $(KDEFLAGS)
+ POSTLIB  = $(KDEPOSTLIB) -lqt-mt -lqtlcmswidgets -llprof -llcms -lm
+ OBJECTS=main.o qtdrawcurve.o qtcietonge.o qtprofilecheckerdialog.o qtprofilecheckerdialogbase.o moc_qtprofilecheckerdialog.o moc_qtprofilecheckerdialogbase.o
+ 
 @@ -74,7 +74,7 @@ all: $(PROGRAM)
  
  $(PROGRAM):  $(OBJECTS)
diff --git a/graphics/lprof/patches/patch-af b/graphics/lprof/patches/patch-af
index 17284b832bb..3dbee532927 100644
--- a/graphics/lprof/patches/patch-af
+++ b/graphics/lprof/patches/patch-af
@@ -1,7 +1,16 @@
-$NetBSD: patch-af,v 1.1 2005/11/06 01:47:47 gdt Exp $
+$NetBSD: patch-af,v 1.2 2012/12/24 21:11:17 joerg Exp $
 
---- src/qtScannerProfiler/Makefile.orig	2005-08-19 21:11:41.000000000 -0400
+--- src/qtScannerProfiler/Makefile.orig	2005-08-20 01:11:41.000000000 +0000
 +++ src/qtScannerProfiler/Makefile
+@@ -64,7 +64,7 @@ endif
+ # some settings
+ INCLUDES = -I../liblprof -I../libqtlcmswidgets -I$(QT_INCDIR) -I. $(KDEINCLUDE)
+ LIBS     = -L$(QT_LIBDIR) -L../liblprof -L../libqtlcmswidgets $(KDELIBDIR)
+-CFLAGS   = -O4 -Wall $(KDEFLAGS)
++CFLAGS   += -Wall $(KDEFLAGS)
+ POSTLIB  = $(KDEPOSTLIB) -lqt-mt -lqtlcmswidgets -llprof -llcms -lm
+ OBJECTS=main.o qtscannerprofilerdialog.o qtscannerprofilerdialogbase.o moc_qtscannerprofilerdialog.o moc_qtscannerprofilerdialogbase.o
+ 
 @@ -73,7 +73,7 @@ all: $(PROGRAM)
  
  $(PROGRAM):  $(OBJECTS)
diff --git a/graphics/lprof/patches/patch-src_libqtlcmswidgets_Makefile b/graphics/lprof/patches/patch-src_libqtlcmswidgets_Makefile
new file mode 100644
index 00000000000..d3610cbcd36
--- /dev/null
+++ b/graphics/lprof/patches/patch-src_libqtlcmswidgets_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_libqtlcmswidgets_Makefile,v 1.1 2012/12/24 21:11:17 joerg Exp $
+
+--- src/libqtlcmswidgets/Makefile.orig	2012-12-23 17:28:41.000000000 +0000
++++ src/libqtlcmswidgets/Makefile
+@@ -60,7 +60,7 @@ endif
+ # some settings
+ INCLUDES = -I../liblprof/ -I. -I$(QT_INCDIR) $(KDEINCLUDE)
+ LIBS     = -L$(QT_LIBDIR) -L../liblprof $(KDELIBDIR)
+-CFLAGS   = -O4 -Wall $(KDEFLAGS)
++CFLAGS   += -Wall $(KDEFLAGS)
+ POSTLIB  = $(KDEPOSTLIB) -lqt-mt -llprof -llcms -lm
+ 
+ all: libqtlcmswidgets.a