- Change libao to not build OSS, Sun, MacOS X nor several other plugins even

  when the header files are found.  Bump its revision to 1 due to this.
  This makes the libao package completely audio-output agnostic.
- Add a libao-macosx package containing the MacOS X plugin (sorry, untested).
- Add a libao-oss package containing the OSS plugin.  While here, use
  ossaudio.buildlink3.mk to determine the audio device instead of hardcoding
  it in a patch.
- Add a libao-macosx package containing the Sun audio plugin (sorry, untested).

Change approved by silence on tech-pkg@ for quite a long time since my
proposal.

I'm doing these changes to cleanup the base libao package.  Before these,
it contained a huge conditional to determine when the OSS and/or Sun
plugins were built, which often failed in untested platforms (PLIST
inconsistencies, for example).  Having these plugins in independent packages
makes debugging easier, keeps the dependency tree clean and also lets us use
{ONLY,NOT}_FOR_PLATFORM directives to easily say where they work or don't.

20 files changed, 186 insertions, 70 deletions

diff --git a/audio/Makefile b/audio/Makefile
index ef418bac85a..8f51bdf52eb 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.280 2005/05/16 09:55:43 rh Exp $
+# $NetBSD: Makefile,v 1.281 2005/05/20 19:20:55 jmmv Exp $
 #
 
 COMMENT=	Audio tools
@@ -120,6 +120,9 @@ SUBDIR+=	libac3
 SUBDIR+=	libao
 SUBDIR+=	libao-arts
 SUBDIR+=	libao-esound
+SUBDIR+=	libao-macosx
+SUBDIR+=	libao-oss
+SUBDIR+=	libao-sun
 SUBDIR+=	libaudiofile
 SUBDIR+=	libcdaudio
 SUBDIR+=	libcddb
diff --git a/audio/libao-macosx/DESCR b/audio/libao-macosx/DESCR
new file mode 100644
index 00000000000..6d7cfbc98de
--- /dev/null
+++ b/audio/libao-macosx/DESCR
@@ -0,0 +1,4 @@
+Libao is a cross-platform audio library that allows programs to
+output audio using a simple API on a wide variety of platforms.
+
+This package provides a MacOS X plugin for libao's core.
diff --git a/audio/libao-macosx/Makefile b/audio/libao-macosx/Makefile
new file mode 100644
index 00000000000..fc9e875d4f9
--- /dev/null
+++ b/audio/libao-macosx/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+
+.include "../libao/Makefile.common"
+
+PKGNAME=	${DISTNAME:S/libao/libao-macosx/}
+
+COMMENT+=	(MacOS X plugin)
+
+ONLY_FOR_PLATFORM+=	Darwin-*-*
+
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/ENABLE_MACOSX=no/ENABLE_MACOSX=yes/g}
+BUILD_DIRS=		${WRKSRC}/src/plugins/macosx
+INSTALL_DIRS=		${WRKSRC}/src/plugins/macosx
+
+BUILDLINK_DEPENDS.libao+=	libao>=0.8.6nb1
+
+.include "../../audio/libao/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao-macosx/PLIST b/audio/libao-macosx/PLIST
new file mode 100644
index 00000000000..d90cd844a57
--- /dev/null
+++ b/audio/libao-macosx/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+lib/ao/plugins-2/libmacosx.la
+@comment in libao: @dirrm lib/ao/plugins-2
diff --git a/audio/libao-oss/DESCR b/audio/libao-oss/DESCR
new file mode 100644
index 00000000000..565a511bde2
--- /dev/null
+++ b/audio/libao-oss/DESCR
@@ -0,0 +1,4 @@
+Libao is a cross-platform audio library that allows programs to
+output audio using a simple API on a wide variety of platforms.
+
+This package provides an OSS plugin for libao's core.
diff --git a/audio/libao-oss/Makefile b/audio/libao-oss/Makefile
new file mode 100644
index 00000000000..67a3766ff89
--- /dev/null
+++ b/audio/libao-oss/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+
+.include "../libao/Makefile.common"
+
+PKGNAME=	${DISTNAME:S/libao/libao-oss/}
+
+COMMENT+=	(OSS plugin)
+
+NOT_FOR_PLATFORM+=	Darwin-*-* Interix-*-* SunOS-*-*
+
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/ENABLE_OSS=no/ENABLE_OSS=yes/g}
+BUILD_DIRS=		${WRKSRC}/src/plugins/oss
+INSTALL_DIRS=		${WRKSRC}/src/plugins/oss
+
+SUBST_CLASSES+=		oss
+SUBST_MESSAGE.oss=	"Fixing paths to OSS devices."
+SUBST_STAGE.oss=	pre-configure
+SUBST_FILES.oss=	src/plugins/oss/ao_oss.c
+SUBST_SED.oss=		-e 's|/dev/dsp|${DEVOSSAUDIO}|g'
+SUBST_SED.oss+=		-e 's|/dev/sound/dsp|${DEVOSSAUDIO}|g'
+
+BUILDLINK_DEPENDS.libao+=	libao>=0.8.6nb1
+
+.include "../../audio/libao/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao-oss/PLIST b/audio/libao-oss/PLIST
new file mode 100644
index 00000000000..7025c423c0c
--- /dev/null
+++ b/audio/libao-oss/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+lib/ao/plugins-2/liboss.la
+@comment in libao: @dirrm lib/ao/plugins-2
diff --git a/audio/libao-sun/DESCR b/audio/libao-sun/DESCR
new file mode 100644
index 00000000000..935582fbabc
--- /dev/null
+++ b/audio/libao-sun/DESCR
@@ -0,0 +1,4 @@
+Libao is a cross-platform audio library that allows programs to
+output audio using a simple API on a wide variety of platforms.
+
+This package provides a Sun audio plugin for libao's core.
diff --git a/audio/libao-sun/Makefile b/audio/libao-sun/Makefile
new file mode 100644
index 00000000000..62353ad5338
--- /dev/null
+++ b/audio/libao-sun/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+
+.include "../libao/Makefile.common"
+
+PKGNAME=	${DISTNAME:S/libao/libao-sun/}
+
+COMMENT+=	(Sun audio plugin)
+
+ONLY_FOR_PLATFORM+=	SunOS-*-*
+
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/ENABLE_SUN_AUDIO=no/ENABLE_SUN_AUDIO=yes/g}
+BUILD_DIRS=		${WRKSRC}/src/plugins/sun
+INSTALL_DIRS=		${WRKSRC}/src/plugins/sun
+
+BUILDLINK_DEPENDS.libao+=	libao>=0.8.6nb1
+
+.include "../../audio/libao/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao-sun/PLIST b/audio/libao-sun/PLIST
new file mode 100644
index 00000000000..b2368889177
--- /dev/null
+++ b/audio/libao-sun/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2005/05/20 19:20:56 jmmv Exp $
+lib/ao/plugins-2/libsun.la
+@comment in libao: @dirrm lib/ao/plugins-2
diff --git a/audio/libao/DESCR b/audio/libao/DESCR
index 3d33135215f..982cb34bb40 100644
--- a/audio/libao/DESCR
+++ b/audio/libao/DESCR
@@ -9,5 +9,6 @@ libao currently supports:
    * Solaris (untested)
    * IRIX (untested)
 
