sprinkle --tag=CC for libtool

6 files changed, 31 insertions, 31 deletions

diff --git a/security/PAM/distinfo b/security/PAM/distinfo
index 22a08012bea..552efbe89df 100644
--- a/security/PAM/distinfo
+++ b/security/PAM/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2007/07/09 03:51:33 minskim Exp $
+$NetBSD: distinfo,v 1.17 2010/02/02 17:09:28 tnn Exp $
 
 SHA1 (Linux-PAM-0.77.tar.gz) = 58dff29aec3c0b6a9e9b53af6fb643056ce0f304
 RMD160 (Linux-PAM-0.77.tar.gz) = 15391ed7bed7b506bb391608b735332d0391580c
@@ -6,10 +6,10 @@ Size (Linux-PAM-0.77.tar.gz) = 442569 bytes
 SHA1 (patch-aa) = 99f4889c24ff71a9e40e0e913d6071b78a326877
 SHA1 (patch-ab) = 8f0ba8b8390a67ffc9a7cf0ea33522e3e5603428
 SHA1 (patch-ac) = 4b956ff74eae3b61c3f33699087666f64fe7f467
-SHA1 (patch-ad) = 336101bd1779715eac39f4ef5e923745defd438f
-SHA1 (patch-ae) = 58c67c5ba430d2c5788717c6c7373dbf84d7b424
-SHA1 (patch-af) = 10917af14f4bfd27c7872144ca215efdfe68d132
-SHA1 (patch-ag) = 6329935d62d0ff82b6bf12783a600ccee28032aa
+SHA1 (patch-ad) = 9604689a4ab826cc31db29119012c473c876b286
+SHA1 (patch-ae) = 2d403c3737005f034624458730562ff094e04ed6
+SHA1 (patch-af) = 303f272464f8bb90b934428b99ce50d92ddd0b3c
+SHA1 (patch-ag) = 5b33842c46fa251b493ad554199b084980de7923
 SHA1 (patch-ah) = 50f68734e5b879db823e137f474b40d8473f0e6e
 SHA1 (patch-ai) = 950c9e949c72eaf904452d8afefc0f994101e5a8
 SHA1 (patch-aj) = d47bc58c3dc810497290d6ec4a3646380b5fa4d7
@@ -25,7 +25,7 @@ SHA1 (patch-as) = e4fdfef53c097985c2aa8ff8225fed1caa812c10
 SHA1 (patch-at) = 5ac29da5019df10beae09874ef61559f16097a7b
 SHA1 (patch-au) = 6c1327faf2ec9f1ff74f01443075852bf94f3788
 SHA1 (patch-av) = 98c7b6ea2ba655cb405492eddba2f9d246b08817
-SHA1 (patch-aw) = d56fd3ca5093af306b0ceab5f81cb7bc6fd237de
+SHA1 (patch-aw) = fc7ed36cd8fb67058e52a9ccf5474498086db893
 SHA1 (patch-ax) = 16f4ef37306f05a9792684440a802bed727b03df
 SHA1 (patch-ay) = 8e40db2360bec88a22cd661c813f4a7f9a906f34
 SHA1 (patch-az) = 4083bdfc19ee7d528a27fce0339b666c58f73583
diff --git a/security/PAM/patches/patch-ad b/security/PAM/patches/patch-ad
index 64acce0a177..a80cdca04bc 100644
--- a/security/PAM/patches/patch-ad
+++ b/security/PAM/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.6 2004/11/19 14:54:55 jlam Exp $
+$NetBSD: patch-ad,v 1.7 2010/02/02 17:09:28 tnn Exp $
 
---- libpam/Makefile.orig	2001-12-09 16:44:58.000000000 -0500
+--- libpam/Makefile.orig	2001-12-09 21:44:58.000000000 +0000
 +++ libpam/Makefile
 @@ -6,7 +6,7 @@
  include ../Make.Rules
@@ -48,7 +48,7 @@ $NetBSD: patch-ad,v 1.6 2004/11/19 14:54:55 jlam Exp $
 +LALIBOBJECTS = $(LIBOBJECTS:.o=.lo) $(STATICOBJ:.o=.lo)
 +ifdef STATICOBJ
 +pam_static.lo: pam_static.c ../modules/_static_module_objects
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c pam_static.c
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c pam_static.c
 +endif
 +endif
 +
@@ -75,7 +75,7 @@ $NetBSD: patch-ad,v 1.6 2004/11/19 14:54:55 jlam Exp $
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
  
 +%.lo : %.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
 +
  $(LIBPAM): $(DLIBOBJECTS)
  ifeq ($(DYNAMIC_LIBPAM),yes)
