buildlink1 -> buildlink2, and modify the arts configure script to use

"${LIBOSSAUDIO}" instead of "-lossaudio".  arts now works properly with
audio/oss.

4 files changed, 58 insertions, 28 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index fc2769d03df..693db39aa72 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/04 14:47:35 agc Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/03 10:22:35 jlam Exp $
 
 DISTNAME=	arts-1.0.3
 CATEGORIES=	audio
@@ -8,22 +8,22 @@ COMMENT=	Analog Real-Time Synthesizer
 
 CONFLICTS+=	kdelibs-2*
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
+USE_PERL5=		build
 
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libltdl/libtool
-
-USE_PERL5=		build
+CONFIGURE_ENV+=		ac_cv_path_PKG_CONFIG=no
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
-.include "../../audio/libaudiofile/buildlink.mk"
-.include "../../x11/kde3/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
+.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../x11/kde3/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
 CONFIGURE_ARGS+=	--disable-threading
 .endif
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index 7f8440d71a1..f040a6cb8ce 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2002/08/28 07:15:26 skrll Exp $
+$NetBSD: distinfo,v 1.5 2002/10/03 10:22:35 jlam Exp $
 
 SHA1 (arts-1.0.3.tar.bz2) = f0ce0361c5742d647778bac835f22fa115bac355
 Size (arts-1.0.3.tar.bz2) = 1018185 bytes
 SHA1 (patch-aa) = 23dd79c83f7e0905cef66e002387f44c18438fed
-SHA1 (patch-ab) = 5b3eb01f2e66e7533c729f64ad17bfc6d560e1da
+SHA1 (patch-ab) = 06265879020edf24ff51403565fd422c3b7a17e5
 SHA1 (patch-ac) = 73cc8b5398d4191dfbf817d4b2e03917ab2ba6f6
 SHA1 (patch-ad) = f030e7f34e4c32d0df6e1c0bcdb9e1bd82e687c5
 SHA1 (patch-ae) = 4913eab125a37e2cb95d1574cad5c7eb84e80956
 SHA1 (patch-af) = 9a130ccd7f56656bb55e2c5edf223c38c69be591
+SHA1 (patch-ag) = eea4e04b778ae74d92ae9f5e60f9a51aa01431cf
diff --git a/audio/arts/patches/patch-ab b/audio/arts/patches/patch-ab
index f017f2c83d6..3c5925cd21c 100644
--- a/audio/arts/patches/patch-ab
+++ b/audio/arts/patches/patch-ab
@@ -1,22 +1,35 @@
-$NetBSD: patch-ab,v 1.3 2002/08/25 19:21:45 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2002/10/03 10:22:35 jlam Exp $
 
---- artsc/artsdsp.c.orig	Mon Jun 24 17:55:50 2002
+--- artsc/artsdsp.c.orig	Mon Jun 24 09:55:50 2002
 +++ artsc/artsdsp.c
