Change patches to use --mode argument for libtool.

5 files changed, 26 insertions, 26 deletions

diff --git a/audio/rplay/distinfo b/audio/rplay/distinfo
index 631cb1c9a9d..43867374516 100644
--- a/audio/rplay/distinfo
+++ b/audio/rplay/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2009/05/18 05:21:18 dholland Exp $
+$NetBSD: distinfo,v 1.15 2009/10/06 17:27:51 joerg Exp $
 
 SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
 RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861
@@ -11,13 +11,13 @@ SHA1 (patch-ae) = 5095335425d16e24831ee8bcaacc60b0ec4d00ee
 SHA1 (patch-af) = 12f6bc02de7fceb44b6390178429654ef85dcc5d
 SHA1 (patch-ag) = ce19208502a150b7b9808c8f1755d116c978a506
 SHA1 (patch-ai) = b95f7af868a2dcf4a46f8b0294cef97c277d1933
-SHA1 (patch-aj) = 47535315d2edecd578a0e5c59cdfdf9f2e9a9a4a
-SHA1 (patch-ak) = 283d43624c6aa6b8577fae84763fd7e7611259df
-SHA1 (patch-al) = d1ba256801fe89606be00e61062156814cf5de6e
+SHA1 (patch-aj) = 3839a4c729f7e82296e0d0b629485692cc604336
+SHA1 (patch-ak) = 0d7ba37676cce0851df8dd8aa7a27d75af3dae5a
+SHA1 (patch-al) = c8a436e471dffd8a620b8886e58a2d6b93c6bdbe
 SHA1 (patch-am) = cdea095456b089284ce4da9152cce0958bbc9c0f
 SHA1 (patch-an) = c59d49c738596943b6e4fbef19130d3a38fe4ad2
 SHA1 (patch-ao) = 01316da024026f526dd5389c3a6c2eaf89814546
-SHA1 (patch-ap) = 46e7e7fc0fb3b7d5228bf81877ac186eda1be00f
+SHA1 (patch-ap) = 587a5614b591b8a031bb4b57198a170f621f4eb8
 SHA1 (patch-aq) = 41e6f83bb5c8a1223fc9d9cd8a21fee36012965f
 SHA1 (patch-ar) = ed50669c6210add534a4c91e7995a61e7db90dc8
 SHA1 (patch-as) = 64d31c1bc4d1659a18e9bfb922550f4a390f15bd
diff --git a/audio/rplay/patches/patch-aj b/audio/rplay/patches/patch-aj
index 1f46bde726e..b750d735389 100644
--- a/audio/rplay/patches/patch-aj
+++ b/audio/rplay/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2000/01/26 22:11:37 jlam Exp $
+$NetBSD: patch-aj,v 1.2 2009/10/06 17:27:51 joerg Exp $
 
 --- librplay/Makefile.in.orig	Mon Mar 22 21:38:38 1999
 +++ librplay/Makefile.in	Tue Jan 18 16:15:33 2000
@@ -15,7 +15,7 @@ $NetBSD: patch-aj,v 1.1 2000/01/26 22:11:37 jlam Exp $
  .SUFFIXES: .lo
  .c.lo:
 -		$(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+		$(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
++		$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
  
  TARGET=		$(LIBRPLAY_NAME)
  SRCS=		rplay.c rptp.c async.c
@@ -32,7 +32,7 @@ $NetBSD: patch-aj,v 1.1 2000/01/26 22:11:37 jlam Exp $
 -		$(AR) rcv $@ $?
 -		$(RANLIB) $@
 +$(TARGET):	$(SHAREDOBJS)
-+		$(LIBTOOL) $(CC) $(LDFLAGS) -o $@ $? \
++		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $? \
 +			-rpath $(libdir) -version-info 0:0
  
  librplay.so:	$(SHAREDOBJS)
@@ -43,16 +43,16 @@ $NetBSD: patch-aj,v 1.1 2000/01/26 22:11:37 jlam Exp $
  		$(MKINSTALLDIRS) $(libdir)
 -		$(INSTALL_DATA) $(TARGET) $(libdir)
 -		$(INSTALL_DATA) librplay.so $(libdir)
-+		$(LIBTOOL) $(INSTALL_DATA) $(TARGET) $(libdir)
++		$(LIBTOOL) --mode=install $(INSTALL_DATA) $(TARGET) $(libdir)
  
  uninstall:
 -		$(RM) $(libdir)/$(TARGET)
 -		$(RM) $(libdir)/librplay.so
-+		$(LIBTOOL) $(RM) $(libdir)/$(TARGET)
++		$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(TARGET)
  
  clean:
 -		$(RM) $(OBJS) $(SHAREDOBJS) $(TARGET) librplay.so a.out core *~ *.bak *.orig TAGS
-+		$(LIBTOOL) $(RM) $(OBJS) $(SHAREDOBJS) $(TARGET) librplay.so a.out core *~ *.bak *.orig TAGS
++		$(LIBTOOL) --mode=clean $(RM) $(OBJS) $(SHAREDOBJS) $(TARGET) librplay.so a.out core *~ *.bak *.orig TAGS
  
  distclean:	clean
  		$(RM) Makefile
diff --git a/audio/rplay/patches/patch-ak b/audio/rplay/patches/patch-ak
index 37de480e83f..a2dcc5f6804 100644
--- a/audio/rplay/patches/patch-ak
+++ b/audio/rplay/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2000/01/26 22:11:37 jlam Exp $
+$NetBSD: patch-ak,v 1.2 2009/10/06 17:27:51 joerg Exp $
 
 --- rplay/Makefile.in.orig	Sat Mar 20 19:44:57 1999
 +++ rplay/Makefile.in	Tue Jan 18 16:15:33 2000
@@ -16,7 +16,7 @@ $NetBSD: patch-ak,v 1.1 2000/01/26 22:11:37 jlam Exp $
  
  $(TARGET):	$(OBJS) ../librplay/$(LIBRPLAY_NAME) ../lib/librp.a
 -		$(CC) -o $@ $(OBJS) $(LDFLAGS)
-+		$(LIBTOOL) $(CC) -o $@ $(OBJS) $(LDFLAGS)
++		$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(LDFLAGS)
  
  ../librplay/$(LIBRPLAY_NAME):
  		(cd ../librplay; $(MAKE) $(MFLAGS))
@@ -25,15 +25,15 @@ $NetBSD: patch-ak,v 1.1 2000/01/26 22:11:37 jlam Exp $
  install:	all
  		$(MKINSTALLDIRS) $(bindir)
 -		$(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
-+		$(LIBTOOL) $(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
++		$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
  
  uninstall:
 -		$(RM) $(bindir)/$(TARGET)
-+		$(LIBTOOL) $(RM) $(bindir)/$(TARGET)
++		$(LIBTOOL) --mode=uninstall $(RM) $(bindir)/$(TARGET)
  
  clean:
 -		$(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
-+		$(LIBTOOL) $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
++		$(LIBTOOL) --mode=clean $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
  
  distclean:	clean
  		$(RM) Makefile
diff --git a/audio/rplay/patches/patch-al b/audio/rplay/patches/patch-al
index eec81268add..6a777b1db09 100644
--- a/audio/rplay/patches/patch-al
+++ b/audio/rplay/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1 2000/01/26 22:11:37 jlam Exp $
+$NetBSD: patch-al,v 1.2 2009/10/06 17:27:51 joerg Exp $
 
 --- rplayd/Makefile.in.orig	Wed Jun  9 02:27:43 1999
 +++ rplayd/Makefile.in	Wed Jan 26 17:03:44 2000
@@ -18,7 +18,7 @@ $NetBSD: patch-al,v 1.1 2000/01/26 22:11:37 jlam Exp $
  
  $(TARGET):	$(OBJS) ../librplay/$(LIBRPLAY_NAME) ../lib/librp.a ../adpcm/libadpcm.a
 -		$(CC) -o $@ $(OBJS) $(LDFLAGS)
-+		$(LIBTOOL) $(CC) -o $@ $(OBJS) $(LDFLAGS)
++		$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(LDFLAGS)
  
  ../librplay/$(LIBRPLAY_NAME):
  		(cd ../librplay; $(MAKE) $(MFLAGS))
@@ -28,15 +28,15 @@ $NetBSD: patch-al,v 1.1 2000/01/26 22:11:37 jlam Exp $
  		$(MKINSTALLDIRS) $(sbindir)
 -		$(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
 -		@test -x $(bindir)/$(TARGET) && echo "" && echo "    Note: Consider removing $(bindir)/$(TARGET)" && echo ""
-+		$(LIBTOOL) $(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
++		$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
  
  uninstall:
 -		$(RM) $(bindir)/$(TARGET)
-+		$(LIBTOOL) $(RM) $(bindir)/$(TARGET)
++		$(LIBTOOL) --mode=uninstall $(RM) $(bindir)/$(TARGET)
  
  clean:
 -		$(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
-+		$(LIBTOOL) $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
++		$(LIBTOOL) --mode=clean $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
  		cd audio; $(RM) *~ *.bak *.orig
  
  distclean:	clean
diff --git a/audio/rplay/patches/patch-ap b/audio/rplay/patches/patch-ap
index 860abc068b8..c7196f5cad4 100644
--- a/audio/rplay/patches/patch-ap
+++ b/audio/rplay/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1 2000/01/26 22:11:37 jlam Exp $
+$NetBSD: patch-ap,v 1.2 2009/10/06 17:27:51 joerg Exp $
 
 --- rptp/Makefile.in.orig	Wed Jun  9 02:27:48 1999
 +++ rptp/Makefile.in	Tue Jan 18 16:15:34 2000
@@ -16,7 +16,7 @@ $NetBSD: patch-ap,v 1.1 2000/01/26 22:11:37 jlam Exp $
  
  $(TARGET):	$(OBJS) ../librplay/$(LIBRPLAY_NAME) ../lib/librp.a
 -		$(CC) -o $@ $(OBJS) $(LDFLAGS)
-+		$(LIBTOOL) $(CC) -o $@ $(OBJS) $(LDFLAGS)
++		$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(LDFLAGS)
  
  ../librplay/$(LIBRPLAY_NAME):
  		(cd ../librplay; $(MAKE) $(MFLAGS))
@@ -25,15 +25,15 @@ $NetBSD: patch-ap,v 1.1 2000/01/26 22:11:37 jlam Exp $
  install:	all
  		$(MKINSTALLDIRS) $(bindir)
 -		$(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
-+		$(LIBTOOL) $(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
++		$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(TARGET) $(bindir)/$(TARGET)
  
  uninstall:
 -		$(RM) $(bindir)/$(TARGET)
-+		$(LIBTOOL) $(RM) $(bindir)/$(TARGET)
++		$(LIBTOOL) --mode=uninstall $(RM) $(bindir)/$(TARGET)
  
  clean:
 -		$(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
-+		$(LIBTOOL) $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
++		$(LIBTOOL) --mode=clean $(RM) $(OBJS) $(TARGET) a.out core *~ *.bak *.orig TAGS
  
  distclean:	clean
  		$(RM) Makefile