[pkgsrc/trunk]: pkgsrc/security/libfwbuilder - Link libraries against the pth...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ae05458695e
branches:  trunk
changeset: 509598:6ae05458695e
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Mar 12 06:56:30 2006 +0000

description:
- 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.

diffstat:

 security/libfwbuilder/Makefile         |  11 ++++-------
 security/libfwbuilder/PLIST            |   4 +---
 security/libfwbuilder/distinfo         |   7 +++++--
 security/libfwbuilder/patches/patch-aa |  12 ++++++++++++
 security/libfwbuilder/patches/patch-ab |  15 +++++++++++----
 security/libfwbuilder/patches/patch-ac |  12 ++++++++++++
 security/libfwbuilder/patches/patch-ad |  12 ++++++++++++
 7 files changed, 57 insertions(+), 16 deletions(-)

diffs (139 lines):

diff -r c8007047e735 -r 6ae05458695e security/libfwbuilder/Makefile
--- a/security/libfwbuilder/Makefile    Sun Mar 12 06:49:21 2006 +0000
+++ b/security/libfwbuilder/Makefile    Sun Mar 12 06:56:30 2006 +0000
@@ -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 @@
 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 -r c8007047e735 -r 6ae05458695e security/libfwbuilder/PLIST
--- a/security/libfwbuilder/PLIST       Sun Mar 12 06:49:21 2006 +0000
+++ b/security/libfwbuilder/PLIST       Sun Mar 12 06:56:30 2006 +0000
@@ -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 @@
 @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 -r c8007047e735 -r 6ae05458695e security/libfwbuilder/distinfo
--- a/security/libfwbuilder/distinfo    Sun Mar 12 06:49:21 2006 +0000
+++ b/security/libfwbuilder/distinfo    Sun Mar 12 06:56:30 2006 +0000
@@ -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 -r c8007047e735 -r 6ae05458695e security/libfwbuilder/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libfwbuilder/patches/patch-aa    Sun Mar 12 06:56:30 2006 +0000
@@ -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 -r c8007047e735 -r 6ae05458695e security/libfwbuilder/patches/patch-ab
--- a/security/libfwbuilder/patches/patch-ab    Sun Mar 12 06:49:21 2006 +0000
+++ b/security/libfwbuilder/patches/patch-ab    Sun Mar 12 06:56:30 2006 +0000
@@ -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 @@
  }
  }
  
+@@ -45,5 +43,6 @@ exists(qmake2.inc) {
+ }
+ 
+ CONFIG     -= qt
++CONFIG     += thread
+ 
+ INSTALLS   += target
diff -r c8007047e735 -r 6ae05458695e security/libfwbuilder/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libfwbuilder/patches/patch-ac    Sun Mar 12 06:56:30 2006 +0000
@@ -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 -r c8007047e735 -r 6ae05458695e security/libfwbuilder/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libfwbuilder/patches/patch-ad    Sun Mar 12 06:56:30 2006 +0000
@@ -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
+