Fix build with new libtool: needs explicit --tag.

6 files changed, 129 insertions, 1 deletions

diff --git a/devel/coconut/distinfo b/devel/coconut/distinfo
index cc9162ad270..30fad7c05c2 100644
--- a/devel/coconut/distinfo
+++ b/devel/coconut/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.4 2007/11/30 21:13:53 rillig Exp $
+$NetBSD: distinfo,v 1.5 2009/12/21 19:30:25 joerg Exp $
 
 SHA1 (coconut-0.3.0.tar.gz) = 69c1c4cbf061def240f7c8c1636bdddb2c00da5b
 RMD160 (coconut-0.3.0.tar.gz) = 71098f8eb9a731f990534c98d532707ce93329dc
 Size (coconut-0.3.0.tar.gz) = 692317 bytes
 SHA1 (patch-aa) = ea9f4b49f55ae74a61f0b72687c973de71b14a7b
 SHA1 (patch-ab) = dec14730ce92d32e1bc53bc301f1b7e3dae32043
+SHA1 (patch-ac) = 183774158c890aecf10ed8799d1141400dc30f78
+SHA1 (patch-ad) = 0dc62013310a4e3ec0b1137a082eb94d9174fbda
+SHA1 (patch-ae) = a60890cee110b68e01211e5a8e97af70110e3410
+SHA1 (patch-af) = 4f84102e6e16601d5ade202054f851cf0cf831f5
+SHA1 (patch-ag) = b69ac4769cd675602e9c2f2cdc90ce9698cbf9a2
diff --git a/devel/coconut/patches/patch-ac b/devel/coconut/patches/patch-ac
new file mode 100644
index 00000000000..d3ffbb01c6b
--- /dev/null
+++ b/devel/coconut/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2009/12/21 19:30:25 joerg Exp $
+
+--- coconut/gtk/Makefile.in.orig	2009-12-21 19:04:31.000000000 +0000
++++ coconut/gtk/Makefile.in
+@@ -210,11 +210,11 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/cwindow.Plo
+ OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+-LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
++LTOBJCCOMPILE = $(LIBTOOL) --mode=compile --tag CC $(OBJC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_OBJCFLAGS) $(OBJCFLAGS)
+ OBJCLD = $(OBJC)
+-OBJCLINK = $(LIBTOOL) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
++OBJCLINK = $(LIBTOOL) --mode=link --tag CC $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(libcoconut_gtk_la_SOURCES)
+ HEADERS = $(libcoconut_gtkinclude_HEADERS)
diff --git a/devel/coconut/patches/patch-ad b/devel/coconut/patches/patch-ad
new file mode 100644
index 00000000000..011223e28c1
--- /dev/null
+++ b/devel/coconut/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2009/12/21 19:30:25 joerg Exp $
+
+--- coconut/gnet/Makefile.in.orig	2009-12-21 19:10:31.000000000 +0000
++++ coconut/gnet/Makefile.in
+@@ -121,8 +121,8 @@ install_sh = @install_sh@
+ SUFFIXES = .m .c
+ 
+ lib_LTLIBRARIES = libcoconut_gnet.la
+-LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS) $(LDFLAGS) -o $@
+-OBJCLINK = $(LIBTOOL) --mode=link $(OBJC) $(LIBS) $(OBJCLIBS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link --tag CC  $(CC) $(LIBS) $(LDFLAGS) -o $@
++OBJCLINK = $(LIBTOOL) --mode=link --tag CC  $(OBJC) $(LIBS) $(OBJCLIBS) $(LDFLAGS) -o $@
+ 
+ INCLUDES = -I$(top_srcdir) 
+ 
+@@ -179,7 +179,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/cnetstream.Plo
+ OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+-LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
++LTOBJCCOMPILE = $(LIBTOOL) --mode=compile --tag CC $(OBJC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_OBJCFLAGS) $(OBJCFLAGS)
+ OBJCLD = $(OBJC)
diff --git a/devel/coconut/patches/patch-ae b/devel/coconut/patches/patch-ae
new file mode 100644
index 00000000000..4642227237e
--- /dev/null
+++ b/devel/coconut/patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.1 2009/12/21 19:30:25 joerg Exp $
+
+--- coconut/gl/Makefile.in.orig	2009-12-21 19:12:53.000000000 +0000
++++ coconut/gl/Makefile.in
+@@ -121,8 +121,8 @@ install_sh = @install_sh@
+ SUFFIXES = .m .c
+ 
+ lib_LTLIBRARIES = libcoconut_gl.la
+-LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS) $(LDFLAGS) -o $@
+-OBJCLINK = $(LIBTOOL) --mode=link $(OBJC) $(LIBS) $(OBJCLIBS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(LIBS) $(LDFLAGS) -o $@
++OBJCLINK = $(LIBTOOL) --mode=link --tag=CC $(OBJC) $(LIBS) $(OBJCLIBS) $(LDFLAGS) -o $@
+ 
+ INCLUDES = -I$(top_srcdir) 
+ 
+@@ -165,7 +165,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/cglwidget.Plo
+ OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+-LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
++LTOBJCCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(OBJC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_OBJCFLAGS) $(OBJCFLAGS)
+ OBJCLD = $(OBJC)
diff --git a/devel/coconut/patches/patch-af b/devel/coconut/patches/patch-af
new file mode 100644
index 00000000000..15d53f42ec7
--- /dev/null
+++ b/devel/coconut/patches/patch-af
@@ -0,0 +1,30 @@
+$NetBSD: patch-af,v 1.1 2009/12/21 19:30:25 joerg Exp $
+
+--- coconut/Makefile.in.orig	2009-12-21 19:17:11.000000000 +0000
++++ coconut/Makefile.in
+@@ -132,8 +132,8 @@ SUBDIRS = $(gtk_subdir) $(gnet_subdir) $
+ SUFFIXES = .m .c
+ 
+ lib_LTLIBRARIES = libcoconut.la
+-LINK = $(LIBTOOL) --mode=link $(CC) $(LIBS) $(LDFLAGS) -o $@
+-OBJCLINK = $(LIBTOOL) --mode=link $(OBJC) $(LIBS) $(OBJCLIBS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(LIBS) $(LDFLAGS) -o $@
++OBJCLINK = $(LIBTOOL) --mode=link --tag=CC $(OBJC) $(LIBS) $(OBJCLIBS) $(LDFLAGS) -o $@
+ 
+ 
+ # INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS) $(POPT_CFLAGS) $(XML_CFLAGS)
+@@ -431,12 +431,12 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/fvector.Plo ./$(DEPDIR)/fxml.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+-LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
++LTOBJCCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(OBJC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_OBJCFLAGS) $(OBJCFLAGS)
+ OBJCLD = $(OBJC)
diff --git a/devel/coconut/patches/patch-ag b/devel/coconut/patches/patch-ag
new file mode 100644
index 00000000000..64a98067d8e
--- /dev/null
+++ b/devel/coconut/patches/patch-ag
@@ -0,0 +1,27 @@
+$NetBSD: patch-ag,v 1.1 2009/12/21 19:30:25 joerg Exp $
+
+--- test/Makefile.in.orig	2009-12-21 19:23:48.000000000 +0000
++++ test/Makefile.in
+@@ -6636,18 +6636,18 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/message-test.Po ./$(DEPDIR)/simple.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+-LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
++LTOBJCCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(OBJC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_OBJCFLAGS) $(OBJCFLAGS)
+ OBJCLD = $(OBJC)
+-OBJCLINK = $(LIBTOOL) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
++OBJCLINK = $(LIBTOOL) --mode=link --tag=CC $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(carray_test_out_SOURCES) $(carrow_test_gui_out_SOURCES) \
+ 	$(casyncfile_test1_out_SOURCES) $(casyncfile_test2_out_SOURCES) \