[pkgsrc/trunk]: pkgsrc/wm/icecc Link explicitly against thread libs when usin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/92e6f8fcc48e
branches:  trunk
changeset: 511038:92e6f8fcc48e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Apr 08 16:30:57 2006 +0000

description:
Link explicitly against thread libs when using libqt-mt. Honour MAKE_ENV
when calling gmake manually as well.

diffstat:

 wm/icecc/Makefile         |  5 +++--
 wm/icecc/distinfo         |  4 ++--
 wm/icecc/patches/patch-aa |  4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r f93d23c908ed -r 92e6f8fcc48e wm/icecc/Makefile
--- a/wm/icecc/Makefile Sat Apr 08 16:13:56 2006 +0000
+++ b/wm/icecc/Makefile Sat Apr 08 16:30:57 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:13 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/08 16:30:57 joerg Exp $
 
 # Package version reflects icecc version, with PKGREVISION incremented
 # for any tool updates, according to the authors scheme.
@@ -58,7 +58,7 @@
 .   endfor
 
 post-build:
-       cd ${WRKSRC}/icewm4vim && ${GMAKE} QTDIR=${QTDIR}
+       cd ${WRKSRC}/icewm4vim && ${SETENV} ${MAKE_ENV} ${GMAKE} QTDIR=${QTDIR}
 
 post-install:
 .   for script in ${PYTHON_PATCH_SCRIPTS}
@@ -76,4 +76,5 @@
 # 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 "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f93d23c908ed -r 92e6f8fcc48e wm/icecc/distinfo
--- a/wm/icecc/distinfo Sat Apr 08 16:13:56 2006 +0000
+++ b/wm/icecc/distinfo Sat Apr 08 16:30:57 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/06/25 01:55:08 reed Exp $
+$NetBSD: distinfo,v 1.2 2006/04/08 16:30:57 joerg Exp $
 
 SHA1 (icecc-2.9.tar.bz2) = acfdf16a71833e80ad2f1267cadf31297050e41d
 RMD160 (icecc-2.9.tar.bz2) = 9cb70c8df6493eb7984f13821006734459ac0bcc
@@ -36,6 +36,6 @@
 SHA1 (icewoed-1.8.tar.bz2) = ca58b5769c27ee587458c12c285e231b990c3da9
 RMD160 (icewoed-1.8.tar.bz2) = 51cf2873f005e8c74239b138d6e5b9f8a1505047
 Size (icewoed-1.8.tar.bz2) = 21955 bytes
-SHA1 (patch-aa) = 5cb9125f34c6adb949aad6806560d1fca0916dae
+SHA1 (patch-aa) = 145aa9580bb9984513382b6f5c643974ea6744fe
 SHA1 (patch-ab) = e4cefad52c55b548e1e59dd40799d5cbee9477fe
 SHA1 (patch-ac) = d695ab2fe41c6eba3e827a0f7db59fbf4b376805
diff -r f93d23c908ed -r 92e6f8fcc48e wm/icecc/patches/patch-aa
--- a/wm/icecc/patches/patch-aa Sat Apr 08 16:13:56 2006 +0000
+++ b/wm/icecc/patches/patch-aa Sat Apr 08 16:30:57 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/06/25 01:55:08 reed Exp $
+$NetBSD: patch-aa,v 1.2 2006/04/08 16:30:57 joerg Exp $
 
 these utilities were written with qt2 but they still ok with qt3
 
@@ -7,7 +7,7 @@
 @@ -1,10 +1,10 @@
  INCLUDE_QT = -I$(QTDIR)/include
 -LIB_QT = -L$(QTDIR)/lib
-+LIB_QT = -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib
++LIB_QT = -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  
  all: icefonsel icecolsel