@@ -87,7 +87,7 @@ $NetBSD: patch-ad,v 1.6 2004/11/19 14:54:55 jlam Exp $
 -install: all
 +$(LIBPAMLIBTOOL): $(LALIBOBJECTS)
 +ifeq ($(LIBTOOL_LIBPAM),yes)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@ \
++	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@ \
 +		$(MODULES) $(LINKLIBS) \
 +		-rpath $(libdir) -version-info $(MAJOR_REL):$(MINOR_REL)
 +endif
diff --git a/security/PAM/patches/patch-ae b/security/PAM/patches/patch-ae
index 45f5dc3716a..5cb22604bb1 100644
--- a/security/PAM/patches/patch-ae
+++ b/security/PAM/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2004/11/19 14:54:55 jlam Exp $
+$NetBSD: patch-ae,v 1.7 2010/02/02 17:09:28 tnn Exp $
 
---- libpam_misc/Makefile.orig	2002-06-27 00:04:54.000000000 -0400
+--- libpam_misc/Makefile.orig	2002-06-27 04:04:54.000000000 +0000
 +++ libpam_misc/Makefile
 @@ -15,8 +15,13 @@ endif
  VERSION=.$(MAJOR_REL)
@@ -59,7 +59,7 @@ $NetBSD: patch-ae,v 1.6 2004/11/19 14:54:55 jlam Exp $
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
  
 +%.lo : %.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
 +
  $(LIBNAMED): $(DLIBOBJECTS)
  ifeq ($(DYNAMIC_LIBPAM),yes)
@@ -71,7 +71,7 @@ $NetBSD: patch-ae,v 1.6 2004/11/19 14:54:55 jlam Exp $
 -install: all
 +$(LIBNAMEDLIBTOOL): $(LALIBOBJECTS)
 +ifeq ($(LIBTOOL_LIBPAM),yes)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@ \
++	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@ \
 +		$(MODULES) $(LINKLIBS) \
 +		-rpath $(libdir) -version-info $(MAJOR_REL):$(MINOR_REL)
 +endif
diff --git a/security/PAM/patches/patch-af b/security/PAM/patches/patch-af
index 6c69cccffe1..627c8b60532 100644
--- a/security/PAM/patches/patch-af
+++ b/security/PAM/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.5 2004/11/19 14:54:55 jlam Exp $
+$NetBSD: patch-af,v 1.6 2010/02/02 17:09:28 tnn Exp $
 
---- libpamc/Makefile.orig	2001-02-10 02:17:53.000000000 -0500
+--- libpamc/Makefile.orig	2001-02-10 07:17:53.000000000 +0000
 +++ libpamc/Makefile
 @@ -15,7 +15,7 @@ endif
  VERSION=.$(MAJOR_REL)
@@ -53,7 +53,7 @@ $NetBSD: patch-af,v 1.5 2004/11/19 14:54:55 jlam Exp $
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
  
 +%.lo : %.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
 +
  $(LIBNAMED): $(DLIBOBJECTS)
  ifeq ($(DYNAMIC_LIBPAM),yes)
@@ -65,7 +65,7 @@ $NetBSD: patch-af,v 1.5 2004/11/19 14:54:55 jlam Exp $
 -install: all
 +$(LIBNAMEDLIBTOOL): $(LALIBOBJECTS)
 +ifeq ($(LIBTOOL_LIBPAM),yes)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@ \
++	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@ \
 +		$(MODULES) $(LINKLIBS) \
 +		-rpath $(libdir) -version-info $(MAJOR_REL):$(MINOR_REL)
 +endif
diff --git a/security/PAM/patches/patch-ag b/security/PAM/patches/patch-ag
index a6c80f3703b..305072fbad4 100644
--- a/security/PAM/patches/patch-ag
+++ b/security/PAM/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.4 2004/11/16 07:46:57 jlam Exp $
+$NetBSD: patch-ag,v 1.5 2010/02/02 17:09:28 tnn Exp $
 
---- modules/pammodutil/Makefile.orig	2001-12-09 17:15:12.000000000 -0500
+--- modules/pammodutil/Makefile.orig	2001-12-09 22:15:12.000000000 +0000
 +++ modules/pammodutil/Makefile
 @@ -25,10 +25,15 @@ LIBSTATIC = $(LIBNAME).a
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ag,v 1.4 2004/11/16 07:46:57 jlam Exp $
  	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
  
 +%.lo: %.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
 +
  $(LIBSTATIC): $(SLIBOBJECTS)
  	ar cr $@ $(SLIBOBJECTS)