-This NetBSD package uses /dev/sound (instead of /dev/sound/dsp)
-for the OSS support.
+This package provides the libao's core library but no output plugins
+by itself.  You will have to install some of the libao-* packages in
+order to get audio working.
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 1cfe13a0f9b..7b5fd264e99 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,7 +1,12 @@
-# $NetBSD: Makefile,v 1.26 2004/11/16 14:49:13 adam Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/20 19:20:55 jmmv Exp $
+
+PKGREVISION=		1
 
 PKG_INSTALLATION_TYPES=	overwrite
 
 .include "Makefile.common"
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/ao/plugins-2
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 66346d2fa8a..31ac81ce502 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/05/03 14:50:28 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/05/20 19:20:55 jmmv Exp $
 
 DISTNAME=	libao-0.8.6
 CATEGORIES=	audio devel
@@ -17,32 +17,18 @@ USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE+=	ao.pc.in
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-PLIST_SUBST+=		LIBOSS=""
-PLIST_SUBST+=		LIBSUN="@comment "
-.elif ${OPSYS} == "SunOS"
-PLIST_SUBST+=		LIBOSS="@comment "
-PLIST_SUBST+=		LIBSUN=""
-.elif ${OPSYS} == "Linux" && empty(MACHINE_PLATFORM:MLinux-*-sparc*)
-PLIST_SUBST+=		LIBOSS=""
-PLIST_SUBST+=		LIBSUN="@comment "
-.elif ${OPSYS} == "Interix"
-PLIST_SUBST+=		LIBOSS="@comment "
-PLIST_SUBST+=		LIBSUN="@comment "
-.elif ${OPSYS} == "Darwin"
-PLIST_SUBST+=		LIBOSS="@comment "
-PLIST_SUBST+=		LIBSUN="@comment "
-.else
-PLIST_SUBST+=		LIBOSS=""
-PLIST_SUBST+=		LIBSUN=""
-.endif
-
 CONFIGURE_ARGS+=	--disable-alsa
 CONFIGURE_ARGS+=	--disable-alsa09
 CONFIGURE_ARGS+=	--disable-arts
 CONFIGURE_ARGS+=	--disable-esd
+CONFIGURE_ARGS+=	--disable-nas
+CONFIGURE_ARGS+=	--disable-polyp
+CONFIGURE_ARGS+=	ENABLE_AIX_AUDIO=no
+CONFIGURE_ARGS+=	ENABLE_IRIX=no
+CONFIGURE_ARGS+=	ENABLE_OSS=no
+CONFIGURE_ARGS+=	ENABLE_SUN_AUDIO=no
+CONFIGURE_ARGS+=	ENABLE_MACOSX=no
+CONFIGURE_ARGS+=	ENABLE_SOLARIS=no
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/audio/libao/PLIST b/audio/libao/PLIST
index 55111e781f9..2669fb80f21 100644
--- a/audio/libao/PLIST
+++ b/audio/libao/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2004/11/16 14:49:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/05/20 19:20:55 jmmv Exp $
 include/ao/ao.h
 include/ao/os_types.h
 include/ao/plugin.h
-${LIBOSS}lib/ao/plugins-2/liboss.la
-${LIBSUN}lib/ao/plugins-2/libsun.la
 lib/libao.la
 lib/pkgconfig/ao.pc
 man/man5/libao.conf.5
@@ -45,6 +43,7 @@ share/doc/${PKGNAME}/plugin-api.html
 share/doc/${PKGNAME}/plugin-overview.html
 share/doc/${PKGNAME}/style.css
 @dirrm share/doc/${PKGNAME}
+@exec ${MKDIR} -p %D/lib/ao/plugins-2 
 @dirrm lib/ao/plugins-2
 @dirrm lib/ao
 @dirrm include/ao
diff --git a/audio/libao/PLIST.Darwin b/audio/libao/PLIST.Darwin
deleted file mode 100644
index 433fb5a7073..00000000000
--- a/audio/libao/PLIST.Darwin
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2004/12/18 17:14:18 grant Exp $
-${LIBOSS}lib/ao/plugins-2/libmacosx.la
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index 7f5e0593be2..da1a6619b35 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/05/20 19:20:55 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAO_BUILDLINK3_MK:=	${LIBAO_BUILDLINK3_MK}+
@@ -16,4 +16,7 @@ BUILDLINK_RECOMMENDED.libao+=	libao>=0.8.4nb1
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
 .endif	# LIBAO_BUILDLINK3_MK
 
+PRINT_PLIST_AWK+=	/^@dirrm lib\/ao\/plugins-2$$/ \
+				{ print "@comment in libao: " $$0; next }
+
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index f911cfedcf5..6d5884e7747 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.16 2005/02/23 20:39:47 agc Exp $
+$NetBSD: distinfo,v 1.17 2005/05/20 19:20:55 jmmv Exp $
 
 SHA1 (libao-0.8.6.tar.gz) = 2050e008ffcfd6803e2c2c03c7d5f469b6d8379e
 RMD160 (libao-0.8.6.tar.gz) = 650258240295f221e95d39cf2380ada73f3cb4e1
 Size (libao-0.8.6.tar.gz) = 387583 bytes
-SHA1 (patch-aa) = 09434b7552954e4dcef0a7d544f7576de6189785
 SHA1 (patch-ab) = 9d6902cf3532d858e9c3d2cce75c5b5869634028
 SHA1 (patch-ac) = b857f4cc3aa195230ce32f6b466d461016400f65
 SHA1 (patch-ad) = ed97b52cee1ea5652da233cdd4cf92320d56934d
