Add optional nas and jack support and make esound optional (on by default,

for backward compatibility)
note user-destdir support.

5 files changed, 55 insertions, 7 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 9cebefbddbb..47acb143a2c 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2007/11/23 22:05:13 rillig Exp $
+# $NetBSD: Makefile,v 1.65 2008/01/21 00:43:49 markd Exp $
 
 DISTNAME=	arts-1.5.8
 CATEGORIES=	audio
@@ -7,6 +7,8 @@ COMMENT=	Analog Real-Time Synthesizer
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	kdelibs-2*
 
 USE_TOOLS+=	perl pkg-config
@@ -17,7 +19,6 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 _IN_ARTS_BUILD=		yes
 .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"
@@ -27,6 +28,8 @@ _IN_ARTS_BUILD=		yes
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
+.include "options.mk"
+
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
 CONFIGURE_ARGS+=	--disable-threading
 .endif
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index 27810e0571e..e2202667a4e 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2008/01/21 00:43:49 markd Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ARTS_BUILDLINK3_MK:=	${ARTS_BUILDLINK3_MK}+
@@ -20,7 +20,6 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/arts$$/ \
 				{ print "@comment in arts: " $$0; next; }
 .endif	# ARTS_BUILDLINK3_MK
 
-.include "../../audio/esound/buildlink3.mk"
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
@@ -29,4 +28,19 @@ PRINT_PLIST_AWK+=	/^@dirrm include\/arts$$/ \
 
 .include "../../mk/oss.buildlink3.mk"
 
+pkgbase := arts
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.arts:Mesound)
+.include "../../audio/esound/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.arts:Mnas)
+.include "../../audio/nas/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.arts:Mjack)
+.include "../../audio/jack/buildlink3.mk"
+.endif
+
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index e994183d06b..488834b208e 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2007/10/20 10:34:15 markd Exp $
+$NetBSD: distinfo,v 1.44 2008/01/21 00:43:49 markd Exp $
 
 SHA1 (arts-1.5.8.tar.bz2) = 190162c2075ee4ebaac569c61b161147c3505690
 RMD160 (arts-1.5.8.tar.bz2) = 0c8e92bed7ff8c85e324ba88d2b421a1009e5669
@@ -7,6 +7,6 @@ SHA1 (patch-aa) = ff582ade3d9913440cd20d92b342a5357991f555
 SHA1 (patch-ab) = 73c4ec5360ce671f69b6de4e226cda9478d098ee
 SHA1 (patch-ac) = de22843493a184f4aa8c20e011aa2a73ad794728
 SHA1 (patch-af) = 9a130ccd7f56656bb55e2c5edf223c38c69be591
-SHA1 (patch-ag) = f1fa093958721229050fe3e79a4497f9180f2bbc
+SHA1 (patch-ag) = 618e792fe0338e0c00b442ea8a4d0f68a96e13a3
 SHA1 (patch-ah) = fa4380c6e0049e9ce8851d485c354e07145d9fe9
 SHA1 (patch-ai) = aee6c94746a84aae101decc1ca5b2fff43a669c1
diff --git a/audio/arts/options.mk b/audio/arts/options.mk
new file mode 100644
index 00000000000..d943a929213
--- /dev/null
+++ b/audio/arts/options.mk
@@ -0,0 +1,22 @@
+$NetBSD: options.mk,v 1.1 2008/01/21 00:43:49 markd Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.arts
+PKG_SUPPORTED_OPTIONS=	esound nas jack
+PKG_SUGGESTED_OPTIONS=	esound
+
+.include "../../mk/bsd.options.mk"
+
+# ESOUND support
+.if !empty(PKG_OPTIONS:Mesound)
+.include "../../audio/esound/buildlink3.mk"
+.endif
+
+# NAS support
+.if !empty(PKG_OPTIONS:Mnas)
+.include "../../audio/nas/buildlink3.mk"
+.endif
+
+# JACK support
+.if !empty(PKG_OPTIONS:Mjack)
+.include "../../audio/jack/buildlink3.mk"
+.endif
diff --git a/audio/arts/patches/patch-ag b/audio/arts/patches/patch-ag
index c89e330ba56..11f01c377bd 100644
--- a/audio/arts/patches/patch-ag
+++ b/audio/arts/patches/patch-ag
@@ -1,7 +1,16 @@
-$NetBSD: patch-ag,v 1.4 2007/05/23 12:53:01 markd Exp $
+$NetBSD: patch-ag,v 1.5 2008/01/21 00:43:50 markd Exp $
 
 --- configure.orig	2007-05-14 23:23:31.000000000 +1200
 +++ configure
+@@ -37433,7 +37433,7 @@ if test "${ac_cv_lib_audio_AuOpenServer+
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-laudio  $LIBS"
++LIBS="-laudio -lXt -lm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
 @@ -44241,7 +44241,7 @@ fi
  { echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
  echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6; }