From 4fc769741e5e75ca803da9b255a671b7461495a0 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 8 Sep 2009 19:20:49 +0000
Subject: Use libtool --mode=XXX in all cases.

---
 x11/XmHTML/distinfo         | 12 ++++++------
 x11/XmHTML/patches/patch-ac |  6 +++---
 x11/XmHTML/patches/patch-ad |  4 ++--
 x11/XmHTML/patches/patch-ae |  4 ++--
 x11/XmHTML/patches/patch-af |  4 ++--
 x11/XmHTML/patches/patch-ag |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'x11/XmHTML')

diff --git a/x11/XmHTML/distinfo b/x11/XmHTML/distinfo
index 2110dac85b1..1c3aac4da61 100644
--- a/x11/XmHTML/distinfo
+++ b/x11/XmHTML/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.8 2005/10/03 17:52:10 joerg Exp $
+$NetBSD: distinfo,v 1.9 2009/09/08 19:20:49 joerg Exp $
 
 SHA1 (XmHTML-1.1.7.tar.gz) = 4d8c82f88cf0700f6fc8898323d865b83d2a1ff1
 RMD160 (XmHTML-1.1.7.tar.gz) = 0e5cf4a0d24fc73277186a726a3997dea4ea82db
 Size (XmHTML-1.1.7.tar.gz) = 1289780 bytes
 SHA1 (patch-aa) = 3d4f8b8cbb825b91da3bae64ef2b6572406189d9
 SHA1 (patch-ab) = 2f9e88b74913c735caf139646c2637a77a1232cd
-SHA1 (patch-ac) = cf48e4eb9887df7bd5d82615aa505939ba97bee8
-SHA1 (patch-ad) = d96f518c05f27fd7e7b4fc756467c6dca4a570ef
-SHA1 (patch-ae) = 9fb001c2fc6a7fce4aaf638ea1168edcf4820998
-SHA1 (patch-af) = 41d5a342cd13ad188289b115cbd3bfc36725b961
-SHA1 (patch-ag) = 335c1139ee826ab8d04d8a7584d21675a3ae2d93
+SHA1 (patch-ac) = a253e613c9f8752bbef42d5d9db180506edf0940
+SHA1 (patch-ad) = 69f9244f3a567e4d2d15f3af448476167454c4c9
+SHA1 (patch-ae) = f4d0a993d383e97ff06a29151316d57bcd21c25d
+SHA1 (patch-af) = de3658ddbe191deb3d838f500d985c950ab4a967
+SHA1 (patch-ag) = acac76543e8fe98d79064bbec7830f285e9c50cd
 SHA1 (patch-ah) = 78ad8dc486da8aad6911f79eb8bd22d8417aec1f
 SHA1 (patch-ai) = 300b35e24698d6e717f0b1bdfd577df91244fba4
diff --git a/x11/XmHTML/patches/patch-ac b/x11/XmHTML/patches/patch-ac
index 4a04383d9ae..a1a9b38bb72 100644
--- a/x11/XmHTML/patches/patch-ac
+++ b/x11/XmHTML/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2001/03/05 13:52:42 skrll Exp $
+$NetBSD: patch-ac,v 1.5 2009/09/08 19:20:49 joerg Exp $
 
 --- http/Makefile.orig	Thu Feb  4 00:43:27 1999
 +++ http/Makefile
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.4 2001/03/05 13:52:42 skrll Exp $
  .c.o:
  	$(RM) $@
 -	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
-+	${LIBTOOL} $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -c $<
  
  all: $(TARGET)
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ac,v 1.4 2001/03/05 13:52:42 skrll Exp $
 -	$(AR) $@ $(OBJS)  
 -	$(RANLIB) $@
 +	$(RM) $@
-+	${LIBTOOL} $(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2
++	${LIBTOOL} --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:2
  
  stamp-includes:
  	@if [ -d ../include ]; then set +x; \
diff --git a/x11/XmHTML/patches/patch-ad b/x11/XmHTML/patches/patch-ad
index 58478ec15d8..3e5f6d2644a 100644
--- a/x11/XmHTML/patches/patch-ad
+++ b/x11/XmHTML/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2001/03/05 13:52:42 skrll Exp $
+$NetBSD: patch-ad,v 1.5 2009/09/08 19:20:49 joerg Exp $
 
 --- lib/Makefile.orig	Thu Feb  4 00:43:26 1999
 +++ lib/Makefile
@@ -19,7 +19,7 @@ $NetBSD: patch-ad,v 1.4 2001/03/05 13:52:42 skrll Exp $
 -	$(AR) $@ common/*.o $(PLATFORM)/*.o
 -	$(RANLIB) $@
 +	$(RM) $@
-+	${LIBTOOL} $(CC) -o $@ common/*.lo $(PLATFORM)/*.lo \
++	${LIBTOOL} --mode=link $(CC) -o $@ common/*.lo $(PLATFORM)/*.lo \
 +		-rpath ${PREFIX}/lib -version-info 1:2
  	
  depend:: 
diff --git a/x11/XmHTML/patches/patch-ae b/x11/XmHTML/patches/patch-ae
index 52098b368b0..69eeb35bb1a 100644
--- a/x11/XmHTML/patches/patch-ae
+++ b/x11/XmHTML/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2001/03/05 13:52:42 skrll Exp $
+$NetBSD: patch-ae,v 1.4 2009/09/08 19:20:49 joerg Exp $
 
 --- tools/Makefile.orig	Thu Feb  4 00:43:27 1999
 +++ tools/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.3 2001/03/05 13:52:42 skrll Exp $
  httpget::  httpget.o
  	$(RM) $@ \ 
 -	$(CC) -o $@ $(LDFLAGS) httpget.o -L../http -lhttp $(DMALLOCLIB)
-+	${LIBTOOL} $(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB)
++	${LIBTOOL} --mode=link $(CC) -o $@ $(LDFLAGS) httpget.o ../http/libhttp.la $(DMALLOCLIB)
  
  # gif to gzf converter
  gif2gzf:: gif2gzf.o LZWStream.o ImBuffer.o
diff --git a/x11/XmHTML/patches/patch-af b/x11/XmHTML/patches/patch-af
index 833ba3dac06..506dda2af2f 100644
--- a/x11/XmHTML/patches/patch-af
+++ b/x11/XmHTML/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2001/03/05 13:52:42 skrll Exp $
+$NetBSD: patch-af,v 1.4 2009/09/08 19:20:49 joerg Exp $
 
 --- lib/common/Makefile.orig	Mon Mar  5 13:37:18 2001
 +++ lib/common/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.3 2001/03/05 13:52:42 skrll Exp $
  .c.o:
  	$(RM) $@
 -	$(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
-+	${LIBTOOL} $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
  
  # targets to build
  all: $(TARGET)
diff --git a/x11/XmHTML/patches/patch-ag b/x11/XmHTML/patches/patch-ag
index a5f603eb33c..60870c50b0b 100644
--- a/x11/XmHTML/patches/patch-ag
+++ b/x11/XmHTML/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2001/03/05 13:52:42 skrll Exp $
+$NetBSD: patch-ag,v 1.4 2009/09/08 19:20:49 joerg Exp $
 
 --- lib/Motif/Makefile.orig	Mon Mar  5 13:38:22 2001
 +++ lib/Motif/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.3 2001/03/05 13:52:42 skrll Exp $
  .c.o:
  	$(RM) $@
 -	$(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
-+	${LIBTOOL} $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
++	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -DVERSION=$(VERSION) $(CPPFLAGS) $(INCLUDES) -c $<
  
  # targets to build
  all: $(TARGET)
-- 
cgit v1.2.3