-SHA1 (patch-ae) = 3b7c1e94ae0b8fe5124fd28780994a6ee3758428
+SHA1 (patch-ae) = 06e4d61d6465009e509d58a4eec6bd8c6f09b62f
diff --git a/audio/libao/patches/patch-aa b/audio/libao/patches/patch-aa
deleted file mode 100644
index 8f2107fc342..00000000000
--- a/audio/libao/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2003/12/08 14:33:47 wiz Exp $
-
---- src/plugins/oss/ao_oss.c.orig	Sat Oct  4 17:16:05 2003
-+++ src/plugins/oss/ao_oss.c
-@@ -81,22 +81,22 @@ int _open_default_oss_device (char **dev
- 	char *err = NULL;
- 	char *dev = NULL;
- 
--	/* default: first try the devfs path */
--	*dev_path = strdup("/dev/sound/dsp");
-+	/* default: first try the traditional path */
-+	*dev_path = strdup("/dev/dsp");
- #ifdef BROKEN_OSS
- 	fd = open(*dev_path, O_WRONLY | O_NONBLOCK);
- #else
- 	fd = open(*dev_path, O_WRONLY);
- #endif /* BROKEN_OSS */
- 
--	/* then try the original dsp path */
-+	/* then try the NetBSD path */
- 	if(fd < 0) 
- 	{
- 		/* no? then try the traditional path */
- 		err = strdup(strerror(errno));
- 		dev = strdup(*dev_path);
- 		free(*dev_path);
--		*dev_path = strdup("/dev/dsp");
-+		*dev_path = strdup("/dev/sound");
- #ifdef BROKEN_OSS
- 		fd = open(*dev_path, O_WRONLY | O_NONBLOCK);
- #else
diff --git a/audio/libao/patches/patch-ae b/audio/libao/patches/patch-ae
index 3be8d1758f0..a6a798252ea 100644
--- a/audio/libao/patches/patch-ae
+++ b/audio/libao/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2005/02/18 17:22:07 wiz Exp $
+$NetBSD: patch-ae,v 1.7 2005/05/20 19:20:55 jmmv Exp $
 
---- configure.orig	2005-01-11 23:08:26.000000000 +0100
+--- configure.orig	2005-01-11 22:08:26.000000000 +0000
 +++ configure
 @@ -19121,9 +19121,9 @@ else
                  PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
@@ -27,3 +27,69 @@ $NetBSD: patch-ae,v 1.6 2005/02/18 17:22:07 wiz Exp $
  if test "$BUILD_ESD" = "yes"; then
  
  # Check whether --with-esd-prefix or --without-esd-prefix was given.
+@@ -21108,6 +21113,10 @@ else
+   HAVE_OSS_FALSE=
+ fi
+ 
++if test "x${ENABLE_OSS}" = xno; then
++  HAVE_OSS_TRUE='#'
++  HAVE_OSS_FALSE=
++fi
+ 
+ 
+ 
+@@ -21932,6 +21941,10 @@ else
+   HAVE_SUN_AUDIO_FALSE=
+ fi
+ 
++if test "x${ENABLE_SUN_AUDIO}" = xno; then
++  HAVE_SUN_AUDIO_TRUE='#'
++  HAVE_SUN_AUDIO_FALSE=
++fi
+ 
+ 
+ case $host in
+@@ -22097,6 +22110,10 @@ else
+   HAVE_AIX_AUDIO_FALSE=
+ fi
+ 
++if test "x${ENABLE_AIX_AUDIO}" = xno; then
++  HAVE_AIX_AUDIO_TRUE='#'
++  HAVE_AIX_AUDIO_FALSE=
++fi
+ 
+ 
+ # Check whether --enable-arts or --disable-arts was given.
+@@ -22367,6 +22384,10 @@ else
+   HAVE_IRIX_FALSE=
+ fi
+ 
++if test "x${ENABLE_IRIX}" = xno; then
++  HAVE_IRIX_TRUE='#'
++  HAVE_IRIX_FALSE=
++fi
+ 
+ 
+ case $host in
+@@ -22385,6 +22406,10 @@ else
+   HAVE_MACOSX_FALSE=
+ fi
+ 
++if test "x${ENABLE_MACOSX}" = xno; then
++  HAVE_MACOSX_TRUE='#'
++  HAVE_MACOSX_FALSE=
++fi
+ 
+ 
+ 
+@@ -24218,6 +24243,10 @@ else
+   HAVE_SOLARIS_FALSE=
+ fi
+ 
++if test "x${ENABLE_SOLARIS}" = xno; then
++  HAVE_SOLARIS_TRUE='#'
++  HAVE_SOLARIS_FALSE=
++fi
+ 
+ 
+ 
diff --git a/doc/CHANGES b/doc/CHANGES
index 0d37c0b9071..37e05269ba3 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10142 2005/05/20 18:12:16 augustss Exp $
+$NetBSD: CHANGES,v 1.10143 2005/05/20 19:20:55 jmmv Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -2550,3 +2550,7 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated html to 4.01nb2 [wiz 2005-05-20]
 	Updated xephem to 3.6.4 [drochner 2005-05-20]
 	Added py-mcrypt-1.1 [augustss 2005-05-20]
+	Updated libao to 0.8.6nb1 [jmmv 2005-05-20]
+	Added libao-macosx-0.8.6 [jmmv 2005-05-20]
+	Added libao-oss-0.8.6 [jmmv 2005-05-20]
+	Added libao-sun-0.8.6 [jmmv 2005-05-20]