update to version 0.7.0

11 files changed, 51 insertions, 774 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 3ace01a1649..8efecb30eff 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/03/28 10:21:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/08 09:18:28 lukem Exp $
 
-DISTNAME=	libao-0.6.0
-PKGNAME=	${DISTNAME}nb1
+DISTNAME=	libao-0.7.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/
+MASTER_SITES=	http://www.vorbis.com/files/rc1/unix/
 
 MAINTAINER=	reed@reedmedia.net
 COMMENT=	cross-platform audio library
diff --git a/audio/libao/buildlink.mk b/audio/libao/buildlink.mk
new file mode 100644
index 00000000000..9ee99485f86
--- /dev/null
+++ b/audio/libao/buildlink.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/08/08 09:18:28 lukem Exp $
+#
+# This Makefile fragment is included by packages that use libao.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.libao to the dependency pattern
+#     for the version of libao desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(LIGAO_BUILDLINK_MK)
+LIGAO_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.libao?=	libao>=0.7.0
+DEPENDS+=		${BUILDLINK_DEPENDS.libao}:../../audio/libao
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.libao=libao
+BUILDLINK_PREFIX.libao=	${LOCALBASE}
+BUILDLINK_FILES.libao=	include/ao/ao.h
+BUILDLINK_FILES.libao+=	include/ao/os_types.h
+BUILDLINK_FILES.libao+=	lib/libao.*
+BUILDLINK_FILES.libao+=	lib/ao/*
+
+BUILDLINK_TARGETS.libao=libao-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.libao}
+
+pre-configure: ${BUILDLINK_TARGETS.libao}
+libao-buildlink: _BUILDLINK_USE
+
+.endif	# LIGAO_BUILDLINK_MK
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index 16ff756a205..e644179ea61 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/05/12 21:26:39 mycroft Exp $
+$NetBSD: distinfo,v 1.4 2001/08/08 09:18:28 lukem Exp $
 
-SHA1 (libao-0.6.0.tar.gz) = 329003690b2484fa79faa6d9517ff2065e1c513f
-Size (libao-0.6.0.tar.gz) = 135796 bytes
-SHA1 (patch-aa) = 10e98524d4b9046f6c37b44c8743c983aad7d542
+SHA1 (libao-0.7.0.tar.gz) = d092ba9cb7868561b6b40515196e5beae077f55b
+Size (libao-0.7.0.tar.gz) = 141761 bytes
 SHA1 (patch-ab) = 5f433ac5bf7ff65f02c5aa33faf6b8e28d84e53e
 SHA1 (patch-ac) = c9c77903ff355b7dcef5476d3779234c4bd82e42
-SHA1 (patch-ad) = bf6bdd1c94ef1e2914081be913fbcc126863aee6
-SHA1 (patch-ae) = 3aaa40282018d9b9cc325e4df673985d8ccbf900
-SHA1 (patch-af) = 2fb1e6403d6fd4aa420a5173e36d5cd2f151038a
-SHA1 (patch-ag) = b33af4e05bbb43f2cb65dce94e10f7c6e8c46519
-SHA1 (patch-ah) = 8b3fb7de3519459f4a95ec31205a0693c6c3b40e
-SHA1 (patch-ai) = a061b3e905f763314a903ce9834d73f730cc8d2a
diff --git a/audio/libao/patches/patch-aa b/audio/libao/patches/patch-aa
deleted file mode 100644
index 4d22e0075f4..00000000000
--- a/audio/libao/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/03/20 09:57:37 wiz Exp $
-
---- configure.in.orig	Sat Feb 24 02:31:45 2001
-+++ configure.in
-@@ -112,7 +112,7 @@
- 
- dnl Check for ESD
- 
--AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no)
-+AM_PATH_ESD(0.2.8, have_esd=no, have_esd=no)
- AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes)
- 
- dnl Check for OSS
-@@ -133,6 +133,11 @@
- fi
- AC_SUBST(ALSA_LIBS)
- 
-+dnl Check for Sun audio
-+
-+AC_CHECK_HEADERS(sys/audioio.h)
-+AM_CONDITIONAL(HAVE_SUN_AUDIO,test "${ac_cv_header_sys_audioio_h}" = yes)
-+
- dnl Check for aRts
- 
- AC_PATH_PROG(ARTSC_CONFIG, artsc-config)
-@@ -160,4 +165,4 @@
- 
- CFLAGS="$CFLAGS -DAO_PLUGIN_PATH=\\\"$plugindir\\\""
- 
--AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/arts/Makefile debian/Makefile)
-+AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/sun/Makefile src/plugins/arts/Makefile debian/Makefile)
diff --git a/audio/libao/patches/patch-ad b/audio/libao/patches/patch-ad
deleted file mode 100644
index 744d453eca5..00000000000
--- a/audio/libao/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/03/20 09:57:37 wiz Exp $
-
---- src/ao_wav.c.orig	Sat Feb 24 02:31:46 2001
-+++ src/ao_wav.c
-@@ -221,7 +221,7 @@
- 
- 		/* Swap the bytes into the swap buffer (so we don't
- 		 mess up the output_samples buffer) */
--		for(i = 0; i < num_bytes/2; i+=2) {
-+		for(i = 0; i < num_bytes; i+=2) {
- 			s->swap_buffer[i]   = ((char *) output_samples)[i+1];
- 			s->swap_buffer[i+1] = ((char *) output_samples)[i];
- 		}
-@@ -297,6 +297,9 @@
- 
- ERR:
- 	close(s->fd);
-+	free(s->output_file);
-+	if (s->byte_swap)
-+		free(s->byte_swap);
- 	free(s);
- }
- 
diff --git a/audio/libao/patches/patch-ae b/audio/libao/patches/patch-ae
deleted file mode 100644
index 8f13fc4b22f..00000000000
--- a/audio/libao/patches/patch-ae
+++ /dev/null
@@ -1,130 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/03/20 09:57:37 wiz Exp $
-
---- configure.orig	Mon Feb 26 05:58:48 2001
-+++ configure
-@@ -1847,7 +1847,7 @@
-   fi
-   if test "x$no_esd" = x ; then
-      echo "$ac_t""yes" 1>&6
--     have_esd=yes     
-+     have_esd=no     
-   else
-      echo "$ac_t""no" 1>&6
-      if test "$ESD_CONFIG" = "no" ; then
-@@ -2147,10 +2147,61 @@
- 
- 
- 
-+for ac_hdr in sys/audioio.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:2155: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2160 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:2165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+
-+
-+if test "${ac_cv_header_sys_audioio_h}" = yes; then
-+  HAVE_SUN_AUDIO_TRUE=
-+  HAVE_SUN_AUDIO_FALSE='#'
-+else
-+  HAVE_SUN_AUDIO_TRUE='#'
-+  HAVE_SUN_AUDIO_FALSE=
-+fi
-+
-+
- # Extract the first word of "artsc-config", so it can be a program name with args.
- set dummy artsc-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2154: checking for $ac_word" >&5
-+echo "configure:2205: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_ARTSC_CONFIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2205,7 +2256,7 @@
- case $host in
-         *-*-irix*)
-                 echo $ac_n "checking for ALwritesamps in -laudio""... $ac_c" 1>&6
--echo "configure:2209: checking for ALwritesamps in -laudio" >&5
-+echo "configure:2260: checking for ALwritesamps in -laudio" >&5
- ac_lib_var=`echo audio'_'ALwritesamps | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2213,7 +2264,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-laudio  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2217 "configure"
-+#line 2268 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2224,7 +2275,7 @@
- ALwritesamps()
- ; return 0; }
- EOF
--if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2382,7 +2433,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
- 
--trap 'rm -fr `echo "Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/arts/Makefile debian/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/sun/Makefile src/plugins/arts/Makefile debian/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
-@@ -2458,6 +2509,8 @@
- s%@HAVE_ALSA_TRUE@%$HAVE_ALSA_TRUE%g
- s%@HAVE_ALSA_FALSE@%$HAVE_ALSA_FALSE%g
- s%@ALSA_LIBS@%$ALSA_LIBS%g
-+s%@HAVE_SUN_AUDIO_TRUE@%$HAVE_SUN_AUDIO_TRUE%g
-+s%@HAVE_SUN_AUDIO_FALSE@%$HAVE_SUN_AUDIO_FALSE%g
- s%@ARTSC_CONFIG@%$ARTSC_CONFIG%g
- s%@HAVE_ARTS_TRUE@%$HAVE_ARTS_TRUE%g
- s%@HAVE_ARTS_FALSE@%$HAVE_ARTS_FALSE%g
-@@ -2508,7 +2561,7 @@
- 
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/arts/Makefile debian/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/sun/Makefile src/plugins/arts/Makefile debian/Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/audio/libao/patches/patch-af b/audio/libao/patches/patch-af
deleted file mode 100644
index de4d9b1befd..00000000000
--- a/audio/libao/patches/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/03/20 09:57:37 wiz Exp $
-
---- src/plugins/Makefile.am.orig	Sat Dec 30 06:03:25 2000
-+++ src/plugins/Makefile.am
-@@ -1,4 +1,4 @@
- ## Process this file with automake to produce Makefile.in
- 
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = oss esd alsa arts # solaris irix
-+SUBDIRS = oss sun esd alsa arts # irix
diff --git a/audio/libao/patches/patch-ag b/audio/libao/patches/patch-ag
deleted file mode 100644
index f49b4984ebd..00000000000
--- a/audio/libao/patches/patch-ag
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/03/20 09:57:37 wiz Exp $
-
---- src/plugins/sun/Makefile.am.orig	Mon Mar 19 19:34:19 2001
-+++ src/plugins/sun/Makefile.am
-@@ -0,0 +1,27 @@
-+## Process this file with automake to produce Makefile.in
-+
-+AUTOMAKE_OPTIONS = foreign
-+
-+if HAVE_SUN_AUDIO
-+
-+sunltlibs = libsun.la
-+sunldflags = -export-dynamic -avoid-version
-+sunsources = ao_sun.c
-+
-+else
-+
-+sunltlibs =
-+sunldflags =
-+sunsources =
-+
-+endif
-+
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
-+
-+libdir = $(plugindir)
-+lib_LTLIBRARIES = $(sunltlibs)
-+
-+libsun_la_LDFLAGS = $(sunldflags)
-+libsun_la_SOURCES = $(sunsources)
-+
-+EXTRA_DIST = ao_sun.c
diff --git a/audio/libao/patches/patch-ah b/audio/libao/patches/patch-ah
deleted file mode 100644
index e5c8707a5f3..00000000000
--- a/audio/libao/patches/patch-ah
+++ /dev/null
@@ -1,155 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2001/05/12 21:26:40 mycroft Exp $
-
---- src/plugins/sun/ao_sun.c.orig	Mon Mar 19 19:34:22 2001
-+++ src/plugins/sun/ao_sun.c
-@@ -0,0 +1,150 @@
-+/*
-+ *
-+ *  ao_sun.c    Solaris/NetBSD/OpenBSD
-+ *
-+ *      Original Copyright (C) Aaron Holtzman - May 1999
-+ *      Modifications Copyright (C) Stan Seibert - July 2000
-+ *      and Copyright (C) Christian Weisgerber - March 2001
-+ *
-+ *  libao is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2, or (at your option)
-+ *  any later version.
-+ *
-+ *  libao is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with GNU Make; see the file COPYING.  If not, write to
-+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/audioio.h>
-+
-+#ifndef AUDIO_ENCODING_SLINEAR
-+#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR	/* Solaris */
-+#endif
-+
-+#include <ao/ao.h>
-+
-+ao_info_t ao_sun_info = {
-+	"Sun audio driver output",
-+	"sun",
-+	"Christian Weisgerber <naddy@openbsd.org>",
-+	"Outputs to the sun audio system."
-+};
-+
-+typedef struct ao_sun_internal_s {
-+	char *dev;
-+	int fd;
-+} ao_sun_internal_t;
-+
-+void ao_sun_parse_options(ao_sun_internal_t *state, ao_option_t *options)
-+{
-+	state->dev = NULL;
-+
-+	while (options) {
-+		if (!strcmp(options->key, "dev"))
-+			state->dev = strdup(options->value);
-+		options = options->next;
-+	}
-+}
-+
-+ao_internal_t *plugin_open(uint_32 bits, uint_32 rate, uint_32 channels, ao_option_t *options)
-+{
-+	ao_sun_internal_t *state;
-+	audio_info_t info;
-+
-+	state = malloc(sizeof(ao_sun_internal_t));
-+
-+	if (state == NULL) {
-+		fprintf(stderr,"libao: Error allocating state memory: %s\n",
-+			strerror(errno));
-+		goto ERR;
-+	}
-+
-+	ao_sun_parse_options(state, options);
-+
-+	if (state->dev != NULL) {
-+		/* open the user-specified path */
-+		state->fd = open(state->dev, O_WRONLY);
-+		if (state->fd < 0) {
-+			fprintf(stderr, "libao: Error opening audio device %s: %s\n",
-+				state->dev, strerror(errno));
-+			goto ERR;
-+		}
-+	} else {
-+		/* default */
-+		state->dev = strdup("/dev/sound");
-+		state->fd = open(state->dev, O_WRONLY);
-+		if (state->fd < 0) {
-+			fprintf(stderr,
-+				"libao: Could not open default device %s: %s\n",
-+				state->dev, strerror(errno));
-+			goto ERR;
-+		}
-+	}
-+
-+	AUDIO_INITINFO(&info);
-+#ifdef AUMODE_PLAY	/* NetBSD/OpenBSD */
-+	info.mode = AUMODE_PLAY;
-+#endif
-+	info.play.encoding = AUDIO_ENCODING_SLINEAR;
-+	info.play.precision = bits;
-+	info.play.sample_rate = rate;
-+	info.play.channels = channels;
-+
-+ 	if (ioctl(state->fd, AUDIO_SETINFO, &info) < 0) {
-+		fprintf(stderr,
-+			"libao: Cannot set device to %d bits, %d Hz, %d channels: %s\n",
-+			bits, rate, channels, strerror(errno));
-+		goto ERR;
-+	}
-+
-+	return state;
-+
-+ERR:
-+	if (state != NULL) {
-+		if (state->fd >= 0)
-+			close(state->fd);
-+		if (state->dev)
-+			free(state->dev);
-+		free(state);
-+	}
-+	return NULL;
-+}
-+
-+void plugin_play(ao_internal_t *state, void *output_samples, uint_32 num_bytes)
-+{
-+	write(((ao_sun_internal_t *)state)->fd, output_samples, num_bytes);
-+}
-+
-+void plugin_close(ao_internal_t *state)
-+{
-+	ao_sun_internal_t *s = (ao_sun_internal_t *)state;
-+	close(s->fd);
-+	free(s->dev);
-+	free(s);
-+}
-+
-+int plugin_get_latency(ao_internal_t *state)
-+{
-+	/* dummy */
-+	return 0;
-+}
-+
-+ao_info_t *plugin_get_driver_info(void)
-+{
-+	return &ao_sun_info;
-+}
diff --git a/audio/libao/patches/patch-ai b/audio/libao/patches/patch-ai
deleted file mode 100644
index 33faba8a209..00000000000
--- a/audio/libao/patches/patch-ai
+++ /dev/null
@@ -1,370 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/03/20 09:57:37 wiz Exp $
-
---- src/plugins/sun/Makefile.in.orig	Tue Mar 20 00:21:13 2001
-+++ src/plugins/sun/Makefile.in
-@@ -0,0 +1,365 @@
-+# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ../../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+host_alias = @host_alias@
-+host_triplet = @host@
-+ALSA_LIBS = @ALSA_LIBS@
-+ARTSC_CONFIG = @ARTSC_CONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+ARTS_LIBS = @ARTS_LIBS@
-+AS = @AS@
-+CC = @CC@
-+DEBUG = @DEBUG@
-+DLLTOOL = @DLLTOOL@
-+ESD_CFLAGS = @ESD_CFLAGS@
-+ESD_CONFIG = @ESD_CONFIG@
-+ESD_LIBS = @ESD_LIBS@
-+LIBTOOL = @LIBTOOL@
-+LIB_AGE = @LIB_AGE@
-+LIB_CURRENT = @LIB_CURRENT@
-+LIB_REVISION = @LIB_REVISION@
-+LN_S = @LN_S@
-+MAKEINFO = @MAKEINFO@
-+OBJDUMP = @OBJDUMP@
-+PACKAGE = @PACKAGE@
-+PROFILE = @PROFILE@
-+RANLIB = @RANLIB@
-+SIZE16 = @SIZE16@
-+SIZE32 = @SIZE32@
-+VERSION = @VERSION@
-+plugindir = @plugindir@
-+
-+AUTOMAKE_OPTIONS = foreign
-+
-+@HAVE_SUN_AUDIO_TRUE@sunltlibs = libsun.la
-+@HAVE_SUN_AUDIO_FALSE@sunltlibs = 
-+@HAVE_SUN_AUDIO_TRUE@sunldflags = -export-dynamic -avoid-version
-+@HAVE_SUN_AUDIO_FALSE@sunldflags = 
-+@HAVE_SUN_AUDIO_TRUE@sunsources = ao_sun.c
-+@HAVE_SUN_AUDIO_FALSE@sunsources = 
-+
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
-+
-+libdir = $(plugindir)
-+lib_LTLIBRARIES = $(sunltlibs)
-+
-+libsun_la_LDFLAGS = $(sunldflags)
-+libsun_la_SOURCES = $(sunsources)
-+
-+EXTRA_DIST = ao_sun.c
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES = 
-+LTLIBRARIES =  $(lib_LTLIBRARIES)
-+
-+
-+DEFS = @DEFS@ -I. -I$(srcdir) 
-+CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
-+libsun_la_LIBADD = 
-+@HAVE_SUN_AUDIO_TRUE@libsun_la_OBJECTS =  ao_sun.lo
-+@HAVE_SUN_AUDIO_FALSE@libsun_la_OBJECTS = 
-+CFLAGS = @CFLAGS@
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = tar
-+GZIP_ENV = --best
-+DEP_FILES =  .deps/ao_sun.P
-+SOURCES = $(libsun_la_SOURCES)
-+OBJECTS = $(libsun_la_OBJECTS)
-+
-+all: all-redirect
-+.SUFFIXES:
-+.SUFFIXES: .S .c .lo .o .s
-+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+	cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/sun/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+mostlyclean-libLTLIBRARIES:
-+
-+clean-libLTLIBRARIES:
-+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-+
-+distclean-libLTLIBRARIES:
-+
-+maintainer-clean-libLTLIBRARIES:
-+
-+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-libLTLIBRARIES:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-+	done
-+
-+.s.o:
-+	$(COMPILE) -c $<
-+
-+.S.o:
-+	$(COMPILE) -c $<
-+
-+mostlyclean-compile:
-+	-rm -f *.o core *.core
-+
-+clean-compile:
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+maintainer-clean-compile:
-+
-+.s.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+.S.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+
-+maintainer-clean-libtool:
-+
-+libsun.la: $(libsun_la_OBJECTS) $(libsun_la_DEPENDENCIES)
-+	$(LINK) -rpath $(libdir) $(libsun_la_LDFLAGS) $(libsun_la_OBJECTS) $(libsun_la_LIBADD) $(LIBS)
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	here=`pwd` && cd $(srcdir) \
-+	  && mkid -f$$here/ID $$unique $(LISP)
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)'; \
-+	unique=`for i in $$list; do echo $$i; done | \
-+	  awk '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-+
-+mostlyclean-tags:
-+
-+clean-tags:
-+
-+distclean-tags:
-+	-rm -f TAGS ID
-+
-+maintainer-clean-tags:
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = src/plugins/sun
-+
-+distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign src/plugins/sun/Makefile
-+	@for file in $(DISTFILES); do \
-+	  d=$(srcdir); \
-+	  if test -d $$d/$$file; then \
-+	    cp -pr $$/$$file $(distdir)/$$file; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	  fi; \
-+	done
-+
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am: install-libLTLIBRARIES
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-libLTLIBRARIES
-+uninstall: uninstall-am
-+all-am: Makefile $(LTLIBRARIES)
-+all-redirect: all-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+	$(mkinstalldirs)  $(DESTDIR)$(libdir)
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
-+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-+		mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
-+		clean-depend clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-libLTLIBRARIES distclean-compile \
-+		distclean-libtool distclean-tags distclean-depend \
-+		distclean-generic clean-am
-+	-rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
-+		maintainer-clean-compile maintainer-clean-libtool \
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-+distclean-compile clean-compile maintainer-clean-compile \
-+mostlyclean-libtool distclean-libtool clean-libtool \
-+maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
diff --git a/audio/libao/pkg/PLIST b/audio/libao/pkg/PLIST
index 145644128da..59963d453f3 100644
--- a/audio/libao/pkg/PLIST
+++ b/audio/libao/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2001/03/28 10:21:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/08/08 09:18:30 lukem Exp $
+include/ao/ao.h
+include/ao/os_types.h
 lib/ao/libsun.a
 lib/ao/libsun.la
 lib/ao/libsun.so
@@ -6,14 +8,12 @@ lib/libao.a
 lib/libao.la
 lib/libao.so
 lib/libao.so.1
-lib/libao.so.1.0
-include/ao/ao.h
-include/ao/os_types.h
-share/doc/${VERSION}/API
-share/doc/${VERSION}/USAGE
-share/doc/${VERSION}/DRIVERS
-share/doc/${VERSION}/WANTED
+lib/libao.so.1.1
 share/aclocal/ao.m4
+share/doc/${PKGNAME}/API
+share/doc/${PKGNAME}/DRIVERS
+share/doc/${PKGNAME}/USAGE
+share/doc/${PKGNAME}/WANTED
 @dirrm include/ao
 @dirrm lib/ao
-@dirrm share/doc/${VERSION}
+@dirrm share/doc/${PKGNAME}