summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/portaudio/Makefile10
-rw-r--r--audio/portaudio/distinfo4
-rw-r--r--audio/portaudio/patches/patch-ac6
3 files changed, 11 insertions, 9 deletions
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index 84d6f3f1e0a..8276317c83c 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/02/03 16:10:22 tnn Exp $
+# $NetBSD: Makefile,v 1.17 2008/02/05 20:21:56 drochner Exp $
DISTNAME= portaudio_v18_1
PKGNAME= portaudio-18.1
@@ -26,14 +26,16 @@ EXTRACT_OPTS_ZIP= -aqo
INSTALLATION_DIRS+= lib include
.include "../../mk/bsd.prefs.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h)
-PTHREAD_LIBS+= -lrt
+RT_LIB_SCHED= -lrt
+.else
+RT_LIB_SCHED= # empty
.endif
+MAKE_ENV+= RT_LIB_SCHED=${RT_LIB_SCHED}
pre-configure:
${CHMOD} 755 ${WRKSRC:Q}/configure
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/portaudio/distinfo b/audio/portaudio/distinfo
index a4203028957..114b857a230 100644
--- a/audio/portaudio/distinfo
+++ b/audio/portaudio/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2007/07/01 21:00:15 heinz Exp $
+$NetBSD: distinfo,v 1.9 2008/02/05 20:21:56 drochner Exp $
SHA1 (portaudio_v18_1.zip) = a460ac5484137d77df17a95ce844ff7f178305b1
RMD160 (portaudio_v18_1.zip) = 3352d70225a81aae80eefabc3701658da0c750c2
Size (portaudio_v18_1.zip) = 550130 bytes
SHA1 (patch-aa) = e522bfbf7f69d6f15fd0a32e01a480db922acc56
-SHA1 (patch-ac) = 17bdfd65b50bcadf993bcef232c19d903c3a5446
+SHA1 (patch-ac) = ab322d3a8c65f4c611e694b0d845132b7b58b4dc
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 f8a42b6433f..d523a008c52 100644
--- a/audio/portaudio/patches/patch-ac
+++ b/audio/portaudio/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2007/07/01 21:00:15 heinz Exp $
+$NetBSD: patch-ac,v 1.6 2008/02/05 20:21:56 drochner Exp $
--- Makefile.in.orig 2003-02-11 23:24:56.000000000 +0100
+++ Makefile.in
@@ -10,13 +10,13 @@ $NetBSD: patch-ac,v 1.5 2007/07/01 21:00:15 heinz Exp $
+CC = ${LIBTOOL} --mode=compile @CC@
CFLAGS = @CFLAGS@ -Ipa_common
-LIBS = @LIBS@
-+LIBS = ${LIBOSSAUDIO} -L@prefix@/lib ${COMPILER_RPATH_FLAG}@prefix@/lib @LIBS@
++LIBS = ${LIBOSSAUDIO} ${RT_LIB_SCHED} -L@prefix@/lib ${COMPILER_RPATH_FLAG}@prefix@/lib @LIBS@
AR = @AR@
RANLIB = @RANLIB@
INSTALL = @INSTALL@
SHARED_FLAGS = @SHARED_FLAGS@
-DLL_LIBS = @DLL_LIBS@
-+DLL_LIBS = @DLL_LIBS@ ${LIBOSSAUDIO}
++DLL_LIBS = @DLL_LIBS@ ${LIBOSSAUDIO} ${RT_LIB_SCHED}
OTHER_OBJS = @OTHER_OBJS@