Need --tag=CC for libtool-2.

6 files changed, 91 insertions, 1 deletions

diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 1c13a674311..9c0298b17b7 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2008/03/04 09:22:27 wiz Exp $
+$NetBSD: distinfo,v 1.15 2010/07/18 13:05:07 obache Exp $
 
 SHA1 (pkg-config-0.23.tar.gz) = b59dddd6b5320bd74c0f74b3339618a327096b2a
 RMD160 (pkg-config-0.23.tar.gz) = 0aa5565430d609319917ac2c8ffeaa5e4a509489
@@ -9,3 +9,8 @@ SHA1 (patch-ad) = 4628f5ce73b3dcaa2df92e3be2fd7955ab38ffa4
 SHA1 (patch-ah) = 3cee7ec1a5592e2a550f74a3eb8da2a9e3ab1773
 SHA1 (patch-ca) = 22690d923ddf0e1ce2ca9eddb56ada385f6cefe4
 SHA1 (patch-cb) = 23412858615649c8d8305ce4e6571f06e17073fd
+SHA1 (patch-da) = 44d9810e2eed8dd38339418e6886add289ae504e
+SHA1 (patch-db) = 279708087c2740af812c123c880e4dde1402af4c
+SHA1 (patch-dc) = 27a8009eb6822608f3869bd71e5cb108edf4063a
+SHA1 (patch-dd) = d776d0e6a2907d629f8b6abc68b6f9fb23a9fc61
+SHA1 (patch-de) = 67c85c7076b2b624b7221f569ce755d6a6329a0d
diff --git a/devel/pkg-config/patches/patch-da b/devel/pkg-config/patches/patch-da
new file mode 100644
index 00000000000..ad707031f8e
--- /dev/null
+++ b/devel/pkg-config/patches/patch-da
@@ -0,0 +1,17 @@
+$NetBSD: patch-da,v 1.1 2010/07/18 13:05:07 obache Exp $
+
+--- Makefile.in.orig	2008-01-16 22:52:30.000000000 +0000
++++ Makefile.in
+@@ -209,10 +209,10 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/poptparse.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(pkg_config_SOURCES)
+ 
diff --git a/devel/pkg-config/patches/patch-db b/devel/pkg-config/patches/patch-db
new file mode 100644
index 00000000000..6039611662d
--- /dev/null
+++ b/devel/pkg-config/patches/patch-db
@@ -0,0 +1,17 @@
+$NetBSD: patch-db,v 1.1 2010/07/18 13:05:07 obache Exp $
+
+--- glib-1.2.10/gmodule/Makefile.in.orig	2008-01-16 22:52:27.000000000 +0000
++++ glib-1.2.10/gmodule/Makefile.in
+@@ -239,10 +239,10 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/testgmodule.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) \
+ 	$(libgplugin_b_la_SOURCES) testgmodule.c
diff --git a/devel/pkg-config/patches/patch-dc b/devel/pkg-config/patches/patch-dc
new file mode 100644
index 00000000000..001d9e6d251
--- /dev/null
+++ b/devel/pkg-config/patches/patch-dc
@@ -0,0 +1,17 @@
+$NetBSD: patch-dc,v 1.1 2010/07/18 13:05:07 obache Exp $
+
+--- glib-1.2.10/gthread/Makefile.in.orig	2008-01-16 22:52:27.000000000 +0000
++++ glib-1.2.10/gthread/Makefile.in
+@@ -210,10 +210,10 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/testgthread.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(libgthread_la_SOURCES) testgthread.c
+ DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am
diff --git a/devel/pkg-config/patches/patch-dd b/devel/pkg-config/patches/patch-dd
new file mode 100644
index 00000000000..e51a5c1a7e6
--- /dev/null
+++ b/devel/pkg-config/patches/patch-dd
@@ -0,0 +1,17 @@
+$NetBSD: patch-dd,v 1.1 2010/07/18 13:05:07 obache Exp $
+
+--- glib-1.2.10/Makefile.in.orig	2008-01-16 22:52:26.000000000 +0000
++++ glib-1.2.10/Makefile.in
+@@ -305,10 +305,10 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/testglib.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(libglib_la_SOURCES) testgdate.c testgdateparser.c \
+ 	testglib.c
diff --git a/devel/pkg-config/patches/patch-de b/devel/pkg-config/patches/patch-de
new file mode 100644
index 00000000000..d21ef083b69
--- /dev/null
+++ b/devel/pkg-config/patches/patch-de
@@ -0,0 +1,17 @@
+$NetBSD: patch-de,v 1.1 2010/07/18 13:05:07 obache Exp $
+
+--- glib-1.2.10/tests/Makefile.in.orig	2008-01-16 22:52:27.000000000 +0000
++++ glib-1.2.10/tests/Makefile.in
+@@ -266,10 +266,10 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/type-test.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = array-test.c dirname-test.c hash-test.c list-test.c \
+ 	node-test.c relation-test.c slist-test.c strfunc-test.c \