summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/icecast/Makefile31
-rw-r--r--audio/xmms/Makefile6
2 files changed, 19 insertions, 18 deletions
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 2423d0d1a34..d15cd1c6ae5 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/05/15 07:28:51 martti Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/01 06:40:50 jlam Exp $
#
DISTNAME= icecast-1.3.12
@@ -9,18 +9,23 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://www.icecast.org/
COMMENT= Internet broadcasting system using Mpeg Layer III streaming
-DEPENDS+= unproven-pthreads>=0.17:../../devel/unproven-pthreads
-DEPENDS+= readline-4.*:../../devel/readline
+PTHREAD_OPTS+= native
+GNU_CONFIGURE= # defined
+CONFIGURE_ARGS+= --with-readline \
+ --with-libwrap \
+ --with-python \
+ --with-python-includes=${LOCALBASE}/include \
+ --with-python-libraries=${LOCALBASE}/lib
+CFLAGS+= -I${BUILDLINK_DIR}/include/readline
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+=--with-readline \
- --with-libwrap \
- --with-python \
- --with-python-includes=${LOCALBASE}/include \
- --with-python-libraries=${LOCALBASE}/lib
-R= ${LOCALBASE}/include/readline
-P= ${LOCALBASE}/pthreads
-CONFIGURE_ENV+= CC='$P/bin/pgcc -I$P/include -I$R -L$P/lib' \
- CXX='$P/bin/pg++ -I$P/include -I$R -L$P/lib'
+.include "../../devel/readline/buildlink.mk"
+.include "../../security/tcp_wrappers/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+. include "../../devel/unproven-pthreads/buildlink.mk"
+PGCC= ${CC} -I${BUILDLINK_PREFIX.unproven-pthreads}/pthreads/include
+CONFIGURE_ENV+= CC="${PGCC}"
+.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 48f81dacc43..28b0a59850d 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/06/25 08:17:33 abs Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/01 06:40:51 jlam Exp $
# FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
DISTNAME= xmms-1.2.7
@@ -44,7 +44,3 @@ post-patch:
.include "../../mk/ossaudio.buildlink.mk"
.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
-
-.if (${PTHREAD_TYPE} == pth) # XXX Remove after pth-syscall becomes pth
-CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
-.endif