From 69ea790b80f5b75cc0d7b427982bf5d94188a09c Mon Sep 17 00:00:00 2001
From: gavan <gavan@pkgsrc.org>
Date: Thu, 28 Oct 2004 10:28:49 +0000
Subject: Pay attention to LDFLAGS when building qmake. This allows qmake to
 link correctly against pkgsrc gcc.

---
 x11/qt3-libs/distinfo         |  4 ++--
 x11/qt3-libs/patches/patch-af | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'x11')

diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 71567e6437b..d0c3ddd8948 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2004/10/13 15:15:52 tv Exp $
+$NetBSD: distinfo,v 1.28 2004/10/28 10:28:49 gavan Exp $
 
 SHA1 (qt-x11-free-3.3.3.tar.bz2) = b9737d8dc0c440a7d28f1f0a164e49f7bd242585
 Size (qt-x11-free-3.3.3.tar.bz2) = 14424812 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52
 SHA1 (patch-ad) = 09afcc6c8a3a2f93131fdbf4be50d3e313792374
 SHA1 (patch-ae) = 2ec0b408edd78daa03c02c654e0ce515933f36e7
-SHA1 (patch-af) = dde2d3cd4fa9eab0105ee097182a172756002347
+SHA1 (patch-af) = 513b0419dcbe0d2e65d9912868effcf0681119ae
 SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913
 SHA1 (patch-ah) = aa34fde5c1ef71ebb35a00b376236acffb04fc16
 SHA1 (patch-ai) = 582a02a1b697ef038cd5a8ead5dd3b0910e6297b
diff --git a/x11/qt3-libs/patches/patch-af b/x11/qt3-libs/patches/patch-af
index 7d272314665..03cf90db122 100644
--- a/x11/qt3-libs/patches/patch-af
+++ b/x11/qt3-libs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2004/04/30 11:29:00 adam Exp $
+$NetBSD: patch-af,v 1.4 2004/10/28 10:28:49 gavan Exp $
 
---- qmake/Makefile.unix.orig	2004-04-30 10:53:49.000000000 +0000
+--- qmake/Makefile.unix.orig	2004-06-02 23:24:30.000000000 +0100
 +++ qmake/Makefile.unix
-@@ -32,7 +32,7 @@ DEPEND_SRC=project.cpp property.cpp meta
+@@ -32,12 +32,12 @@ DEPEND_SRC=project.cpp property.cpp meta
  	   @SOURCE_PATH@/src/tools/qsettings.cpp @SOURCE_PATH@/src/tools/qurl.cpp \
  	   @SOURCE_PATH@/src/tools/qsettings_mac.cpp @SOURCE_PATH@/src/tools/qlocale.cpp
  
@@ -11,3 +11,9 @@ $NetBSD: patch-af,v 1.3 2004/04/30 11:29:00 adam Exp $
  	-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
  	-I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \
  	-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
+ 	-DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
+-LFLAGS=@QMAKE_LFLAGS@
++LFLAGS=@QMAKE_LFLAGS@ $(LDFLAGS)
+ 
+ qmake: $(OBJS) $(QOBJS)
+ 	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
-- 
cgit v1.2.3