Provide --mode arguments for libtool.

3 files changed, 14 insertions, 14 deletions

diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index 753f4a266a6..9646810aebb 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2009/09/13 16:10:53 tron Exp $
+$NetBSD: distinfo,v 1.15 2009/10/07 17:41:35 joerg Exp $
 
 SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
 RMD160 (faces-1.6.1.tar.Z) = fdf0d1eca4d094b0b50c00c627082c78ae5dd195
 Size (faces-1.6.1.tar.Z) = 249469 bytes
 SHA1 (patch-aa) = 99012a91d3ac39bdd0ad8b5ab454812ace346dbb
-SHA1 (patch-ab) = d7f35df34ab4e584ce8d0edcdcf60c45bf30fa4f
-SHA1 (patch-ac) = adb2718262027b4ba68425ffd4bef37192ff6d0c
+SHA1 (patch-ab) = 98836fea05bd250aab1497022dcf6515829e39ce
+SHA1 (patch-ac) = df485059a726addb843c3fb650d52432f97f1571
 SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68
 SHA1 (patch-ae) = 0a7e57277e0e8133c81997258ef7f7a656834088
 SHA1 (patch-af) = 28eca0e38e04aef8b51d596d00f19d329f7570ec
diff --git a/mail/faces/patches/patch-ab b/mail/faces/patches/patch-ab
index 0cdc2062bb4..207b82fd551 100644
--- a/mail/faces/patches/patch-ab
+++ b/mail/faces/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.13 2006/01/08 14:30:01 tron Exp $
+$NetBSD: patch-ab,v 1.14 2009/10/07 17:41:35 joerg Exp $
 
 --- Makefile.dist.orig	1991-11-24 23:55:28.000000000 +0000
 +++ Makefile.dist	2006-01-08 14:13:23.000000000 +0000
@@ -175,7 +175,7 @@ $NetBSD: patch-ab,v 1.13 2006/01/08 14:30:01 tron Exp $
  		(cd compface; $(MAKE) $(MAKEOPTS))
  		(cd filters; $(MAKE) $(MAKEOPTS))
 -		$(CC) -o xfaces $(CFLAGS) $(STDOBJS) x11.o \
-+		$(LIBTOOL) $(CC) -o faces $(CFLAGS) $(STDOBJS) x11.o \
++		$(LIBTOOL) --mode=link $(CC) -o faces $(CFLAGS) $(STDOBJS) x11.o \
  					$(STDLIBS) $(X11LIBS) $(SVR4LIBS)
 -		-cp xfaces faces
  
@@ -201,7 +201,7 @@ $NetBSD: patch-ab,v 1.13 2006/01/08 14:30:01 tron Exp $
 -		install -c -m 755 face_update $(BINDIR)
 -		install -c -m 755 faces.sendmail $(BINDIR)
 -		install -c -m 644 faces.man \
-+		$(LIBTOOL) ${BSD_INSTALL_PROGRAM} faces $(BINDIR)
++		$(LIBTOOL) --mode=install ${BSD_INSTALL_PROGRAM} faces $(BINDIR)
 +		${BSD_INSTALL_SCRIPT} face_update $(BINDIR)
 +		${BSD_INSTALL_SCRIPT} faces.sendmail $(BINDIR)
 +		${BSD_INSTALL_MAN} faces.man \
diff --git a/mail/faces/patches/patch-ac b/mail/faces/patches/patch-ac
index 635d8fd0509..058feecddf4 100644
--- a/mail/faces/patches/patch-ac
+++ b/mail/faces/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.11 2001/11/30 16:29:28 jlam Exp $
+$NetBSD: patch-ac,v 1.12 2009/10/07 17:41:35 joerg Exp $
 
 --- compface/Makefile.orig	Wed Oct 23 22:28:06 1991
 +++ compface/Makefile
@@ -39,17 +39,17 @@ $NetBSD: patch-ac,v 1.11 2001/11/30 16:29:28 jlam Exp $
  
  $(NAME) :	cmain.o compface.o $(LIBNAME)
 -		$(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o $(LIBNAME)
-+		$(LIBTOOL) $(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o $(LIBNAME)
++		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o $(LIBNAME)
  
  $(UNNAME) :	uncmain.o $(LIBNAME)
 -		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
-+		$(LIBTOOL) $(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
++		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
  
 -$(LIBNAME) :	$(OBJECTS)
 -		ar rc $(LIBNAME) $(OBJECTS)
 -		-ranlib $(LIBNAME)
 +$(LIBNAME) :	$(OBJECTS:.o=.lo)
-+		$(LIBTOOL) $(CC) -o $(LIBNAME) $(OBJECTS:.o=.lo) -rpath $(LIBDIR) -version-info 1:0
++		$(LIBTOOL) --mode=link $(CC) -o $(LIBNAME) $(OBJECTS:.o=.lo) -rpath $(LIBDIR) -version-info 1:0
  
  lint :
  		lint -abchx $(SOURCES)
@@ -68,9 +68,9 @@ $NetBSD: patch-ac,v 1.11 2001/11/30 16:29:28 jlam Exp $
 -		-cp $(NAME).3 $(MAN3DIR)
 -		rm -f $(MAN3DIR)/$(UNNAME).3
 -		-ln $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3
-+		$(LIBTOOL) ${BSD_INSTALL_DATA} $(LIBNAME) $(LIBDIR)
-+		$(LIBTOOL) ${BSD_INSTALL_PROGRAM} $(NAME) $(EXECUTABLE)
-+		$(LIBTOOL) ${BSD_INSTALL_PROGRAM} $(UNNAME) $(UNEXECUTABLE)
++		$(LIBTOOL) --mode=install ${BSD_INSTALL_DATA} $(LIBNAME) $(LIBDIR)
++		$(LIBTOOL) --mode=install ${BSD_INSTALL_PROGRAM} $(NAME) $(EXECUTABLE)
++		$(LIBTOOL) --mode=install ${BSD_INSTALL_PROGRAM} $(UNNAME) $(UNEXECUTABLE)
 +		${BSD_INSTALL_MAN} $(NAME).1 $(MAN1DIR)
 +		rm -f $(MAN1DIR)/$(UNNAME).1*
 +		-ln -fs $(MAN1DIR)/$(NAME).1 $(MAN1DIR)/$(UNNAME).1
@@ -86,7 +86,7 @@ $NetBSD: patch-ac,v 1.11 2001/11/30 16:29:28 jlam Exp $
 +.SUFFIXES:	.lo
 +
 +.c.lo:
-+		$(LIBTOOL) $(CC) $(CFLAGS) -c $<
++		$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
  
  arith.o:	arith.c compface.h data.h
  cmain.o:	cmain.c compface.h data.h