bl3ify and update to version 1.2.2 (part of kde 3.2.2)

Changes:
ALSA: Make aRts work through DMix-devices

4 files changed, 31 insertions, 31 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 4450caacd6e..9b78d643422 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2004/04/12 23:15:01 salo Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/20 12:15:51 markd Exp $
 
-DISTNAME=	arts-1.2.1
+DISTNAME=	arts-1.2.2
 CATEGORIES=	audio
 COMMENT=	Analog Real-Time Synthesizer
 
@@ -8,24 +8,24 @@ COMMENT=	Analog Real-Time Synthesizer
 
 CONFLICTS+=	kdelibs-2*
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PERL5=		build
 
-BUILD_DEPENDS+=		pkgconfig>=0.15.0:../../devel/pkgconfig
-
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../audio/libaudiofile/buildlink2.mk"
-.include "../../audio/libmad/buildlink2.mk"
-.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../multimedia/libogg/buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+
+.include "../../audio/esound/buildlink3.mk"
+.include "../../audio/libaudiofile/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
 
-.include "../../mk/ossaudio.buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
 CONFIGURE_ARGS+=	--disable-threading
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index 33850162a29..904630df1dd 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.22 2004/04/04 06:45:00 mrg Exp $
+$NetBSD: distinfo,v 1.23 2004/04/20 12:15:51 markd Exp $
 
-SHA1 (arts-1.2.1.tar.bz2) = 8a81234dd2122bee981cc4df08ad0f3f591699f2
-Size (arts-1.2.1.tar.bz2) = 1039479 bytes
+SHA1 (arts-1.2.2.tar.bz2) = 36e8a41fcbde11c8c698400b864bb87da5ff5506
+Size (arts-1.2.2.tar.bz2) = 971207 bytes
 SHA1 (patch-aa) = ff582ade3d9913440cd20d92b342a5357991f555
 SHA1 (patch-ab) = 73c4ec5360ce671f69b6de4e226cda9478d098ee
 SHA1 (patch-ac) = de22843493a184f4aa8c20e011aa2a73ad794728
 SHA1 (patch-af) = 9a130ccd7f56656bb55e2c5edf223c38c69be591
 SHA1 (patch-ag) = 30177e80960a2877fb69cb5ffaadc4aa0d0783fc
-SHA1 (patch-ah) = a16f6b51896396d4cd02eab810d1568e946d4ef7
-SHA1 (patch-ai) = b22668ec3366803824172fef46b6999bae29122d
+SHA1 (patch-ah) = fa4380c6e0049e9ce8851d485c354e07145d9fe9
+SHA1 (patch-ai) = 1299fd6eb7864142dd3f8219660164e6f4ad082a
diff --git a/audio/arts/patches/patch-ah b/audio/arts/patches/patch-ah
index 13fdbbf0dfe..6be2f80fb35 100644
--- a/audio/arts/patches/patch-ah
+++ b/audio/arts/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.2 2003/07/09 15:13:03 markd Exp $
+$NetBSD: patch-ah,v 1.3 2004/04/20 12:15:51 markd Exp $
 
---- mcop_mt/threads_posix.cc.orig	2002-03-25 22:13:17.000000000 +0000
+--- mcop_mt/threads_posix.cc.orig	2004-04-04 19:37:55.000000000 +1200
 +++ mcop_mt/threads_posix.cc
-@@ -34,7 +34,151 @@
- #endif
- 
+@@ -33,7 +33,151 @@
+ #include <stddef.h>
+ #include <stdarg.h>
  #include <pthread.h>
 +#include <unistd.h>
 +#ifdef _POSIX_SEMAPHORES
@@ -154,7 +154,7 @@ $NetBSD: patch-ah,v 1.2 2003/07/09 15:13:03 markd Exp $
  #include <debug.h>
  #include <string.h>
  
-@@ -187,10 +330,12 @@ public:
+@@ -186,10 +330,12 @@ public:
  	Thread_impl(Thread *thread) : thread(thread) {
  	}
  	void setPriority(int priority) {
diff --git a/audio/arts/patches/patch-ai b/audio/arts/patches/patch-ai
index 432c7d70c6f..2264202096c 100644
--- a/audio/arts/patches/patch-ai
+++ b/audio/arts/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.4 2004/02/07 14:39:39 xtraeme Exp $
+$NetBSD: patch-ai,v 1.5 2004/04/20 12:15:51 markd Exp $
 
---- flow/gsl/Makefile.in.orig	2004-01-26 18:20:17.000000000 +1100
-+++ flow/gsl/Makefile.in	2004-02-08 00:43:18.000000000 +1100
-@@ -446,7 +446,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- flow/gsl/Makefile.in.orig	2004-04-06 02:30:07.000000000 +1200
++++ flow/gsl/Makefile.in
+@@ -172,7 +172,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \