argp: make libtool tags explicit

build fix for .. my laptop, i guess

3 files changed, 16 insertions, 12 deletions

diff --git a/devel/argp/distinfo b/devel/argp/distinfo
index 1ec4834b6f5..146d45085c1 100644
--- a/devel/argp/distinfo
+++ b/devel/argp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2018/08/29 18:08:07 kamil Exp $
+$NetBSD: distinfo,v 1.7 2021/01/13 09:16:43 nia Exp $
 
 SHA1 (argp-standalone-1.3.tar.gz) = 815c560680ebdc11694b88de2f8ec15133e0bfa0
 RMD160 (argp-standalone-1.3.tar.gz) = 1c5cd0b1c382d93774be636a1ea2758d530cfef4
 SHA512 (argp-standalone-1.3.tar.gz) = 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
 Size (argp-standalone-1.3.tar.gz) = 130255 bytes
-SHA1 (patch-aa) = 57560cba79069b6809de78a7edbad64e2f717c61
-SHA1 (patch-ab) = 7ed54ce579b922416aceb0c4e3959307557e8af6
+SHA1 (patch-aa) = f6053a22f3267392d6dbd312faf3b6b140d27e7a
+SHA1 (patch-ab) = dfec66b81dfb21e019652fcbffeefa3ee88c4109
 SHA1 (patch-argp-fmtstream.c) = c7e763bb317702e5072570783629d8e973e5f077
 SHA1 (patch-argp-fmtstream.h) = c0b740fc31d51d0295d6bd01a9ed1a84ff2b5205
diff --git a/devel/argp/patches/patch-aa b/devel/argp/patches/patch-aa
index 5accfa0ed4a..9885dd8a0f0 100644
--- a/devel/argp/patches/patch-aa
+++ b/devel/argp/patches/patch-aa
@@ -1,6 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2017/07/12 11:05:59 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2021/01/13 09:16:44 nia Exp $
 
---- Makefile.in.orig	2004-02-23 19:22:09.000000000 +0100
+libtoolize.
+
+--- Makefile.in.orig	2004-02-23 18:22:09.000000000 +0000
 +++ Makefile.in
 @@ -88,7 +88,7 @@ libargp_a_OBJECTS = $(am_libargp_a_OBJEC
  PROGRAMS = $(noinst_PROGRAMS)
@@ -16,11 +18,11 @@ $NetBSD: patch-aa,v 1.2 2017/07/12 11:05:59 wiz Exp $
  @AMDEP_TRUE@	./$(DEPDIR)/argp-pv.Po ./$(DEPDIR)/argp-pvh.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/argp-test.Po
 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+COMPILE = libtool --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++COMPILE = libtool --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = libtool --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = libtool --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  SOURCES = $(libargp_a_SOURCES) argp-test.c
  DIST_SOURCES = $(libargp_a_SOURCES) argp-test.c
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -51,7 +53,7 @@ $NetBSD: patch-aa,v 1.2 2017/07/12 11:05:59 wiz Exp $
 -	$(libargp_a_AR) libargp.a $(libargp_a_OBJECTS) $(libargp_a_LIBADD)
 -	$(RANLIB) libargp.a
 +libargp.la: $(libargp_a_OBJECTS) $(libargp_a_DEPENDENCIES) 
-+	libtool --mode=link ${CC} ${LDFLAGS} -o $@ -rpath ${libdir} $(LIBOBJS:C/.o$/.lo/) $(libargp_a_OBJECTS:C/.o$/.lo/)
++	libtool --mode=link --tag=CC ${CC} ${LDFLAGS} -o $@ -rpath ${libdir} $(LIBOBJS:C/.o$/.lo/) $(libargp_a_OBJECTS:C/.o$/.lo/)
  
  clean-noinstPROGRAMS:
  	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
diff --git a/devel/argp/patches/patch-ab b/devel/argp/patches/patch-ab
index be37b39219e..bfb933e5c80 100644
--- a/devel/argp/patches/patch-ab
+++ b/devel/argp/patches/patch-ab
@@ -1,6 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2007/12/22 01:40:22 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2021/01/13 09:16:44 nia Exp $
 
---- testsuite/Makefile.in.orig	2007-12-22 02:17:56.000000000 +0100
+libtoolize.
+
+--- testsuite/Makefile.in.orig	2004-02-23 18:22:09.000000000 +0000
 +++ testsuite/Makefile.in
 @@ -53,24 +53,24 @@ PROGRAMS = $(noinst_PROGRAMS)
  ex1_SOURCES = ex1.c
@@ -24,11 +26,11 @@ $NetBSD: patch-ab,v 1.1 2007/12/22 01:40:22 joerg Exp $
  @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ex1.Po ./$(DEPDIR)/ex3.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/ex4.Po
 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+COMPILE = libtool --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++COMPILE = libtool --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = libtool --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = libtool --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  SOURCES = ex1.c ex3.c ex4.c
  DIST_SOURCES = ex1.c ex3.c ex4.c
  ETAGS = etags