Use the updated qt3-tools to use the libtool mode of qmake, and remove

runtime dependency on qt3-tools.

Bump PKGREVISION.

6 files changed, 88 insertions, 8 deletions

diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 603dd83d8dc..50c47abf2a9 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/12 06:58:42 minskim Exp $
 
 DISTNAME=	fwbuilder-2.0.10
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
@@ -19,11 +19,7 @@ QMAKE=		${QTDIR}/bin/qmake
 CONFIGURE_ENV+=	QMAKE=${QMAKE:Q}
 MAKE_ENV+=	QMAKE=${QMAKE:Q}
 
-# XXX Please verify whether qt3-tools is really needed at run-time.
-# If it is, then remove this comment.  If it is not, then remove
-# this comment and the line below, and bump PKGREVISION.
-BUILDLINK_DEPMETHOD.qt3-tools=	full
-
 .include "../../security/libfwbuilder/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/fwbuilder/distinfo b/security/fwbuilder/distinfo
index c9c93f198b4..5fd72a03fd3 100644
--- a/security/fwbuilder/distinfo
+++ b/security/fwbuilder/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/12/12 20:25:09 bad Exp $
+$NetBSD: distinfo,v 1.6 2006/03/12 06:58:42 minskim Exp $
 
 SHA1 (fwbuilder-2.0.10.tar.gz) = da0114e712e541b763de33a9d5146e3b9f733b34
 RMD160 (fwbuilder-2.0.10.tar.gz) = 8f17ab4d7271dee54c56ef89161ede6ea108ee58
 Size (fwbuilder-2.0.10.tar.gz) = 1385925 bytes
+SHA1 (patch-aa) = dadac6310b0d27c326209867ee356610907f099c
 SHA1 (patch-ab) = 19a0c4801785536b0e95e328fe7569c155308ce6
+SHA1 (patch-ac) = 74f94531167bebc473299bbc8d636173de7a5e3a
+SHA1 (patch-ad) = 593e9459076bb2b633507c17b489a66cbcac0f55
+SHA1 (patch-ae) = c88624f1b18c55deca7d722b46103b8a09f7c98a
diff --git a/security/fwbuilder/patches/patch-aa b/security/fwbuilder/patches/patch-aa
new file mode 100644
index 00000000000..375a0b1c2c0
--- /dev/null
+++ b/security/fwbuilder/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.3 2006/03/12 06:58:42 minskim Exp $
+
+--- po/po.pro.orig	2005-09-04 20:49:14.000000000 +0000
++++ po/po.pro
+@@ -7,11 +7,13 @@ win32 {
+   QMAKE_RUN_CC  = @echo
+   QMAKE_RUN_CXX = @echo
+   QMAKE_LINK    = @echo
++  QMAKE_LIBTOOL = @echo
+ }
+ !win32 {
+   QMAKE_RUN_CC  = @echo > /dev/null
+   QMAKE_RUN_CXX = @echo > /dev/null
+   QMAKE_LINK    = @echo > /dev/null
++  QMAKE_LIBTOOL = @echo > /dev/null
+ }
+ 
+ TARGET        = po
diff --git a/security/fwbuilder/patches/patch-ac b/security/fwbuilder/patches/patch-ac
new file mode 100644
index 00000000000..b104ec3159a
--- /dev/null
+++ b/security/fwbuilder/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.4 2006/03/12 06:58:42 minskim Exp $
+
+--- src/res/res.pro.orig	2005-07-06 06:05:01.000000000 +0000
++++ src/res/res.pro
+@@ -7,11 +7,13 @@ win32 {
+   QMAKE_RUN_CC  = @echo
+   QMAKE_RUN_CXX = @echo
+   QMAKE_LINK    = @echo
++  QMAKE_LIBTOOL = @echo
+ }
+ !win32 {
+   QMAKE_RUN_CC  = @echo > /dev/null
+   QMAKE_RUN_CXX = @echo > /dev/null
+   QMAKE_LINK    = @echo > /dev/null
++  QMAKE_LIBTOOL = @echo > /dev/null
+ }
+ 
+ 
diff --git a/security/fwbuilder/patches/patch-ad b/security/fwbuilder/patches/patch-ad
new file mode 100644
index 00000000000..93628e9adc9
--- /dev/null
+++ b/security/fwbuilder/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.4 2006/03/12 06:58:42 minskim Exp $
+
+--- src/tools/tools.pro.orig	2004-07-03 06:55:35.000000000 +0000
++++ src/tools/tools.pro
+@@ -7,18 +7,21 @@ win32 {
+ 	QMAKE_RUN_CC  = @echo
+ 	QMAKE_RUN_CXX = @echo
+ 	QMAKE_LINK    = @echo
++	QMAKE_LIBTOOL = @echo
+ }
+ 
+ unix {
+ 	QMAKE_RUN_CC  = @true
+ 	QMAKE_RUN_CXX = @true
+ 	QMAKE_LINK    = @true
++	QMAKE_LIBTOOL = @true
+ }
+ 
+ macx {
+ 	QMAKE_RUN_CC  = @true
+ 	QMAKE_RUN_CXX = @true
+ 	QMAKE_LINK    = @true
++	QMAKE_LIBTOOL = @true
+ }
+ 
+ TARGET        = tools
diff --git a/security/fwbuilder/patches/patch-ae b/security/fwbuilder/patches/patch-ae
new file mode 100644
index 00000000000..380e64fc84a
--- /dev/null
+++ b/security/fwbuilder/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.3 2006/03/12 06:58:42 minskim Exp $
+
+--- doc/doc.pro.orig	2005-11-02 06:42:02.000000000 +0000
++++ doc/doc.pro
+@@ -7,11 +7,13 @@ win32 {
+   QMAKE_RUN_CC  = @echo
+   QMAKE_RUN_CXX = @echo
+   QMAKE_LINK    = @echo
++  QMAKE_LIBTOOL = @echo
+ }
+ !win32 {
+   QMAKE_RUN_CC  = @echo > /dev/null
+   QMAKE_RUN_CXX = @echo > /dev/null
+   QMAKE_LINK    = @echo > /dev/null
++  QMAKE_LIBTOOL = @echo > /dev/null
+ }
+ 
+ TARGET      = doc