- Link libraries against the pthread library since pthread_* functions are

  called.  Also include pthread.buildlink3.mk directly.
- With the update of qt3-tools to use the libtool mode of qmake, it is
  unnecessary to install files manually; "make install" just works.

Bump PKGREVISION.

7 files changed, 57 insertions, 16 deletions

diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index 17e9a6d3b42..ac5be18e074 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/12 06:56:30 minskim Exp $
 
 DISTNAME=	libfwbuilder-2.0.10
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
@@ -14,15 +14,12 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 
-post-install:
-	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/src/fwbuilder/libfwbuilder.la ${PREFIX}/lib
-	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/src/fwcompiler/libfwcompiler.la ${PREFIX}/lib
-	${LIBTOOL} --mode=finish ${PREFIX}/lib
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
+BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb5
 .include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libfwbuilder/PLIST b/security/libfwbuilder/PLIST
index 320bbe64170..b37d4566085 100644
--- a/security/libfwbuilder/PLIST
+++ b/security/libfwbuilder/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/12/12 20:25:09 bad Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/12 06:56:30 minskim Exp $
 bin/libfwbuilder-config-2
 include/fwb-2.0/fwbuilder/Address.h
 include/fwb-2.0/fwbuilder/AddressRange.h
@@ -61,8 +61,6 @@ include/fwb-2.0/fwcompiler/RuleProcessor.h
 @dirrm include/fwb-2.0
 lib/libfwbuilder.la
 lib/libfwcompiler.la
-lib/libfwbuilder.so.6.3
-lib/libfwcompiler.so.6.3
 share/doc/libfwbuilder-${PKGVERSION}/AUTHORS
 share/doc/libfwbuilder-${PKGVERSION}/COPYING
 share/doc/libfwbuilder-${PKGVERSION}/ChangeLog
diff --git a/security/libfwbuilder/distinfo b/security/libfwbuilder/distinfo
index b0d6041b161..18c294eb7e3 100644
--- a/security/libfwbuilder/distinfo
+++ b/security/libfwbuilder/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/12/12 20:25:09 bad Exp $
+$NetBSD: distinfo,v 1.8 2006/03/12 06:56:30 minskim Exp $
 
 SHA1 (libfwbuilder-2.0.10.tar.gz) = 8c275bcfc7c04bcb34aa818c5c8116f24407f974
 RMD160 (libfwbuilder-2.0.10.tar.gz) = 52421549d403785421a667c0dd4238d2cecf6b16
 Size (libfwbuilder-2.0.10.tar.gz) = 281849 bytes
-SHA1 (patch-ab) = 19fa206f433cec8dbd4a8cd1cb78415b5413536d
+SHA1 (patch-aa) = 05475a05f746fa05e6df5fc9d63cd3d344717a8d
+SHA1 (patch-ab) = fc285986f8c930ef7f46dbeaf3f26eab91bf5dda
+SHA1 (patch-ac) = 044c4d42df1dea1126dfba2af960d6f8ebeffd6d
+SHA1 (patch-ad) = 92279523b583aba763cfa89e42ee387e630b65de
diff --git a/security/libfwbuilder/patches/patch-aa b/security/libfwbuilder/patches/patch-aa
new file mode 100644
index 00000000000..93706b097cb
--- /dev/null
+++ b/security/libfwbuilder/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.4 2006/03/12 06:56:30 minskim Exp $
+
+--- etc/etc.pro.orig	2004-09-08 05:34:46.000000000 +0000
++++ etc/etc.pro
+@@ -8,6 +8,7 @@ TEMPLATE = app
+ QMAKE_RUN_CC  = @echo
+ QMAKE_RUN_CXX = @echo
+ QMAKE_LINK    = @echo
++QMAKE_LIBTOOL = @echo
+ 
+ TARGET        = etc
+ 
diff --git a/security/libfwbuilder/patches/patch-ab b/security/libfwbuilder/patches/patch-ab
index 70fb65d0790..a00d874d33f 100644
--- a/security/libfwbuilder/patches/patch-ab
+++ b/security/libfwbuilder/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2005/10/27 22:09:23 bad Exp $
+$NetBSD: patch-ab,v 1.4 2006/03/12 06:56:30 minskim Exp $
 
---- qmake.inc.in.orig	2005-04-26 09:16:02.000000000 +0200
-+++ qmake.inc.in	2005-10-27 21:59:46.000000000 +0200
-@@ -27,11 +27,9 @@
+--- qmake.inc.in.orig	2005-04-26 07:16:02.000000000 +0000
++++ qmake.inc.in
+@@ -27,11 +27,9 @@ unix {
  	migration.path          =$(DDIR)@TEMPLATE_DIR@/migration
  	doc.path                =$(DDIR)@DOCDIR@
  
@@ -15,3 +15,10 @@ $NetBSD: patch-ab,v 1.3 2005/10/27 22:09:23 bad Exp $
  }
  }
  
+@@ -45,5 +43,6 @@ exists(qmake2.inc) {
+ }
+ 
+ CONFIG     -= qt
++CONFIG     += thread
+ 
+ INSTALLS   += target
diff --git a/security/libfwbuilder/patches/patch-ac b/security/libfwbuilder/patches/patch-ac
new file mode 100644
index 00000000000..fa47bce1719
--- /dev/null
+++ b/security/libfwbuilder/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2006/03/12 06:56:30 minskim Exp $
+
+--- doc/doc.pro.orig	2004-09-08 05:34:46.000000000 +0000
++++ doc/doc.pro
+@@ -8,6 +8,7 @@ TEMPLATE = app
+ QMAKE_RUN_CC  = @echo
+ QMAKE_RUN_CXX = @echo
+ QMAKE_LINK    = @echo
++QMAKE_LIBTOOL = @echo
+ 
+ TARGET        = 
+ 
diff --git a/security/libfwbuilder/patches/patch-ad b/security/libfwbuilder/patches/patch-ad
new file mode 100644
index 00000000000..0d624fb6168
--- /dev/null
+++ b/security/libfwbuilder/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.3 2006/03/12 06:56:30 minskim Exp $
+
+--- migration/migration.pro.orig	2005-10-23 06:21:55.000000000 +0000
++++ migration/migration.pro
+@@ -8,6 +8,7 @@ TEMPLATE = app
+ QMAKE_RUN_CC  = @echo
+ QMAKE_RUN_CXX = @echo
+ QMAKE_LINK    = @echo
++QMAKE_LIBTOOL = @echo
+ 
+ TARGET        = etc
+