summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/amarok/Makefile4
-rw-r--r--audio/arts/Makefile4
-rw-r--r--audio/arts/buildlink3.mk4
-rw-r--r--audio/audacity/Makefile4
-rw-r--r--audio/bmp/Makefile.common4
-rw-r--r--audio/cam/Makefile4
-rw-r--r--audio/dap/Makefile4
-rw-r--r--audio/darkice/Makefile4
-rw-r--r--audio/emixer/Makefile4
-rw-r--r--audio/esound/Makefile4
-rw-r--r--audio/flite/Makefile4
-rw-r--r--audio/fluidsynth/Makefile4
-rw-r--r--audio/gkrellm-volume/Makefile4
-rw-r--r--audio/gramofile/Makefile4
-rw-r--r--audio/gst-plugins0.10-oss/Makefile4
-rw-r--r--audio/gst-plugins0.8-oss/Makefile4
-rw-r--r--audio/gtick/Makefile4
-rw-r--r--audio/libao-oss/Makefile4
-rw-r--r--audio/libao/Makefile.common4
-rw-r--r--audio/libhydrogen/Makefile4
-rw-r--r--audio/libmikmod/options.mk4
-rw-r--r--audio/libmodplug/Makefile4
-rw-r--r--audio/libsndfile/options.mk4
-rw-r--r--audio/liteamp/Makefile4
-rw-r--r--audio/liveice/Makefile4
-rw-r--r--audio/mad123/Makefile4
-rw-r--r--audio/madplay/options.mk4
-rw-r--r--audio/mixer.app/Makefile4
-rw-r--r--audio/moc/Makefile4
-rw-r--r--audio/mp3blaster/Makefile4
-rw-r--r--audio/muse/Makefile4
-rw-r--r--audio/musicbox/Makefile4
-rw-r--r--audio/musicpd/Makefile4
-rw-r--r--audio/nas/Makefile4
-rw-r--r--audio/nosefart/Makefile4
-rw-r--r--audio/portaudio/Makefile4
-rw-r--r--audio/rexima/Makefile4
-rw-r--r--audio/snd/Makefile4
-rw-r--r--audio/speex/Makefile4
-rw-r--r--audio/spiralloops/Makefile4
-rw-r--r--audio/spiralsynth/Makefile4
-rw-r--r--audio/splay/Makefile4
-rw-r--r--audio/sweep/Makefile4
-rw-r--r--audio/tcl-snack/Makefile4
-rw-r--r--audio/terminatorx/Makefile4
-rw-r--r--audio/tfmxplay/Makefile4
-rw-r--r--audio/tosha/Makefile4
-rw-r--r--audio/tracker/Makefile4
-rw-r--r--audio/wmmixer/Makefile4
-rw-r--r--audio/wmsmixer/Makefile4
-rw-r--r--audio/wsoundserver/Makefile4
-rw-r--r--audio/xanalyser/Makefile4
-rw-r--r--audio/xfce4-mixer/Makefile4
-rw-r--r--audio/xmix/Makefile4
-rw-r--r--audio/xmmix/Makefile4
-rw-r--r--audio/xmms-arts/Makefile4
-rw-r--r--audio/xmms-crossfade/Makefile4
-rw-r--r--audio/xmms-fmradio/Makefile4
-rw-r--r--audio/xmms-modplug/Makefile4
-rw-r--r--audio/xmms/Makefile.common4
-rw-r--r--audio/xwave/Makefile4
61 files changed, 122 insertions, 122 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 46afcb57826..b6975be609e 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/06 00:18:14 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/03/09 21:04:39 jlam Exp $
DISTNAME= amarok-1.3.8
PKGREVISION= 3
@@ -32,7 +32,7 @@ BUILDLINK_DEPENDS.taglib+= taglib>=1.4
.include "../../audio/tunepimp/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
.include "../../multimedia/gstreamer0.8/buildlink3.mk"
.include "../../multimedia/kdemultimedia3/buildlink3.mk"
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index b201891dea8..e9b793872c8 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2006/03/09 21:04:39 jlam Exp $
DISTNAME= arts-1.5.1
PKGREVISION= 1
@@ -25,7 +25,7 @@ _IN_ARTS_BUILD= yes
.include "../../devel/glib2/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index 52255e04ac6..5084efbc84f 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/03/09 21:04:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ARTS_BUILDLINK3_MK:= ${ARTS_BUILDLINK3_MK}+
@@ -26,6 +26,6 @@ PRINT_PLIST_AWK+= /^@dirrm include\/arts$$/ \
.include "../../devel/glib2/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 2fda64c98ee..e2591840edf 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/03/04 21:28:54 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/03/09 21:04:39 jlam Exp $
DISTNAME= audacity-src-1.2.4b
PKGNAME= audacity-1.2.4b
@@ -40,7 +40,7 @@ CONFIG_SUB_OVERRIDE?= \
.include "../../devel/zlib/buildlink3.mk"
.include "../../x11/wxGTK/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
# XXX Internal compiler error with -O2
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index dd370b471d9..73a666dd064 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2006/03/04 21:28:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.19 2006/03/09 21:04:39 jlam Exp $
#
DISTNAME= bmp-0.9.7
@@ -87,4 +87,4 @@ post-patch:
.include "../../devel/pango/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index b09aa3ec2e3..7d96813062e 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:47 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/09 21:04:39 jlam Exp $
#
DISTNAME= cam-1.02
@@ -28,5 +28,5 @@ CAMLIBS+= -lossaudio
MAKE_ENV+= CAMLIBS=${CAMLIBS:Q}
.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 8dee7b641a1..03c5d2766fc 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/03/09 21:04:40 jlam Exp $
DISTNAME= dap-2.1.2
PKGREVISION= 6
@@ -25,7 +25,7 @@ do-install:
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../x11/xforms/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 8dda806b8ae..b2e73bdfd23 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:28:54 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:40 jlam Exp $
#
DISTNAME= darkice-0.14
@@ -39,5 +39,5 @@ do-install:
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/emixer/Makefile b/audio/emixer/Makefile
index b5e17da2490..6be3bba283c 100644
--- a/audio/emixer/Makefile
+++ b/audio/emixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:28:54 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/09 21:04:40 jlam Exp $
#
DISTNAME= emixer-0.05.5
@@ -19,5 +19,5 @@ post-extract:
${CP} ${FILESDIR}/Makefile ${WRKSRC}
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 245b8ed0de5..ea655c4779a 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2005/12/29 06:21:30 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2006/03/09 21:04:40 jlam Exp $
DISTNAME= esound-0.2.36
CATEGORIES= audio
@@ -27,7 +27,7 @@ CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
# no sound output device, but can support a remote esound server
CONFIGURE_ARGS+= --disable-local-sound
.else
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
MAKE_ENV+= AM_CPPFLAGS='-DDEV_DSP=\"${DEVOSSAUDIO}\"'
SUBST_CLASSES+= oss
SUBST_STAGE.oss= post-patch
diff --git a/audio/flite/Makefile b/audio/flite/Makefile
index 93d7e48d694..cfb77c22cb5 100644
--- a/audio/flite/Makefile
+++ b/audio/flite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/04 21:28:55 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/03/09 21:04:40 jlam Exp $
#
DISTNAME= flite-1.3-release
@@ -15,5 +15,5 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 1306808ab4e..ddacac1c2a6 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/19 18:26:43 adam Exp $
+# $NetBSD: Makefile,v 1.6 2006/03/09 21:04:40 jlam Exp $
DISTNAME= fluidsynth-1.0.7
CATEGORIES= audio
@@ -20,6 +20,6 @@ LDFLAGS+= ${LIBOSSAUDIO}
.include "../../devel/libgetopt/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 91e499114be..8fc7251125c 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:08 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/09 21:04:40 jlam Exp $
DISTNAME= gkrellm-volume-2.1.13
PKGREVISION= 2
@@ -20,5 +20,5 @@ MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index 985aae840b7..b626df53465 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:28:55 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/09 21:04:40 jlam Exp $
#
DISTNAME= gramofile-1.6
@@ -30,5 +30,5 @@ SUBST_SED.snd= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
SUBST_MESSAGE.snd= "Fixing harcoded audio device."
.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.10-oss/Makefile b/audio/gst-plugins0.10-oss/Makefile
index 4b60744cf0a..66b139f7cea 100644
--- a/audio/gst-plugins0.10-oss/Makefile
+++ b/audio/gst-plugins0.10-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/03/09 21:04:40 jlam Exp $
#
GST_PLUGINS0.10_NAME= oss
@@ -15,5 +15,5 @@ SUBST_SED.devoss= -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
LIBS+= ${LIBOSSAUDIO}
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-oss/Makefile b/audio/gst-plugins0.8-oss/Makefile
index 82b043964cf..91b884d7fad 100644
--- a/audio/gst-plugins0.8-oss/Makefile
+++ b/audio/gst-plugins0.8-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/06 00:18:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/03/09 21:04:40 jlam Exp $
#
GST_PLUGINS0.8_NAME= oss
@@ -15,5 +15,5 @@ SUBST_SED.devoss= -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
LIBS+= ${LIBOSSAUDIO}
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index 6f2d2dc98d1..22742207008 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/03/09 21:04:40 jlam Exp $
#
DISTNAME= gtick-0.3.7
@@ -29,7 +29,7 @@ SUBST_STAGE.header= pre-configure
SUBST_FILES.header= src/dsp.c
SUBST_SED.header= -e 's/FreeBSD__)/& || defined(__NetBSD__)/g'
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/audio/libao-oss/Makefile b/audio/libao-oss/Makefile
index 0ac39e3c946..8cb9f7f4d36 100644
--- a/audio/libao-oss/Makefile
+++ b/audio/libao-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/03/09 21:04:40 jlam Exp $
.include "../../audio/libao/Makefile.common"
@@ -25,5 +25,5 @@ BUILDLINK_DEPENDS.libao+= libao>=0.8.6nb1
_LIBAO_BUILDING_PLUGIN= yes
.include "../../audio/libao/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 2936eb7a9c6..36a5e4e35f6 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/08/10 20:56:11 jlam Exp $
+# $NetBSD: Makefile.common,v 1.25 2006/03/09 21:04:40 jlam Exp $
DISTNAME= libao-0.8.6
CATEGORIES= audio devel
@@ -33,4 +33,4 @@ CONFIGURE_ARGS+= ENABLE_SOLARIS=no
MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl}
.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
diff --git a/audio/libhydrogen/Makefile b/audio/libhydrogen/Makefile
index cf01073e674..a7e8799f014 100644
--- a/audio/libhydrogen/Makefile
+++ b/audio/libhydrogen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/09 21:04:40 jlam Exp $
DISTNAME= libhydrogen-0.8.0
PKGREVISION= 2
@@ -21,6 +21,6 @@ CONFIGURE_ARGS+= --disable-jack-support
CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
.include "../../audio/libaudiofile/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmikmod/options.mk b/audio/libmikmod/options.mk
index 1d9a1dd493c..f9d8ec40f20 100644
--- a/audio/libmikmod/options.mk
+++ b/audio/libmikmod/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/05/31 16:10:19 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2006/03/09 21:04:40 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libmikmod
PKG_SUPPORTED_OPTIONS= esound oss
@@ -12,5 +12,5 @@ CONFIGURE_ARGS+= --disable-esd
.endif
.if !empty(PKG_OPTIONS:Moss)
-. include "../../mk/ossaudio.buildlink3.mk"
+. include "../../mk/oss.buildlink3.mk"
.endif
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index 4c21d3a397e..d16a8109a64 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:54 tv Exp $
+# $NetBSD: Makefile,v 1.5 2006/03/09 21:04:40 jlam Exp $
#
DISTNAME= libmodplug-0.7
@@ -16,5 +16,5 @@ USE_LANGUAGES= c++
PKG_INSTALLATION_TYPES= overwrite pkgviews
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libsndfile/options.mk b/audio/libsndfile/options.mk
index 97dad58b0fc..67db7fbf5a6 100644
--- a/audio/libsndfile/options.mk
+++ b/audio/libsndfile/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/12/18 21:47:23 rillig Exp $
+# $NetBSD: options.mk,v 1.3 2006/03/09 21:04:40 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libsndfile
PKG_SUPPORTED_OPTIONS= oss
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= oss
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Moss)
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
OSS_DEFS= -DDEV_DSP=\"${DEVOSSAUDIO:Q}\" -DUSE_OSS=1
MAKE_ENV+= AM_CFLAGS=${OSS_DEFS:Q}
.endif
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 746440a136d..9f955465326 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/06 00:18:14 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/09 21:04:40 jlam Exp $
DISTNAME= liteamp-0.2.4.2
PKGREVISION= 6
@@ -24,6 +24,6 @@ CPPFLAGS+= -UGTK_DISABLE_DEPRECATED
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/liveice/Makefile b/audio/liveice/Makefile
index 1babf0dcfb3..200a04f2962 100644
--- a/audio/liveice/Makefile
+++ b/audio/liveice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:28:56 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/09 21:04:40 jlam Exp $
#
DISTNAME= liveice
@@ -36,5 +36,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/liveice ; \
done
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mad123/Makefile b/audio/mad123/Makefile
index c348b9e2ce8..a19cded232a 100644
--- a/audio/mad123/Makefile
+++ b/audio/mad123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:40 jlam Exp $
#
DISTNAME= mad123-0.8.5
@@ -28,7 +28,7 @@ MAKE_FLAGS+= USE_ARTS=yes
.if !empty(PKG_OPTIONS:Moss)
MAKE_FLAGS+= USE_OSS=yes
-. include "../../mk/ossaudio.buildlink3.mk"
+. include "../../mk/oss.buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Msun)
diff --git a/audio/madplay/options.mk b/audio/madplay/options.mk
index 062dc2186ef..c46012b1f13 100644
--- a/audio/madplay/options.mk
+++ b/audio/madplay/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/05/31 16:16:50 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2006/03/09 21:04:41 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.madplay
PKG_SUPPORTED_OPTIONS= esound oss
@@ -12,5 +12,5 @@ CONFIGURE_ARGS+= --without-esd
.endif
.if !empty(PKG_OPTIONS:Moss)
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.endif
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index ba08748e2ca..6774ed7a347 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= Mixer.app-1.8.0
@@ -26,5 +26,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Mixer.app
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 636b3cd1ae2..22eff5a2ea3 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/12 18:42:22 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/09 21:04:41 jlam Exp $
DISTNAME= moc-2.4.0
CATEGORIES= audio
@@ -30,6 +30,6 @@ SUBST_MESSAGE.oss= Fixing hardcoded audio device.
.include "../../audio/libmad/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index e02b2e22fd8..d5dfe5f1637 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/09 21:04:41 jlam Exp $
DISTNAME= mp3blaster-3.2.0
PKGREVISION= 3
@@ -32,5 +32,5 @@ post-extract:
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 69200ca5db1..46a1f81108d 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= MuSE-0.9
@@ -35,5 +35,5 @@ SUBST_MESSAGE.dsp= "Fixing hardcoded audio device."
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index d1d0c9d62e4..59bf3225e5b 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/09 21:04:41 jlam Exp $
DISTNAME= musicbox-1.01p2
PKGREVISION= 1
@@ -23,5 +23,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/musicbox/README
.include "../../x11/qt1/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 4e11d210848..99339de8c0a 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/09 21:04:41 jlam Exp $
DISTNAME= mpd-0.11.5
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
@@ -41,5 +41,5 @@ post-install:
.include "../../audio/libao/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index a7658a039d3..bedd01834cd 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2006/03/09 21:04:41 jlam Exp $
DISTNAME= nas-1.7b.src
PKGNAME= ${DISTNAME:S/.src//}
@@ -59,7 +59,7 @@ PLIST_SRC= ${PKGDIR}/PLIST.clients
.if ${OPSYS} != "Interix"
. if (${MACHINE_ARCH} == "i386") || \
(${MACHINE_ARCH} == "sparc")
-. include "../../mk/ossaudio.buildlink3.mk"
+. include "../../mk/oss.buildlink3.mk"
EGDIR= ${PREFIX}/share/examples/nas
CONF_FILES= ${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
. if ${OPSYS} != "SunOS"
diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile
index ae36f0ae0f0..f4017e30e82 100644
--- a/audio/nosefart/Makefile
+++ b/audio/nosefart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/09 21:04:41 jlam Exp $
DISTNAME= nosefart-2.3-mls
PKGNAME= ${DISTNAME:S/-mls//}
@@ -27,5 +27,5 @@ INSTALLATION_DIRS= bin
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nsfobj/nosefart ${PREFIX}/bin
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index d928ff1c6d9..53586326f91 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/09 21:04:41 jlam Exp $
DISTNAME= portaudio_v18_1
PKGNAME= portaudio-18.1
@@ -23,5 +23,5 @@ pre-configure:
${CHMOD} 755 ${WRKSRC}/configure
.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rexima/Makefile b/audio/rexima/Makefile
index b8263fc5daf..81e38d10b70 100644
--- a/audio/rexima/Makefile
+++ b/audio/rexima/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:28:58 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= rexima-1.4
@@ -10,5 +10,5 @@ HOMEPAGE= http://rus.members.beeb.net/rexima.html
COMMENT= Curses-based interactive mixer
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index d7eb36aa36f..cd936f010ef 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/03/04 21:28:58 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= snd-7.18
@@ -31,5 +31,5 @@ post-install:
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 4fc1113e94b..80d09dbc1ab 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= speex-1.0.5
@@ -27,5 +27,5 @@ BUILDLINK_TRANSFORM+= l:gnugetopt:getopt
.include "../../devel/libgetopt/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index c9cd5277af0..bafce1747f8 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= SpiralLoops-2.0.0
@@ -29,5 +29,5 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${PREFIX}/bin
.include "../../x11/fltk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 96b43df1157..0d5168124da 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= SpiralSynth-2.0.0
@@ -31,6 +31,6 @@ do-install:
${WRKSRC}/.Spiralrc ${PREFIX}/share/spiralsynth
.include "../../x11/fltk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index 497a1ef4771..3c9b33cb3d0 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:28:58 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= splay-0.8.2
@@ -17,5 +17,5 @@ CONFIGURE_ARGS+= --without-xsplay
CONFIGURE_ARGS+= --without-pthread
LIBS+= ${LIBOSSAUDIO}
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index d5ffb8d665a..21a0f51a98e 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/04 21:28:58 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= sweep-0.8.3
@@ -33,6 +33,6 @@ MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
.include "../../databases/tdb/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile
index 7eea754e5c7..61f6f15110f 100644
--- a/audio/tcl-snack/Makefile
+++ b/audio/tcl-snack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/09 21:04:41 jlam Exp $
DISTNAME= snack2.2.8
PKGNAME= tcl-snack-2.2.8
@@ -22,6 +22,6 @@ INSTALLATION_DIRS= lib
.include "../../lang/tcl/buildlink3.mk"
.include "../../x11/tk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index add1c216f51..5c0d5031d22 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:28:58 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= terminatorX-3.82
@@ -36,6 +36,6 @@ SUBST_MESSAGE.oss= "Fixing hardcoded audio device."
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tfmxplay/Makefile b/audio/tfmxplay/Makefile
index 090e0bcbe01..cb04a6446ff 100644
--- a/audio/tfmxplay/Makefile
+++ b/audio/tfmxplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:28:58 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:41 jlam Exp $
#
DISTNAME= tfmxplay-0.6
@@ -21,5 +21,5 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tfmxplay
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tfmxplay/
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index 855e4daf475..948258dd333 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/09 21:04:41 jlam Exp $
DISTNAME= tosha-0.05
CATEGORIES= audio
@@ -15,5 +15,5 @@ CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
INSTALLATION_DIRS= bin man/man1
.include "../../devel/libscsi/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 10d3910f1a6..b13cd8e1cbf 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/05 16:27:23 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/03/09 21:04:42 jlam Exp $
DISTNAME= tracker-5.3
PKGREVISION= 1
@@ -31,7 +31,7 @@ INFO_FILES= tracker.info
INSTALLATION_DIRS= bin info
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
pre-install:
cd ${WRKSRC}/Docs && \
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index 3992ebd44a4..3892ab182d6 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:15 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= wmmixer-1.0-beta1
@@ -22,5 +22,5 @@ pre-build:
${TOUCH} ${WRKSRC}/wmmixer.man
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile
index c9bb8fed630..d245381b5dd 100644
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= wmsmixer-0.5.1
@@ -28,5 +28,5 @@ post-install:
${PREFIX}/share/doc/wmsmixer/README.wmsmixer
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index d8bc4e2df1e..44c27346e75 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= WSoundServer-0.4.0
@@ -43,7 +43,7 @@ post-install:
. include "../../audio/esound/buildlink3.mk"
CONFIGURE_FLAGS+= --enable-esound
.else
-. include "../../mk/ossaudio.buildlink3.mk"
+. include "../../mk/oss.buildlink3.mk"
.endif
.include "../../audio/libaudiofile/buildlink3.mk"
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 84ac19ad7d0..e63b5dafe6c 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:15 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= xanalyser-1.24
@@ -16,6 +16,6 @@ GNU_CONFIGURE= yes
.include "../../graphics/xpm/buildlink3.mk"
.include "../../mk/motif.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index f0e50e156f8..7badacba816 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:16 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/09 21:04:42 jlam Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -9,5 +9,5 @@ COMMENT= Xfce mixer plugin
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index eb0bb64ff9b..d6bb0db50db 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/09 21:04:42 jlam Exp $
DISTNAME= xmix-2.1
PKGREVISION= 2
@@ -22,5 +22,5 @@ pre-configure:
pre-install:
${INSTALL_DATA} ${WRKSRC}/XMix ${PREFIX}/lib/X11/app-defaults
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index e150623d424..0bc5f1af612 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:17 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/09 21:04:42 jlam Exp $
DISTNAME= xmmix-1.2
PKGREVISION= 4
@@ -19,6 +19,6 @@ pre-configure:
done
.include "../../mk/motif.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile
index 6f892b964f8..88b94698676 100644
--- a/audio/xmms-arts/Makefile
+++ b/audio/xmms-arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:17 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= arts_output-0.7.1
@@ -21,6 +21,6 @@ LIBS+= ${LIBOSSAUDIO}
.include "../../audio/xmms/buildlink3.mk"
.include "../../devel/glib/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 562cb9dd29b..39d39093ad3 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= xmms-crossfade-0.2.9
@@ -19,6 +19,6 @@ OSS_DEFS+= -DDEFAULT_OSS_ALT_AUDIO_DEVICE='"${DEVOSSSOUND}"'
MAKE_ENV+= OSS_DEFS=${OSS_DEFS:Q}
.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile
index 45ea4512738..4528eda971f 100644
--- a/audio/xmms-fmradio/Makefile
+++ b/audio/xmms-fmradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/15 10:49:11 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= xmms-FMRadio-1.4
@@ -17,6 +17,6 @@ ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-* NetBSD-1.6*-* NetBSD-[2-9]*-*
MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 787de496744..d592c07e247 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:18 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= modplugxmms-2.05
@@ -26,6 +26,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../audio/libmodplug/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index 5777db86b86..d4a4314746b 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2005/12/05 23:55:02 rillig Exp $
+# $NetBSD: Makefile.common,v 1.23 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= xmms-1.2.10
@@ -79,5 +79,5 @@ CONFIGURE_ARGS+= --disable-oss
.include "../../converters/libiconv/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index ef2cf3d2a34..cd37a416109 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:01 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= xwave2
@@ -25,6 +25,6 @@ do-install:
${PREFIX}/share/doc/xwave2
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"