Add port audio/portaudio2:

This is portaudio v19, an implementation of portaudio
API v2.0.

Discussed with:	lofi
Inspired by:	portaudio-devel in pkgsrc
Repocopy by:	marcus

8 files changed, 21 insertions, 174 deletions

diff --git a/audio/portaudio2/Makefile b/audio/portaudio2/Makefile
index e0d84a79df1a..74b4fedf2ae1 100644
--- a/audio/portaudio2/Makefile
+++ b/audio/portaudio2/Makefile
@@ -6,61 +6,24 @@
 #
 
 PORTNAME=	portaudio
-PORTVERSION=	18.1
-PORTREVISION=	2
+PORTVERSION=	19.b${SNAPREV}
 CATEGORIES=	audio
-MASTER_SITES=	http://www.portaudio.com/archives/
-DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/}
+MASTER_SITES=	CSME
+# svn export -rSNAPREV https://www.portaudio.com/repos/portaudio/branches/v19-devel
 
-MAINTAINER=	lofi@freebsd.org
+MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Portable cross-platform Audio API
 
-USE_ZIP=	yes
+SNAPREV=	1175
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--disable-static --without-alsa --without-jack --without-asihpi \
+		--libdir=${PREFIX}/lib/${PORTNAME}2 --includedir=${PREFIX}/include/${PORTNAME}2
+USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}2
 
-PLIST_SUB+=	SHLIB_VERSION=${SHLIB_VERSION}
-SHLIB_VERSION=	0
-
-pre-everything::
-.if !defined(WITH_PATESTS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You can additionally build portaudio's testsuite by defining WITH_PATESTS."
-	@${ECHO_MSG}
-PLIST_SUB+=	WITH_PATESTS="@comment "
-.else
-PLIST_SUB+=	WITH_PATESTS=""
-.endif
-
-pre-patch:
-# replace \r\n with \n
-	@${FIND} ${WRKSRC} -type f \
-		| ${XARGS} -x -n 10 \
-			${REINPLACE_CMD} -E \
-				-e 's|
||'
 post-patch:
-# replace obsolete headers, and fix up thread library
-	@${FIND} ${WRKSRC} -type f \
-		| ${XARGS} -x -n 10 \
-			${REINPLACE_CMD} -E \
-				-e 's|malloc.h|stdlib.h|' \
-				-e 's|machine\/soundcard.h|sys\/soundcard.h|' \
-				-e 's|-lpthread|${PTHREAD_LIBS}|'
-pre-configure:
-# Make configure executable
-	@${CHMOD} +x ${WRKSRC}/configure
-
-.if !defined(WITH_PATESTS)
-post-configure:
-	@${REINPLACE_CMD} -e 's|tests$$||' ${WRKSRC}/Makefile
-.endif
-
-post-install:
-.if defined(WITH_PATESTS)
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin
-.endif
-	@${LN} -sf libportaudio.so \
-		${PREFIX}/lib/libportaudio.so.${SHLIB_VERSION}
+	@${GREP} -lre -lpthread ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'
+	@${REINPLACE_CMD} -e '/pkgconfig/s|$$[(]libdir[)]|${PREFIX}/libdata|' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/audio/portaudio2/distinfo b/audio/portaudio2/distinfo
index 8606f5004fcd..e4e45b9c26ee 100644
--- a/audio/portaudio2/distinfo
+++ b/audio/portaudio2/distinfo
@@ -1,3 +1,3 @@
-MD5 (portaudio_v18_1.zip) = ce66a732d263fde2b5ad2262ef37a691
-SHA256 (portaudio_v18_1.zip) = 9da7f1ba0b8029f934d5a8300199e29095127e6abfa03dbb3c1ce40e10751f0a
-SIZE (portaudio_v18_1.zip) = 550130
+MD5 (portaudio-19.b1175.tar.bz2) = 64edb465b3997afda3533b2a73582b80
+SHA256 (portaudio-19.b1175.tar.bz2) = e3e9cd380d0d6ac201042e4e37606c0fc35c39ed7b1af614782c62ba8796a0fc
+SIZE (portaudio-19.b1175.tar.bz2) = 795225
diff --git a/audio/portaudio2/files/patch-Makefile.in b/audio/portaudio2/files/patch-Makefile.in
deleted file mode 100644
index b0d24b715502..000000000000
--- a/audio/portaudio2/files/patch-Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- Makefile.in.orig	Mon Mar 15 15:51:08 2004
-+++ Makefile.in	Mon Mar 15 15:51:59 2004
-@@ -15,6 +15,7 @@
- DLL_LIBS = @DLL_LIBS@
- 
- OTHER_OBJS = @OTHER_OBJS@
-+OTHER_SHOBJS = @OTHER_SHOBJS@
- 
- PALIB = libportaudio.a
- PADLL = @PADLL@
-@@ -25,6 +26,10 @@
- 	pa_common/pa_convert.o \
- 	pa_common/pa_lib.o
- 
-+COMMON_SHOBJS = \
-+	pa_common/pa_convert.So \
-+	pa_common/pa_lib.So
-+
- TESTS = \
- 	bin/patest_buffer \
- 	bin/patest_clip \
-@@ -50,8 +55,15 @@
- 	bin/patest_underflow \
- 	bin/patest_wire
- 
-+.SUFFIXES: .o .So
-+
-+.c.So:
-+	$(CC) $(CFLAGS) -fPIC -o $*.So -c $?
-+
- OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
- 
-+SHOBJS = $(COMMON_SHOBJS) $(OTHER_SHOBJS)
-+
- all: lib/$(PALIB) lib/$(PADLLV) tests
- 
- tests: bin/ $(TESTS)
-@@ -60,8 +72,8 @@
- 	$(AR) ruv lib/$(PALIB) $(OBJS)
- 	$(RANLIB) lib/$(PALIB)
- 
--lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
--	$(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
-+lib/$(PADLLV): lib/ $(SHOBJS) Makefile $(PAINC)
-+	$(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(SHOBJS) $(DLL_LIBS)
- 
- $(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
- 	$(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)
diff --git a/audio/portaudio2/files/patch-configure b/audio/portaudio2/files/patch-configure
deleted file mode 100644
index 25233c71a03e..000000000000
--- a/audio/portaudio2/files/patch-configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig	Mon Mar 15 15:52:38 2004
-+++ configure	Mon Mar 15 15:53:00 2004
-@@ -1972,6 +1972,7 @@
- fi
- 
- 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+	OTHER_SHOBJS="pa_unix_oss/pa_unix_oss.So pa_unix_oss/pa_unix.So";
- 	LIBS="-lm -lpthread";
- 	PADLL="libportaudio.so";
- 	SHARED_FLAGS="-shared";
-@@ -2404,6 +2405,7 @@
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
- s,@AR@,$AR,;t t
- s,@OTHER_OBJS@,$OTHER_OBJS,;t t
-+s,@OTHER_SHOBJS@,$OTHER_SHOBJS,;t t
- s,@PADLL@,$PADLL,;t t
- s,@SHARED_FLAGS@,$SHARED_FLAGS,;t t
- s,@DLL_LIBS@,$DLL_LIBS,;t t
diff --git a/audio/portaudio2/files/patch-pa_tests::patest_record.c b/audio/portaudio2/files/patch-pa_tests::patest_record.c
deleted file mode 100644
index e24e9f28ed52..000000000000
--- a/audio/portaudio2/files/patch-pa_tests::patest_record.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- pa_tests/patest_record.c.orig	Sun Dec  7 14:48:31 2003
-+++ pa_tests/patest_record.c	Sun Dec  7 14:48:53 2003
-@@ -138,10 +138,10 @@
-     SAMPLE *wptr = (SAMPLE*)outputBuffer;
-     unsigned int i;
-     int finished;
-+    int framesToPlay, samplesToPlay, samplesPerBuffer;
-     unsigned int framesLeft = data->maxFrameIndex - data->frameIndex;
-     (void) inputBuffer; /* Prevent unused variable warnings. */
-     (void) outTime;
--    int framesToPlay, samplesToPlay, samplesPerBuffer;
- 
-     if( framesLeft < framesPerBuffer )
-     {
diff --git a/audio/portaudio2/files/patch-pa_tests::patest_wire.c b/audio/portaudio2/files/patch-pa_tests::patest_wire.c
deleted file mode 100644
index 0f158d80fb41..000000000000
--- a/audio/portaudio2/files/patch-pa_tests::patest_wire.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- pa_tests/patest_wire.c.orig	Sun Dec  7 14:49:15 2003
-+++ pa_tests/patest_wire.c	Sun Dec  7 14:49:52 2003
-@@ -74,9 +74,9 @@
-     SAMPLE *out = (SAMPLE*)outputBuffer;
-     SAMPLE *in = (SAMPLE*)inputBuffer;
-     unsigned int i;
--    (void) outTime;
-     int samplesPerFrame;
-     int numSamples;
-+    (void) outTime;
-     
-     samplesPerFrame = (int) userData;
-     numSamples =  framesPerBuffer * samplesPerFrame;
diff --git a/audio/portaudio2/pkg-descr b/audio/portaudio2/pkg-descr
index 99c36c3bd475..50e3e30dc13f 100644
--- a/audio/portaudio2/pkg-descr
+++ b/audio/portaudio2/pkg-descr
@@ -7,5 +7,3 @@ platforms, and was recently selected as the audio component of a
 larger PortMusic project that includes MIDI and sound file support.
 
 WWW: http://www.portaudio.com/
-
-michaelnottebrock@gmx.net
diff --git a/audio/portaudio2/pkg-plist b/audio/portaudio2/pkg-plist
index 0b42b5cf9c38..2bc5fa7cc783 100644
--- a/audio/portaudio2/pkg-plist
+++ b/audio/portaudio2/pkg-plist
@@ -1,28 +1,7 @@
-%%WITH_PATESTS%%bin/patest_buffer
-%%WITH_PATESTS%%bin/patest_clip
-%%WITH_PATESTS%%bin/patest_dither
-%%WITH_PATESTS%%bin/patest_hang
-%%WITH_PATESTS%%bin/patest_latency
-%%WITH_PATESTS%%bin/patest_leftright
-%%WITH_PATESTS%%bin/patest_longsine
-%%WITH_PATESTS%%bin/patest_many
-%%WITH_PATESTS%%bin/patest_maxsines
-%%WITH_PATESTS%%bin/patest_multi_sine
-%%WITH_PATESTS%%bin/patest_pink
-%%WITH_PATESTS%%bin/patest_record
-%%WITH_PATESTS%%bin/patest_ringmix
-%%WITH_PATESTS%%bin/patest_saw
-%%WITH_PATESTS%%bin/patest_sine
-%%WITH_PATESTS%%bin/patest_sine8
-%%WITH_PATESTS%%bin/patest_sine_formats
-%%WITH_PATESTS%%bin/patest_sine_time
-%%WITH_PATESTS%%bin/patest_stop
-%%WITH_PATESTS%%bin/patest_sync
-%%WITH_PATESTS%%bin/patest_toomanysines
-%%WITH_PATESTS%%bin/patest_underflow
-%%WITH_PATESTS%%bin/patest_wire
-include/portaudio.h
-lib/libportaudio.a
-lib/libportaudio.so
-lib/libportaudio.so.0.0.18
-lib/libportaudio.so.%%SHLIB_VERSION%%
+include/portaudio2/portaudio.h
+lib/portaudio2/libportaudio.la
+lib/portaudio2/libportaudio.so
+lib/portaudio2/libportaudio.so.2
+libdata/pkgconfig/portaudio-2.0.pc
+@dirrm include/portaudio2
+@dirrm lib/portaudio2