@@ -34,7 +34,7 @@ $NetBSD: patch-ag,v 1.4 2004/11/16 07:46:57 jlam Exp $
 +# libraries and modules.
 +#
 +$(LIBLIBTOOL): $(LALIBOBJECTS)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@
++	$(LIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) $(LALIBOBJECTS) -o $@
 +
  install:
  	@echo "at this time, we're not installing $(LIBSTATIC)"
diff --git a/security/PAM/patches/patch-aw b/security/PAM/patches/patch-aw
index a39f3f5d3e2..7153f20ff0c 100644
--- a/security/PAM/patches/patch-aw
+++ b/security/PAM/patches/patch-aw
@@ -1,6 +1,6 @@
-$NetBSD: patch-aw,v 1.5 2004/11/19 14:54:55 jlam Exp $
+$NetBSD: patch-aw,v 1.6 2010/02/02 17:09:28 tnn Exp $
 
---- modules/pam_unix/Makefile.orig	2001-02-11 01:33:53.000000000 -0500
+--- modules/pam_unix/Makefile.orig	2001-02-11 06:33:53.000000000 +0000
 +++ modules/pam_unix/Makefile
 @@ -55,6 +55,7 @@ LIBSRC = pam_unix_auth.c pam_unix_acct.c
  		support.c
@@ -41,7 +41,7 @@ $NetBSD: patch-aw,v 1.5 2004/11/19 14:54:55 jlam Exp $
  	$(CC) $(CFLAGS) $(STATIC) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
  
 +%.lo : %.c
-+	$(SHLIBTOOL) --mode=compile $(CC) $(CFLAGS) $(LTCFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
++	$(SHLIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(LTCFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $<
 +
  dummy:
  	@echo "**** This is not a top-level Makefile "
@@ -54,7 +54,7 @@ $NetBSD: patch-aw,v 1.5 2004/11/19 14:54:55 jlam Exp $
 +$(LIBOBJLA): $(LIBSRC)
 +
 +$(LIBLIBTOOL): $(LIBOBJLA) $(PLUS:.o=.lo)
-+	$(SHLIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LIBOBJLA) -o $@ $(PLUS:.o=.lo) $(CRACKLIB) $(LDLIBS) $(LIBNSL) $(LIBCRYPT) -module -avoid-version -rpath $(FAKEROOT)$(SECUREDIR)
++	$(SHLIBTOOL) --tag=CC --mode=link $(CC) $(LDFLAGS) $(LIBOBJLA) -o $@ $(PLUS:.o=.lo) $(CRACKLIB) $(LDLIBS) $(LIBNSL) $(LIBCRYPT) -module -avoid-version -rpath $(FAKEROOT)$(SECUREDIR)
 +endif
 +
  $(CHKPWD): unix_chkpwd.o md5_good.o md5_broken.o \
@@ -70,7 +70,7 @@ $NetBSD: patch-aw,v 1.5 2004/11/19 14:54:55 jlam Exp $
  		$(TARGET_ARCH) -c $< -o $@
  
 +md5_good.lo: md5.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) \
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) \
 +		-DHIGHFIRST -D'MD5Name(x)=Good##x' \
 +		$(TARGET_ARCH) -c $< -o $@
 +
@@ -79,7 +79,7 @@ $NetBSD: patch-aw,v 1.5 2004/11/19 14:54:55 jlam Exp $
  		$(TARGET_ARCH) -c $< -o $@
  
 +md5_broken.lo: md5.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) \
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) \
 +		-D'MD5Name(x)=Broken##x' \
 +		$(TARGET_ARCH) -c $< -o $@
 +
@@ -88,7 +88,7 @@ $NetBSD: patch-aw,v 1.5 2004/11/19 14:54:55 jlam Exp $
  		$(TARGET_ARCH) -c $< -o $@
  
 +md5_crypt_good.lo: md5_crypt.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) \
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) \
 +		-D'MD5Name(x)=Good##x' \
 +		$(TARGET_ARCH) -c $< -o $@
 +
@@ -97,7 +97,7 @@ $NetBSD: patch-aw,v 1.5 2004/11/19 14:54:55 jlam Exp $
  		$(TARGET_ARCH) -c $< -o $@
  
 +md5_crypt_broken.lo: md5_crypt.c
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) \
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) \
 +		-D'MD5Name(x)=Broken##x' \
 +		$(TARGET_ARCH) -c $< -o $@
 +