[pkgsrc/trunk]: pkgsrc/x11/gtk2 Use BUILDLINK_LDFLAGS.pthread rather than har...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/98433124d0ab
branches:  trunk
changeset: 493513:98433124d0ab
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun May 08 09:07:08 2005 +0000

description:
Use BUILDLINK_LDFLAGS.pthread rather than hardcoding -pthread in build
files for portability.  Closes PR pkg/29190 by Todd Willey.

diffstat:

 x11/gtk2/Makefile         |  8 +++++++-
 x11/gtk2/distinfo         |  4 ++--
 x11/gtk2/patches/patch-aa |  4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r bba74ffaf9b9 -r 98433124d0ab x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Sun May 08 06:33:35 2005 +0000
+++ b/x11/gtk2/Makefile Sun May 08 09:07:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2005/04/15 13:47:25 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2005/05/08 09:07:08 jmmv Exp $
 #
 
 DISTNAME=              gtk+-2.6.7
@@ -54,6 +54,12 @@
                                { print "@unexec $${RMDIR} %D/" $$2 \
                                  " 2>/dev/null || $${TRUE}"; next; }
 
+SUBST_CLASSES=         pthread
+SUBST_STAGE.pthread=   pre-configure
+SUBST_MESSAGE.pthread= "Fixing pthread flags."
+SUBST_SED.pthread=     -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
+SUBST_FILES.pthread=   gdk-pixbuf/Makefile.in
+
 .include "../../mk/compiler.mk"
 
 # work around /**/ in a macro definition in X11/Xlibint.h (GetEmptyReq)
diff -r bba74ffaf9b9 -r 98433124d0ab x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Sun May 08 06:33:35 2005 +0000
+++ b/x11/gtk2/distinfo Sun May 08 09:07:08 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2005/04/15 13:47:25 wiz Exp $
+$NetBSD: distinfo,v 1.45 2005/05/08 09:07:08 jmmv Exp $
 
 SHA1 (gtk+-2.6.7.tar.bz2) = 3a583ae6b468ded5dfcdc87cbd4f487d56b3e2c7
 RMD160 (gtk+-2.6.7.tar.bz2) = c664442d779f7fd1668a0294aa66d687f34601e4
 Size (gtk+-2.6.7.tar.bz2) = 11424614 bytes
-SHA1 (patch-aa) = 586ddbb1aa39a3ddaf92687df3952a71312ce3e8
+SHA1 (patch-aa) = 4991da77c0d8ad79ca616c7e6d80449863725b00
 SHA1 (patch-ac) = d9a47653b8db5ffae28dc233aea0dc15399eea79
 SHA1 (patch-ad) = 1c93a494fa2040a1ec936cfd1fe31756b0fe3847
 SHA1 (patch-ae) = 1fdeeef405b2045f26335f0bb607e3c3d24b3ae6
diff -r bba74ffaf9b9 -r 98433124d0ab x11/gtk2/patches/patch-aa
--- a/x11/gtk2/patches/patch-aa Sun May 08 06:33:35 2005 +0000
+++ b/x11/gtk2/patches/patch-aa Sun May 08 09:07:08 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.13 2005/04/15 13:47:25 wiz Exp $
+$NetBSD: patch-aa,v 1.14 2005/05/08 09:07:08 jmmv Exp $
 
 --- gdk-pixbuf/Makefile.in.orig        2005-04-12 22:31:06.000000000 +0200
 +++ gdk-pixbuf/Makefile.in
@@ -7,7 +7,7 @@
  
  gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
 -gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
-+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) -lpthread
++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) __PTHREAD_FLAGS__
  
  gdk_pixbuf_query_loaders_SOURCES = queryloaders.c