-@@ -127,6 +127,9 @@
+@@ -127,6 +127,14 @@ int munmap(void *start, size_t length);
  
  static void artsdsp_doinit()
  {
-+#if defined(__NetBSD__)
++# ifdef RTLD_NEXT
++#  define OPEN_GLOBAL()		handle = RTLD_NEXT;
++#  define CLOSE_GLOBAL()	;
++# else
++#  define OPEN_GLOBAL()		handle = dlopen(NULL, DL_LAZY);
++#  define CLOSE_GLOBAL()	dlclose(handle);
++# endif
 +	void *handle;
-+#endif
  	const char *env;
  	artsdsp_init = 1;
  
-@@ -139,6 +142,18 @@
+@@ -139,14 +147,29 @@ static void artsdsp_doinit()
  	mmapemu = env && !strcmp(env,"1");
  
  	/* resolve original symbols */
-+#if defined(__NetBSD__)
+-	orig_open = (orig_open_ptr)dlsym(RTLD_NEXT,"open");
+-	orig_close = (orig_close_ptr)dlsym(RTLD_NEXT,"close");
+-	orig_write = (orig_write_ptr)dlsym(RTLD_NEXT,"write");
+-	orig_ioctl = (orig_ioctl_ptr)dlsym(RTLD_NEXT,"ioctl");
+-	orig_mmap = (orig_mmap_ptr)dlsym(RTLD_NEXT,"mmap");
+-	orig_munmap = (orig_munmap_ptr)dlsym(RTLD_NEXT,"munmap");
+-	orig_fopen = (orig_fopen_ptr)dlsym(RTLD_NEXT,"fopen");
+-	orig_access = (orig_access_ptr)dlsym(RTLD_NEXT,"access");
++#if defined(__NetBSD__) && !defined(OPEN_SOUND_SYSTEM)
 +	handle = dlopen(NULL, DL_LAZY);
 +	orig_open = (orig_open_ptr)dlsym(handle,"open");
 +	orig_close = (orig_close_ptr)dlsym(handle,"close");
@@ -28,22 +41,25 @@ $NetBSD: patch-ab,v 1.3 2002/08/25 19:21:45 jlam Exp $
 +	orig_access = (orig_access_ptr)dlsym(handle,"access");
 +	(void) dlclose(handle);
 +#else
- 	orig_open = (orig_open_ptr)dlsym(RTLD_NEXT,"open");
- 	orig_close = (orig_close_ptr)dlsym(RTLD_NEXT,"close");
- 	orig_write = (orig_write_ptr)dlsym(RTLD_NEXT,"write");
-@@ -147,6 +162,7 @@
- 	orig_munmap = (orig_munmap_ptr)dlsym(RTLD_NEXT,"munmap");
- 	orig_fopen = (orig_fopen_ptr)dlsym(RTLD_NEXT,"fopen");
- 	orig_access = (orig_access_ptr)dlsym(RTLD_NEXT,"access");
++	OPEN_GLOBAL();
++	orig_open = (orig_open_ptr)dlsym(handle,"open");
++	orig_close = (orig_close_ptr)dlsym(handle,"close");
++	orig_write = (orig_write_ptr)dlsym(handle,"write");
++	orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"ioctl");
++	orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap");
++	orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap");
++	orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen");
++	orig_access = (orig_access_ptr)dlsym(handle,"access");
++	CLOSE_GLOBAL();
 +#endif
  }
  
  static void artsdspdebug(const char *fmt,...)
-@@ -231,13 +247,18 @@
+@@ -231,13 +254,18 @@ int open (const char *pathname, int flag
    return sndfd;
  }
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) && !defined(OPEN_SOUND_SYSTEM)
 +int _oss_ioctl (int fd, unsigned long request, void *argp)
 +#else
  int ioctl (int fd, ioctl_request_t request, ...)
@@ -54,11 +70,11 @@ $NetBSD: patch-ab,v 1.3 2002/08/25 19:21:45 jlam Exp $
    static int speed;
    int space, size, latency, odelay;
  
-+#if !defined(__NetBSD__)
++#if !defined(__NetBSD__) || defined(OPEN_SOUND_SYSTEM)
    /*
     * FreeBSD needs ioctl with varargs. However I have no idea how to "forward"
     * the variable args ioctl to the orig_ioctl routine. So I expect the ioctl
-@@ -249,6 +270,7 @@
+@@ -249,6 +277,7 @@ int ioctl (int fd, ioctl_request_t reque
    va_start(args,request);
    argp = va_arg(args, void *);
    va_end(args);
diff --git a/audio/arts/patches/patch-ag b/audio/arts/patches/patch-ag
new file mode 100644
index 00000000000..a8615e1cc0c
--- /dev/null
+++ b/audio/arts/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2002/10/03 10:22:35 jlam Exp $
+
+--- configure.orig	Thu Oct  3 02:11:16 2002
++++ configure
+@@ -23952,7 +23952,7 @@ fi
+ echo "$as_me:23952: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
+ echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6
+ if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
+-  LIBOSSAUDIO="-lossaudio"
++  LIBOSSAUDIO="${LIBOSSAUDIO}"
+ fi
+ 
+ MCOPIDL='$(top_builddir)/mcopidl/mcopidl'