summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-09 21:04:39 +0000
committerjlam <jlam@pkgsrc.org>2006-03-09 21:04:39 +0000
commit6ad6aef9d4240375ff81bbdfb613f6b3fdd2faba (patch)
treef87e95c02a219bc3786c1a519db6403762b9404b
parent15364f04664738e576366a6974c30455daf6dd48 (diff)
downloadpkgsrc-6ad6aef9d4240375ff81bbdfb613f6b3fdd2faba.tar.gz
Replace references to ossaudio.buildlink3.mk with oss.buildlink3.mk.
Remove deprecated ossaudio.buildlink3.mk.
-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
-rw-r--r--chat/gg2/Makefile4
-rw-r--r--chat/kadu/Makefile4
-rw-r--r--devel/SDL/Makefile.common4
-rw-r--r--devel/allegro/Makefile4
-rw-r--r--devel/pwlib/Makefile4
-rw-r--r--editors/xemacs/Makefile.common4
-rw-r--r--emulators/arnold/Makefile4
-rw-r--r--emulators/atari800/Makefile4
-rw-r--r--emulators/e-uae/Makefile4
-rw-r--r--emulators/fceu/Makefile4
-rw-r--r--emulators/fuse/Makefile4
-rw-r--r--emulators/qemu/Makefile4
-rw-r--r--emulators/snes9x/Makefile4
-rw-r--r--emulators/tuxnes/Makefile4
-rw-r--r--emulators/wine/Makefile4
-rw-r--r--emulators/xm7/Makefile4
-rw-r--r--games/crossfire-cli/Makefile4
-rw-r--r--games/fkiss/Makefile4
-rw-r--r--games/freesci/Makefile4
-rw-r--r--games/frotz/Makefile4
-rw-r--r--games/maelstrom-x11/Makefile4
-rw-r--r--games/nighthawk/Makefile4
-rw-r--r--games/plib/Makefile4
-rw-r--r--games/quake/Makefile4
-rw-r--r--games/quake2forge/Makefile4
-rw-r--r--games/quake6/Makefile4
-rw-r--r--games/quakeforge/Makefile4
-rw-r--r--games/rocksndiamonds/options.mk4
-rw-r--r--games/scummvm/options.mk4
-rw-r--r--games/urban/Makefile4
-rw-r--r--games/xblast/Makefile4
-rw-r--r--games/xboing/Makefile4
-rw-r--r--games/xbreaky/Makefile4
-rw-r--r--games/xdoom/Makefile4
-rw-r--r--games/xgalaga/Makefile4
-rw-r--r--games/xnibbles/Makefile4
-rw-r--r--games/xscavenger/Makefile4
-rw-r--r--ham/gmfsk/Makefile4
-rw-r--r--ham/gnuradio-audio-oss/Makefile4
-rw-r--r--ham/linpsk/Makefile4
-rw-r--r--ham/tlf/Makefile4
-rw-r--r--lang/python23/Makefile.common4
-rw-r--r--lang/python24/Makefile4
-rw-r--r--lang/squeak/Makefile4
-rw-r--r--mk/ossaudio.buildlink3.mk6
-rw-r--r--multimedia/avidemux/Makefile4
-rw-r--r--multimedia/fxtv/Makefile4
-rw-r--r--multimedia/gnome2-media/Makefile4
-rw-r--r--multimedia/kdemultimedia3/Makefile4
-rw-r--r--multimedia/libdv/Makefile.common4
-rw-r--r--multimedia/libflash/Makefile.common4
-rw-r--r--multimedia/mjpegtools/Makefile4
-rw-r--r--multimedia/mplayer-share/options.mk4
-rw-r--r--multimedia/transcode/Makefile4
-rw-r--r--multimedia/vlc/Makefile4
-rw-r--r--multimedia/xanim/Makefile4
-rw-r--r--multimedia/xawtv/Makefile4
-rw-r--r--multimedia/xine-lib/Makefile.common4
-rw-r--r--net/kiax/Makefile4
-rw-r--r--net/kphone/Makefile4
-rw-r--r--net/rdesktop/Makefile4
-rw-r--r--sysutils/cdrtools-ossdvd/Makefile4
-rw-r--r--sysutils/cdrtools/Makefile4
-rw-r--r--sysutils/gnometoaster/Makefile4
-rw-r--r--sysutils/tpb/Makefile4
-rw-r--r--sysutils/xcdroast/Makefile4
-rw-r--r--x11/gnome2-applets/Makefile4
-rw-r--r--x11/kdelibs3/Makefile4
-rw-r--r--x11/kdelibs3/buildlink3.mk4
-rw-r--r--x11/wxGTK/Makefile4
-rw-r--r--x11/xfce3/Makefile4
132 files changed, 262 insertions, 268 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"
diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index 95bf42f4f3e..70418e4d677 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/06 00:18:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/09 21:04:42 jlam Exp $
DISTNAME= gg2-2.2.8
PKGREVISION= 4
@@ -33,5 +33,5 @@ CONFIGURE_ARGS+= --without-update
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/xosd/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/kadu/Makefile b/chat/kadu/Makefile
index a1ec65e4b7a..5e11cbb6a9a 100644
--- a/chat/kadu/Makefile
+++ b/chat/kadu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/16 18:07:44 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/09 21:04:42 jlam Exp $
DISTNAME= kadu-0.4.3
PKGREVISION= 2
@@ -25,6 +25,6 @@ LIBS+= ${LIBOSSAUDIO}
.include "../../x11/qt3-libs/buildlink3.mk"
.include "../../x11/qt3-tools/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/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
index 80dbf6c2437..ad33626a46a 100644
--- a/devel/SDL/Makefile.common
+++ b/devel/SDL/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2006/03/09 20:00:02 jlam Exp $
+# $NetBSD: Makefile.common,v 1.28 2006/03/09 21:04:42 jlam Exp $
DISTNAME= SDL-1.2.9
CATEGORIES= devel games
@@ -52,7 +52,7 @@ BUILDLINK_PASSTHRU_DIRS+= ${dir}
. endfor
.endif
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q}
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 5f30808bd2f..9faac8d26ff 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/05 16:27:23 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/09 21:04:42 jlam Exp $
DISTNAME= allegro-4.2.0
PKGREVISION= 1
@@ -36,7 +36,7 @@ SUBST_FILES.path= src/unix/umodules.c src/unix/usystem.c
SUBST_SED.path= -e "s,@@PREFIX@@,${PREFIX},g"
SUBST_MESSAGE.path= "Fixing harcoded path"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index c75f40451de..0864d7af82f 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/03/04 21:29:26 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2006/03/09 21:04:42 jlam Exp $
DISTNAME= pwlib-v1_8_3-src
PKGNAME= pwlib-1.8.3
@@ -58,6 +58,6 @@ do-install:
done
.include "../../security/openssl/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/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common
index 7133c52fe96..375dd45bf66 100644
--- a/editors/xemacs/Makefile.common
+++ b/editors/xemacs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/12/05 23:55:06 rillig Exp $
+# $NetBSD: Makefile.common,v 1.14 2006/03/09 21:04:42 jlam Exp $
DISTNAME= xemacs-21.4.17
CATEGORIES= editors
@@ -77,7 +77,7 @@ PLIST_SUBST+= ELSUFX=''
.endif
.include "../../databases/gdbm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
INFOPATH= ${PREFIX}/info:${X11BASE}/info:/usr/local/info
diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
index 0f7a6e3691c..a1031c99449 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:00 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/09 21:04:42 jlam Exp $
#
DISTNAME= arnsrc27012002
@@ -42,7 +42,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/readme.linux ${DOCDIR}
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index cf7d6e42fc8..7b4a6d7addd 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/02/05 23:09:00 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2006/03/09 21:04:42 jlam Exp $
DISTNAME= atari800-2.0.1
PKGREVISION= 1
@@ -36,5 +36,5 @@ post-install:
${WRKSRC}/atari800.cfg ${PREFIX}/share/atari800/
.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/e-uae/Makefile b/emulators/e-uae/Makefile
index 684dc70eedc..c8166a0ad5c 100644
--- a/emulators/e-uae/Makefile
+++ b/emulators/e-uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:09:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/03/09 21:04:43 jlam Exp $
DISTNAME= e-uae-0.8.28
PKGREVISION= 1
@@ -23,5 +23,5 @@ post-install:
cd ${WRKSRC}/docs && ${INSTALL_DATA} *.txt ${PREFIX}/share/doc/uae
.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index c7caf8435ac..aad868cee25 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:00 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= fceu-0.98.13.src
@@ -32,5 +32,5 @@ post-install:
${PREFIX}/share/doc/fceu
.include "../../devel/SDL/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 599168e978c..0ad6e295d70 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:09:01 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:43 jlam Exp $
DISTNAME= fuse-0.7.0
PKGREVISION= 3
@@ -19,5 +19,5 @@ LIBS+= ${LIBOSSAUDIO}
.include "../../textproc/libxml2/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/emulators/qemu/Makefile b/emulators/qemu/Makefile
index d62565ff8ac..1e968ded7a7 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/02/11 14:46:16 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= qemu-0.8.0
@@ -50,6 +50,6 @@ post-install:
${PREFIX:Q}/share/doc/qemu
.include "../../devel/SDL/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/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 9f30c018074..6ce14971644 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/02/05 23:09:02 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/03/09 21:04:43 jlam Exp $
DISTNAME= s9xs139
PKGNAME= snes9x-1.39
@@ -67,7 +67,7 @@ MAKE_ENV+= USBHID_H=1
.endif
.endif
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 96383053106..50f89c2f491 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:09:04 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= tuxnes-0.75
@@ -29,5 +29,5 @@ post-install:
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index db7bf069929..0d14f288835 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2006/03/06 13:46:01 adam Exp $
+# $NetBSD: Makefile,v 1.100 2006/03/09 21:04:43 jlam Exp $
DISTNAME= wine-0.9.9
CATEGORIES= emulators
@@ -53,7 +53,7 @@ post-install:
.include "../../graphics/lcms/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index c596e9d8838..97e32796ccc 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:09:05 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= xm71010s
@@ -34,5 +34,5 @@ post-extract:
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/vm/xm7 ${PREFIX}/bin
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index ef220e79a67..d9e5e0efcd4 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/02/05 23:09:13 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= crossfire-client-1.0.0
@@ -44,5 +44,5 @@ post-install:
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 5ba1826e5d5..c4d423c729c 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:09:14 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= fkiss-0.33
@@ -45,6 +45,6 @@ do-install:
>${PREFIX}/share/doc/fkiss/`${BASENAME} $$i`; \
done
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 2ef5fcd52d2..50393e55d11 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:09:15 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= freesci-0.3.4c
@@ -26,5 +26,5 @@ post-install:
.include "../../devel/ncurses/buildlink3.mk"
.include "../../fonts/Xft2/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/games/frotz/Makefile b/games/frotz/Makefile
index cb15427bb7e..8b8755c6f03 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:43 jlam Exp $
DISTNAME= frotz-2.43
PKGREVISION= 2
@@ -32,5 +32,5 @@ do-install:
cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY ${DOCDIR}
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index c035e169b19..2e1752c9af4 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:20 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/09 21:04:43 jlam Exp $
DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz
PKGNAME= maelstrom-x11-2.0.6
@@ -38,5 +38,5 @@ post-install:
${INSTALL_PROGRAM} ${WRKSRC}/netplayd/netplayd ${PREFIX}/bin/Maelstrom_netplayd
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index ba7b9587cd2..8f8001e9989 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/03/04 21:29:43 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= nighthawk-2.1
@@ -27,7 +27,7 @@ CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" \
INSTALLATION_DIRS= bin
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
post-build:
cd ${WRKSRC}/src_sound && \
diff --git a/games/plib/Makefile b/games/plib/Makefile
index fa80a88eba3..c0bb89de462 100644
--- a/games/plib/Makefile
+++ b/games/plib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:09:21 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= plib-1.6.0
@@ -15,6 +15,6 @@ USE_LANGUAGES= c++
CPPFLAGS+= -Dunix=1
.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 4f7e16fe00d..8cf00da827e 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/03/04 21:29:43 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2006/03/09 21:04:43 jlam Exp $
DISTNAME= q1source
PKGNAME= quake-2.30
@@ -53,6 +53,6 @@ do-install:
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index f45c09b5467..4d7b8e3d606 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:43 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/09 21:04:43 jlam Exp $
#
DISTNAME= quake2-0.3
@@ -44,6 +44,6 @@ CONFIGURE_ENV+= ac_cv_header_sys_audioio_h=no
.endif
.include "../../devel/SDL/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/games/quake6/Makefile b/games/quake6/Makefile
index 3b60167e0c1..860f3e33594 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/02/05 23:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/03/09 21:04:43 jlam Exp $
DISTNAME= quake-v6-bsd-kame
PKGNAME= quake6-0.0
@@ -33,6 +33,6 @@ CONFIGURE_ARGS+=--disable-asmopt --bindir=/bin
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 5c474c66f63..dcd260a46f7 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:43 jlam Exp $
DISTNAME= quakeforge-0.5.5
PKGREVISION= 4
@@ -36,5 +36,5 @@ pre-install:
.include "../../devel/SDL/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/rocksndiamonds/options.mk b/games/rocksndiamonds/options.mk
index 2f1640ff695..8235a1ae766 100644
--- a/games/rocksndiamonds/options.mk
+++ b/games/rocksndiamonds/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/08/16 15:35:51 adam Exp $
+# $NetBSD: options.mk,v 1.2 2006/03/09 21:04:43 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rocksndiamonds
PKG_SUPPORTED_OPTIONS= sdl x11
@@ -23,6 +23,6 @@ BUILD_TARGET= solaris
.else
BUILD_TARGET= x11
.endif
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.endif
diff --git a/games/scummvm/options.mk b/games/scummvm/options.mk
index 45f27fe706b..4ed4263781d 100644
--- a/games/scummvm/options.mk
+++ b/games/scummvm/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/06/01 18:02:52 jlam Exp $
+# $NetBSD: options.mk,v 1.5 2006/03/09 21:04:44 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.scummvm
PKG_SUPPORTED_OPTIONS= sdl x11
@@ -13,6 +13,6 @@ CONFIGURE_ARGS+= --backend=sdl
.if !empty(PKG_OPTIONS:Mx11)
CONFIGURE_ARGS+= --backend=x11
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.endif
diff --git a/games/urban/Makefile b/games/urban/Makefile
index 33c9530c03c..62f6bc9c2fc 100644
--- a/games/urban/Makefile
+++ b/games/urban/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:44 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= urban-1.5.3
@@ -19,6 +19,6 @@ post-install:
.include "../../audio/libmikmod/buildlink3.mk"
.include "../../graphics/libggi/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/games/xblast/Makefile b/games/xblast/Makefile
index 0d1e601ab22..6ded0027abb 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:09:24 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= xblast-2.6.beta-sound
@@ -33,5 +33,5 @@ post-build:
post-install:
${RM} ${PREFIX}/${IMAKE_MAN_DIR}/xbsndsrv.${IMAKE_MAN_SUFFIX}
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 1e005a4ffa1..e80b74be343 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:09:24 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= xboing2.4
@@ -24,6 +24,6 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/xboing.man ${PREFIX}/man/man6/xboing.6
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xbreaky/Makefile b/games/xbreaky/Makefile
index 75ea3d8d585..2daf1017bfe 100644
--- a/games/xbreaky/Makefile
+++ b/games/xbreaky/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:24 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= xbreaky-0.0.5
@@ -13,5 +13,5 @@ COMMENT= Breakout game for X11
USE_DIRS+= xdg-1.1
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 64f3bc1216a..0d2ca05c30b 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/02/05 23:09:24 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2006/03/09 21:04:44 jlam Exp $
DISTNAME= linuxdoom-1.10
PKGNAME= xdoom-1.10
@@ -38,7 +38,7 @@ CFLAGS+= -D__BIG_ENDIAN__=1
INSTALLATION_DIRS= bin
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
post-extract:
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index f0f87c56205..34d476da929 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/02/05 23:09:24 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/03/09 21:04:44 jlam Exp $
DISTNAME= xgalaga-2.0.34
PKGREVISION= 4
@@ -21,5 +21,5 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/xgalaga/README
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index de54effd841..f8dd0bcca9f 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:25 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= xnibbles-1.0BETA4
@@ -22,6 +22,6 @@ SUBST_FILES.audio= Makefile
SUBST_SED.audio= -e "s|/dev/dsp|${DEVOSSAUDIO}|"
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index 767a472d90a..69992b2633d 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:25 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= xscavenger-1.4.4
@@ -22,7 +22,7 @@ CPPFLAGS+= -DSOUNDDEV="\"${DEVOSSSOUND}\""
INSTALLATION_DIRS= man/man6
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
post-install:
@${INSTALL_MAN} ${WRKSRC}/src/scavenger.6 ${PREFIX}/man/man6/
diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile
index acf000e61a3..724cd54f9fb 100644
--- a/ham/gmfsk/Makefile
+++ b/ham/gmfsk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/06 00:18:18 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= gmfsk-0.6
@@ -21,5 +21,5 @@ CONFIGURE_ARGS+=--enable-hamlib
.include "../../math/fftw2/buildlink3.mk"
.include "../../ham/hamlib/buildlink3.mk"
.include "../../textproc/scrollkeeper/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-audio-oss/Makefile b/ham/gnuradio-audio-oss/Makefile
index 2c939a99625..ac8f5babf79 100644
--- a/ham/gnuradio-audio-oss/Makefile
+++ b/ham/gnuradio-audio-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:09:41 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/03/09 21:04:44 jlam Exp $
VERSION= 0.7
DISTNAME= gr-audio-oss-${VERSION}
@@ -9,6 +9,6 @@ COMMENT= Open Sound System support for GNU Radio
.include "../../meta-pkgs/gnuradio/Makefile.common"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ham/linpsk/Makefile b/ham/linpsk/Makefile
index cac307f5727..e11b03afea2 100644
--- a/ham/linpsk/Makefile
+++ b/ham/linpsk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:42 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= linpsk-0.8.1
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+="--with-fftw-dir=${LOCALBASE}"
post-configure:
${_PKG_DEBUG}${_PKG_SILENT}${LN} -s ${FILESDIR}/pkgsrc_fixes.h ${BUILDLINK_DIR}/include/
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
.include "../../math/fftw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ham/tlf/Makefile b/ham/tlf/Makefile
index b6c3a379864..8df0cba4bee 100644
--- a/ham/tlf/Makefile
+++ b/ham/tlf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:42 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= tlf-0.9.27
@@ -27,7 +27,7 @@ post-patch:
LIBS+= ${LIBOSSAUDIO}
.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../ham/hamlib/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common
index 5da7ca0b409..443966a06cd 100644
--- a/lang/python23/Makefile.common
+++ b/lang/python23/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2005/12/08 08:16:01 rillig Exp $
+# $NetBSD: Makefile.common,v 1.30 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= Python-2.3.5
@@ -110,5 +110,5 @@ post-extract:
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 52fa7213494..875abbd7f35 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= Python-2.4.2
@@ -129,5 +129,5 @@ post-install:
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 34e40db874f..a441235d8ba 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:09:51 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= Squeak-3.6-3
@@ -53,6 +53,6 @@ CONFIGURE_ARGS+= --enable-mpg-mmx
.endif
.include "../../audio/nas/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mk/ossaudio.buildlink3.mk b/mk/ossaudio.buildlink3.mk
deleted file mode 100644
index e8c5b3cadd4..00000000000
--- a/mk/ossaudio.buildlink3.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD: ossaudio.buildlink3.mk,v 1.6 2006/03/09 20:23:13 jlam Exp $
-#
-# This file is temporary and will be removed after references to
-# "ossaudio.buildlink3.mk" have been converted to "oss.buildlink3.mk".
-#
-.include "../../mk/oss.buildlink3.mk"
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index f7be72d411b..7790ddbc439 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/02/12 14:12:54 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/03/09 21:04:44 jlam Exp $
#
DISTNAME= avidemux-2.1.1
@@ -58,6 +58,6 @@ post-configure:
.include "../../multimedia/x264-devel/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.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/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 92dd1b05435..7570be7bd6e 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:44 jlam Exp $
DISTNAME= fxtv-1.03
PKGREVISION= 9
@@ -33,6 +33,6 @@ pre-configure:
.include "../../graphics/tiff/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
.include "../../x11/Xaw3d/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 384ef105fea..07b5b97843c 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/06 00:18:12 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2006/03/09 21:04:44 jlam Exp $
DISTNAME= gnome-media-2.12.0
PKGREVISION= 6
@@ -55,5 +55,5 @@ GCONF2_SCHEMAS+= gnome-sound-recorder.schemas
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-desktop/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/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index a842f0f378a..480ef605f1b 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/03/07 06:30:56 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/03/09 21:04:45 jlam Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
PKGREVISION= 3
@@ -58,7 +58,7 @@ UNLIMIT_RESOURCES+= datasize
.include "../../x11/kdebase3/buildlink3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
.include "../../devel/pthread-sem/buildlink3.mk"
diff --git a/multimedia/libdv/Makefile.common b/multimedia/libdv/Makefile.common
index 7bae949de61..36f6b1d69e3 100644
--- a/multimedia/libdv/Makefile.common
+++ b/multimedia/libdv/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2006/03/09 21:04:45 jlam Exp $
DISTNAME= libdv-0.104
CATEGORIES= multimedia
@@ -34,5 +34,5 @@ LIBS+= ${LIBOSSAUDIO}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libflash/Makefile.common b/multimedia/libflash/Makefile.common
index 3b2bf6e4db3..4ddfe444630 100644
--- a/multimedia/libflash/Makefile.common
+++ b/multimedia/libflash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2006/03/04 21:30:15 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= flash-0.4.10
@@ -21,4 +21,4 @@ post-extract: remove-subpackages
remove-subpackages:
${RM} -rf ${WRKSRC}/Jpeg ${WRKSRC}/Zlib
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 01584f8d3f6..bd1ed9a78ba 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/08 10:12:14 ghen Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/09 21:04:45 jlam Exp $
DISTNAME= mjpegtools-1.8.0
PKGREVISION= 3
@@ -37,7 +37,7 @@ INFO_FILES= mjpeg-howto.info
# This only disables the "glav" program. If you really need it, please add an
# external package for it.
#.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index f8ad1760c84..9a3b3a9ba11 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2005/12/11 09:40:46 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2006/03/09 21:04:45 jlam Exp $
.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
@@ -206,7 +206,7 @@ CONFIGURE_ARGS+= --disable-nas
.if !empty(PKG_OPTIONS:Moss)
CONFIGURE_ARGS+= --enable-ossaudio
-. include "../../mk/ossaudio.buildlink3.mk"
+. include "../../mk/oss.buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-ossaudio
.endif
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 89445c444bd..2cc15edb4d2 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/16 10:30:51 abs Exp $
+# $NetBSD: Makefile,v 1.26 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= transcode-1.0.2
@@ -37,6 +37,6 @@ LIBS+= ${LIBOSSAUDIO}
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../multimedia/libtheora/buildlink3.mk"
.include "../../multimedia/libmpeg2/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/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index d6fe5bbe90b..0a5cc74dd35 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:30:16 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= vlc-${VLC_VER}
@@ -96,6 +96,6 @@ BUILDLINK_TRANSFORM.ffmpeg+= -e "s,include/ffmpeg,include/,g"
.include "../../sysutils/vcdimager-devel/buildlink3.mk"
.include "../../x11/wxGTK/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/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 9872bd4f781..723e2e1fb16 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:16 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/09 21:04:45 jlam Exp $
DISTNAME= xanim2920
PKGNAME= xanim-2.92.0
@@ -48,5 +48,5 @@ post-extract:
done
.endif
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index d1f8628f4d9..141251402bc 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:16 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= xawtv-3.95
@@ -46,6 +46,6 @@ CONFIGURE_ARGS+= --enable-mmx
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
.include "../../x11/Xaw3d/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/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index cf30f236d76..20a6a68a0a7 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2006/03/04 21:30:16 jlam Exp $
+# $NetBSD: Makefile.common,v 1.32 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= xine-lib-${XINE_LIB_VER}a
@@ -47,5 +47,5 @@ pre-configure:
.include "../../converters/libiconv/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 410248d626e..3008b04b2e4 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= kiax-0.8.4
@@ -31,5 +31,5 @@ SUBST_SED.path= -e 's:/usr/local:${PREFIX}:g'
.include "../../x11/qt3-libs/buildlink3.mk"
.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index b8c9c002ce7..af462410e64 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:19 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/09 21:04:45 jlam Exp $
DISTNAME= kphone-4.2
PKGREVISION= 2
@@ -43,5 +43,5 @@ do-install:
.include "../../security/openssl/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/net/rdesktop/Makefile b/net/rdesktop/Makefile
index f1cd9ff5fde..6304a5a9292 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= rdesktop-1.4.1
@@ -23,6 +23,6 @@ SUBST_SED.audio= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
SUBST_MESSAGE.audio= "Fixing hardcoded audio device."
.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index c570905fed0..f20315fb658 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/09 21:04:45 jlam Exp $
DISTNAME= cdrtools-2.01.01a05
PKGNAME= cdrtools-ossdvd-2.01.1.36
@@ -95,5 +95,5 @@ do-install:
${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin; \
${INSTALL_MAN} readcd.1 ${PREFIX}/${PKGMANDIR}/man1
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index a935143c475..e4979c30a9d 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/03/09 21:04:45 jlam Exp $
DISTNAME= cdrtools-2.01
PKGREVISION= 2
@@ -91,5 +91,5 @@ do-install:
${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin; \
${INSTALL_MAN} readcd.1 ${PREFIX}/${PKGMANDIR}/man1
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 552d8972dc8..14eaa0b9261 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/06 22:16:53 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= gtoaster1.0Beta5
@@ -25,6 +25,6 @@ SUBST_SED.paths+= -e 's,@DEVOSSAUDIO@,${DEVOSSAUDIO},g'
SUBST_STAGE.paths= post-patch
.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tpb/Makefile b/sysutils/tpb/Makefile
index ad56bb9fda0..603c476b524 100644
--- a/sysutils/tpb/Makefile
+++ b/sysutils/tpb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= tpb-0.6.1
@@ -28,7 +28,7 @@ post-install:
.include "../../x11/xosd/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 4607c825d82..92b6aa9dc36 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2006/03/09 21:04:45 jlam Exp $
DISTNAME= xcdroast-${DIST_VER}
PKGNAME= xcdroast-${DIST_VER:S/alpha/a/}
@@ -53,6 +53,6 @@ post-install:
.include "../../devel/gettext-lib/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/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 1aa360c4962..6ab98d52953 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/03/06 00:18:26 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2006/03/09 21:04:45 jlam Exp $
#
DISTNAME= gnome-applets-2.12.2
@@ -94,5 +94,5 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../x11/gnome-panel/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/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index f2b7a6ccfc3..a62ae80f041 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2006/02/26 11:46:41 markd Exp $
+# $NetBSD: Makefile,v 1.106 2006/03/09 21:04:45 jlam Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGREVISION= 2
@@ -124,7 +124,7 @@ GCC_REQD+= 2.95
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/xmlcatmgr/catalogs.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index f3653a3feda..0da7c23b63b 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/03/09 21:04:45 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+
@@ -48,6 +48,6 @@ MAKEVARS+= PKG_BUILD_OPTIONS.kdelibs
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index 8639bf474a2..c7a82c47107 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/02/05 23:11:44 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2006/03/09 21:04:46 jlam Exp $
#
.include "Makefile.common"
@@ -11,5 +11,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE
.include "../../graphics/glu/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce3/Makefile b/x11/xfce3/Makefile
index c8fb2f6a76c..6df8fc6430e 100644
--- a/x11/xfce3/Makefile
+++ b/x11/xfce3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:46 jlam Exp $
DISTNAME= xfce-3.8.18
PKGREVISION= 7
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --disable-audiofile
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/imlib/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"