Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now that they're added

automatically by pthread.buildlink3.mk.  Also, factor out the pthread
library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS
and use it in packages where necessary (usually the ones that don't
have a GNU configure script).

4 files changed, 2 insertions, 31 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index a3678ca0330..b1c5244b2d2 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2004/10/13 07:28:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.66 2004/11/12 06:39:21 jlam Exp $
 #
 
 DISTNAME=		gtk+-2.4.13
@@ -32,7 +32,6 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV+=		ac_cv_header_X11_extensions_Xinerama_h=no
 CONFIGURE_ENV+=		ac_cv_lib_Xinerama_XineramaQueryExtension=no
 MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+=		PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
 TEST_TARGET=		check
 
 PKGCONFIG_OVERRIDE=	gdk-2.0.pc.in
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 155483dd6fe..f537f0b0f33 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.32 2004/10/13 07:28:36 jmmv Exp $
+$NetBSD: distinfo,v 1.33 2004/11/12 06:39:21 jlam Exp $
 
 SHA1 (gtk+-2.4.13.tar.bz2) = d57ad7165317e580cb7fda7719e767232e6697b6
 Size (gtk+-2.4.13.tar.bz2) = 9272024 bytes
-SHA1 (patch-aa) = 05be7ab51f2e9297f68e4b51a0086ff64ace970b
-SHA1 (patch-ab) = 00ffc4436c64bd45042232a0a376d8a69de35d40
 SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
deleted file mode 100644
index f6a4ddef174..00000000000
--- a/x11/gtk2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2004/04/01 18:15:41 jmmv Exp $
-
---- gdk-pixbuf/Makefile.in.orig	2004-03-09 16:08:28.000000000 +0100
-+++ gdk-pixbuf/Makefile.in
-@@ -751,7 +751,7 @@ gdk_pixbuf_csource_LDFLAGS =
- am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT)
- gdk_pixbuf_query_loaders_OBJECTS = \
- 	$(am_gdk_pixbuf_query_loaders_OBJECTS)
--gdk_pixbuf_query_loaders_LDFLAGS =
-+gdk_pixbuf_query_loaders_LDFLAGS = $(PTHREAD_LDFLAGS)
- test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c
- test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT)
- test_gdk_pixbuf_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
deleted file mode 100644
index 61a914a54fd..00000000000
--- a/x11/gtk2/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2004/04/01 18:15:41 jmmv Exp $
-
---- gtk/Makefile.in.orig	2004-03-09 16:08:31.000000000 +0100
-+++ gtk/Makefile.in
-@@ -1113,7 +1113,7 @@ PROGRAMS = $(bin_PROGRAMS)
- 
- am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT)
- gtk_query_immodules_2_0_OBJECTS = $(am_gtk_query_immodules_2_0_OBJECTS)
--gtk_query_immodules_2_0_LDFLAGS =
-+gtk_query_immodules_2_0_LDFLAGS = $(PTHREAD_LDFLAGS)
- 
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp