Libtoolize portaudio and bump PKGREVISION. This may resolve PR#27050.

4 files changed, 40 insertions, 10 deletions

diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index 5332d46edc5..4832e901ac7 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/20 17:52:48 ben Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/05 03:53:15 ben Exp $
 #
 
 DISTNAME=		portaudio_v18_1
 PKGNAME=		portaudio-18.1
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://www.portaudio.com/archives/
 EXTRACT_SUFX=		.zip
@@ -14,6 +15,7 @@ COMMENT=		Portable cross-platform Audio API
 HAS_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		YES
+USE_LIBTOOL=		YES
 
 CONFIGURE_ARGS=		--prefix=${PREFIX}
 EXTRACT_CMD_OPTS.zip=	-aqo
diff --git a/audio/portaudio/PLIST b/audio/portaudio/PLIST
index 1c9ad7243a0..aae15336917 100644
--- a/audio/portaudio/PLIST
+++ b/audio/portaudio/PLIST
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/20 17:52:48 ben Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/10/05 03:53:15 ben Exp $
 include/portaudio.h
-lib/libportaudio.a
-lib/libportaudio.so.0.0.18
-lib/libportaudio.so
+lib/libportaudio.la
diff --git a/audio/portaudio/distinfo b/audio/portaudio/distinfo
index 65abbbe1f35..ade5a23067b 100644
--- a/audio/portaudio/distinfo
+++ b/audio/portaudio/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2004/08/27 06:29:06 jlam Exp $
+$NetBSD: distinfo,v 1.3 2004/10/05 03:53:15 ben Exp $
 
 SHA1 (portaudio_v18_1.zip) = a460ac5484137d77df17a95ce844ff7f178305b1
 Size (portaudio_v18_1.zip) = 550130 bytes
 SHA1 (patch-aa) = e522bfbf7f69d6f15fd0a32e01a480db922acc56
-SHA1 (patch-ac) = e1c912bb7b0eb24f31481996af92d42312dcd182
+SHA1 (patch-ac) = b5518e63fdb39f3323cdd1a54b6726b25b5ec729
 SHA1 (patch-ad) = 5a343e721ae183facc58195026c7e5c49536632a
 SHA1 (patch-ae) = c2744f10d80a478ad571fcce82bf301d6c50cb59
 SHA1 (patch-af) = da42578e66137f95edbbb86bde724af32e398d57
diff --git a/audio/portaudio/patches/patch-ac b/audio/portaudio/patches/patch-ac
index cae85f273fc..9e97586a850 100644
--- a/audio/portaudio/patches/patch-ac
+++ b/audio/portaudio/patches/patch-ac
@@ -1,10 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2004/08/27 06:29:06 jlam Exp $
+$NetBSD: patch-ac,v 1.3 2004/10/05 03:53:15 ben Exp $
 
 --- Makefile.in.orig	Tue Feb 11 23:24:56 2003
 +++ Makefile.in
-@@ -7,12 +7,12 @@
+@@ -5,14 +5,14 @@
+ #
+ 
  PREFIX = @prefix@
- CC = @CC@
+-CC = @CC@
++CC = ${LIBTOOL} --mode=compile @CC@
  CFLAGS = @CFLAGS@ -Ipa_common
 -LIBS = @LIBS@
 +LIBS = ${LIBOSSAUDIO} -L@prefix@/lib ${COMPILER_RPATH_FLAG}@prefix@/lib @LIBS@
@@ -17,3 +20,30 @@ $NetBSD: patch-ac,v 1.2 2004/08/27 06:29:06 jlam Exp $
  
  OTHER_OBJS = @OTHER_OBJS@
  
+@@ -57,18 +57,20 @@ all: lib/$(PALIB) lib/$(PADLLV) tests
+ tests: bin/ $(TESTS)
+ 
+ lib/$(PALIB): lib/ $(OBJS) Makefile $(PAINC)
+-	$(AR) ruv lib/$(PALIB) $(OBJS)
+-	$(RANLIB) lib/$(PALIB)
++	${LIBTOOL} --mode=link @CC@ -o lib/${PALIB:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:18:0
++#	$(AR) ruv lib/$(PALIB) $(OBJS)
++#	$(RANLIB) lib/$(PALIB)
+ 
+ lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
+-	$(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
++#	${LIBTOOL} --mode=link @CC@ $(SHARED_FLAGS) -o lib/$(PADLLV) ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:18:0 $(DLL_LIBS)
++#	$(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
+ 
+ $(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
+-	$(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)
++	${LIBTOOL} --mode=link @CC@ -o $@ $(CFLAGS) pa_tests/$*.c lib/${PALIB:.a=.la} $(LIBS)
+ 
+ install: lib/$(PALIB) lib/$(PADLLV)
+-	$(INSTALL) -m 644 lib/$(PADLLV) $(PREFIX)/lib/$(PADLLV)
+-	$(INSTALL) -m 644 lib/$(PALIB) $(PREFIX)/lib/$(PALIB)
++#	${LIBTOOL} --mode=install $(INSTALL) -m 644 lib/$(PADLLV) $(PREFIX)/lib/$(PADLLV)
++	${LIBTOOL} --mode=install $(INSTALL) -m 644 lib/${PALIB:.a=.la} $(PREFIX)/lib/
+ 	cd $(PREFIX)/lib && rm -f $(PADLL) && ln -s $(PADLLV) $(PADLL)
+ 	$(INSTALL) -m 644 pa_common/portaudio.h $(PREFIX)/include/portaudio.h
+ 	@echo ""