Update to 4.2 build 2000.

Feature safe:	yes

8 files changed, 83 insertions, 137 deletions

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 597d67b5d061..f6bb39bf4666 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	oss
-DISTVERSION=	4.1-build1052
-PORTREVISION=	1
+DISTVERSION=	4.2-build2000
 CATEGORIES=	audio kld
 MASTER_SITES=	http://www.opensound.com/developer/sources/stable/bsd/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-bsd
@@ -27,21 +26,22 @@ SUB_FILES=	pkg-install pkg-deinstall
 ONLY_FOR_ARCHS=	amd64 i386
 MANCOMPRESSED=	yes
 
-MAN1=		ossinfo.1 ossmix.1 osspartysh.1 ossplay.1 ossrecord.1 \
-		osstest.1 ossxmix.1 soundoff.1 soundon.1
-MAN7=		oss_ali5455.7 oss_allegro.7 oss_atiaudio.7 oss_audigyls.7 \
-		oss_audioloop.7 oss_audiopci.7 oss_cmi878x.7 oss_cmpci.7 \
-		oss_cs4281.7 oss_cs461x.7 oss_digi96.7 oss_emu10k1x.7 \
-		oss_envy24.7 oss_envy24ht.7 oss_fmedia.7 oss_geode.7 \
-		oss_hdaudio.7 oss_ich.7 oss_imux.7 oss_midiloop.7 \
-		oss_midimix.7 oss_sblive.7 oss_sbpci.7 oss_sbxfi.7 \
-		oss_solo.7 oss_trident.7 oss_via823x.7 oss_via97.7 \
-		oss_ymf7xx.7 osscore.7
+MAN1=		ossinfo.1 ossmix.1 osspartysh.1 ossphone.1 ossplay.1 \
+		ossrecord.1 osstest.1 ossxmix.1 soundoff.1 soundon.1
+MAN7=		oss_ali5455.7 oss_atiaudio.7 oss_audigyls.7 \
+		oss_audioloop.7 oss_audiopci.7 oss_cmi878x.7 \
+		oss_cmpci.7 oss_cs4281.7 oss_cs461x.7 oss_digi96.7 \
+		oss_emu10k1x.7 oss_envy24.7 oss_envy24ht.7 \
+		oss_fmedia.7 oss_geode.7 oss_hdaudio.7 oss_ich.7 \
+		oss_imux.7 oss_madi.7 oss_midiloop.7 oss_midimix.7 \
+		oss_sblive.7 oss_sbpci.7 oss_sbxfi.7 oss_solo.7 \
+		oss_trident.7 oss_userdev.7 oss_via823x.7 \
+		oss_via97.7 oss_ymf7xx.7 osscore.7
 MAN8=		ossdetect.8 ossdevlinks.8 savemixer.8 vmixctl.8
 
-CONF_FILES=	oss_allegro oss_audigyls oss_audioloop oss_cs461x \
-		oss_emu10k1x oss_envy24 oss_envy24ht oss_fmedia \
-		oss_hdaudio oss_ich oss_imux oss_midiloop oss_sblive \
+CONF_FILES=	oss_audigyls oss_audioloop oss_cs461x oss_emu10k1x \
+		oss_envy24 oss_envy24ht oss_fmedia oss_hdaudio \
+		oss_ich oss_imux oss_madi oss_midiloop oss_sblive \
 		oss_sbpci oss_sbxfi oss_trident oss_usb oss_userdev \
 		oss_ymf7xx osscore
 
@@ -52,26 +52,34 @@ PROTO_SBINDIR=	${PROTO_DIR}/usr/sbin
 PROTO_MANDIR=	${PROTO_DIR}/usr/share/man
 PROTO_OSSLIBDIR=${PROTO_DIR}${PREFIX}/lib/oss
 
+OPTIONS=	VORBIS	"OGG/Vorbis audio support"	on
+
 .if !exists(${SRC_BASE}/sys/Makefile)
 IGNORE=		requires kernel source to be installed
 .endif
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_VORBIS)
+LIB_DEPENDS+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ENV+=	OGG_SUPPORT=YES
+.endif
+
 pre-patch:
 	${FIND} ${WRKDIR}/${DISTNAME} -type f \
-	    -name configure -or -name '*.[ch]' -or -name '*.man' | \
+	    -name '*.[ch]' -or -name '*.man' | \
 	    ${XARGS} ${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' \
 	    -e 's|/etc/oss|${PREFIX}/etc/oss|g'
 
 post-patch:
 	${FIND} ${WRKDIR} -name configure -or -name make.local -or \
-	    -name soundoff -or -name soundon | \
+	    -name soundoff -or -name soundon -or -name srcconf.c | \
 	    ${XARGS} ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g'
 
 do-configure:
 	${MKDIR} ${WRKSRC}
-	cd ${WRKSRC} && ${WRKDIR}/${DISTNAME}/configure
+	(cd ${WRKSRC} && \
+	    ${SETENV} ${CONFIGURE_ENV} ${WRKDIR}/${DISTNAME}/configure)
 
 do-install:
 	${INSTALL_PROGRAM} ${PROTO_BINDIR}/* ${PREFIX}/bin/
diff --git a/audio/oss/distinfo b/audio/oss/distinfo
index e64da4689170..0355097bad8c 100644
--- a/audio/oss/distinfo
+++ b/audio/oss/distinfo
@@ -1,3 +1,3 @@
-MD5 (oss-v4.1-build1052-src-bsd.tar.bz2) = c55a7e37c7ebea12f31bdeb8b4dba9c3
-SHA256 (oss-v4.1-build1052-src-bsd.tar.bz2) = 8edaeb751c808aecaa2a335a5c874132982f2a6b2ef23eb9de65f3a203a6a56d
-SIZE (oss-v4.1-build1052-src-bsd.tar.bz2) = 1590234
+MD5 (oss-v4.2-build2000-src-bsd.tar.bz2) = 9dcae4d5e30ebb2ea9e4f78b4f05e08e
+SHA256 (oss-v4.2-build2000-src-bsd.tar.bz2) = 2e363c80366c83b6db9c86d9903470e323bb8b275d207c13b5e01ae98c204c08
+SIZE (oss-v4.2-build2000-src-bsd.tar.bz2) = 1638698
diff --git a/audio/oss/files/patch-cmd-ossplay-ossplay_parser.c b/audio/oss/files/patch-cmd-ossplay-ossplay_parser.c
new file mode 100644
index 000000000000..97e8579ec43f
--- /dev/null
+++ b/audio/oss/files/patch-cmd-ossplay-ossplay_parser.c
@@ -0,0 +1,11 @@
+--- cmd/ossplay/ossplay_parser.c.bak	2009-09-03 06:14:34.000000000 -0400
++++ cmd/ossplay/ossplay_parser.c	2009-09-22 15:17:49.000000000 -0400
+@@ -91,7 +91,7 @@
+     {
+       *vft = (dlopen_funcs_t *)ossplay_malloc (sizeof (dlopen_funcs_t));
+ 
+-      (*vft)->vorbisfile_handle = ossplay_dlopen ("libvorbisfile.so.3");
++      (*vft)->vorbisfile_handle = ossplay_dlopen ("libvorbisfile.so.6");
+ 
+       if ((*vft)->vorbisfile_handle == NULL)
+         {
diff --git a/audio/oss/files/patch-configure b/audio/oss/files/patch-configure
new file mode 100644
index 000000000000..40eef2cdd201
--- /dev/null
+++ b/audio/oss/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig	2009-08-10 13:16:21.000000000 -0400
++++ configure	2009-09-22 14:38:20.000000000 -0400
+@@ -2,7 +2,7 @@
+ 
+ CONFIGURE=YES
+ COPY_OPTIONS=
+-OSSLIBDIR="/usr/lib/oss"
++OSSLIBDIR="%%PREFIX%%/lib/oss"
+ TARGETOS=
+ 
+ unset USE_PHPMAKE
+@@ -24,11 +24,11 @@
+ 
+ unset CDPATH >/dev/null 2>&1
+ 
+-if test -f /usr/include/vorbis/vorbisfile.h || test -f /usr/local/include/vorbisfile.h
+-then
+-	OGG_SUPPORT=YES
+-	export OGG_SUPPORT
+-fi
++#if test -f /usr/include/vorbis/vorbisfile.h || test -f /usr/local/include/vorbisfile.h
++#then
++#	OGG_SUPPORT=YES
++#	export OGG_SUPPORT
++#fi
+ 
+ DIR=`pwd`
+ SRCDIR=`dirname $0`
diff --git a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
deleted file mode 100644
index 3284eab654a2..000000000000
--- a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
+++ /dev/null
@@ -1,86 +0,0 @@
---- kernel/OS/FreeBSD/os_freebsd.c.orig	2009-01-04 00:05:36.000000000 -0500
-+++ kernel/OS/FreeBSD/os_freebsd.c	2009-02-16 15:07:32.000000000 -0500
-@@ -652,7 +652,11 @@
-   oss_cdev_t *cdev;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, flags);
- #else
-   struct fileinfo * fi;
-@@ -686,7 +690,11 @@
-   oss_cdev_t *cdev;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, flags);
- #else
-   struct fileinfo * fi;
-@@ -714,7 +722,11 @@
- static int
- oss_open (struct cdev *bsd_dev, int flags, int mode, struct thread *p)
- {
-+#if __FreeBSD_version >= 800062
-+  int dev = dev2unit (bsd_dev);
-+#else
-   int dev = minor (bsd_dev);
-+#endif
-   oss_cdev_t *cdev;
-   struct fileinfo fi;
-   int tmpdev, retval;
-@@ -759,7 +771,11 @@
-   oss_cdev_t *cdev;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, flags);
- #else
-   struct fileinfo * fi;
-@@ -792,7 +808,11 @@
-   oss_cdev_t *cdev;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, mode);
- #else
-   struct fileinfo * fi;
-@@ -827,7 +847,11 @@
-   int err;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, 0);
- #else
-   struct fileinfo * fi;
-@@ -870,7 +894,11 @@
-   dmap_p dmap = NULL;
-   int err;
- #ifndef VDEV_SUPPORT
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
- #else
-   struct fileinfo * fi;
-   if (oss_file_get_private ((void **)&fi)) return ENXIO;
diff --git a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c b/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c
deleted file mode 100644
index 1946cbece015..000000000000
--- a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- setup/FreeBSD/oss/build/osscore.c.orig	2008-12-14 16:35:26.000000000 -0500
-+++ setup/FreeBSD/oss/build/osscore.c	2009-07-10 16:14:12.000000000 -0400
-@@ -419,20 +419,20 @@
-   if (!(flags_reg & FLAGS_ID))
-     return 0;
- 
--#define CPUID_FXSR	(1<<24)
--#define CPUID_SSE	(1<<25)
--#define CPUID_SSE2	(1<<26)
-+#define OSS_CPUID_FXSR	(1<<24)
-+#define OSS_CPUID_SSE	(1<<25)
-+#define OSS_CPUID_SSE2	(1<<26)
- 
-   cpuid (1, &eax, &ebx, &ecx, &edx);
- 
--  if (!(edx & CPUID_FXSR))
-+  if (!(edx & OSS_CPUID_FXSR))
-     return 0;
- 
-   /*
-    * Older machines require different FP handling than the latest ones. Use the SSE
-    * instruction set as an indicator.
-    */
--  if (!(edx & CPUID_SSE))
-+  if (!(edx & OSS_CPUID_SSE))
-     old_arch = 1;
- 
-   return 1;
diff --git a/audio/oss/files/patch-setup-srcconf.c b/audio/oss/files/patch-setup-srcconf.c
new file mode 100644
index 000000000000..ae52511a309b
--- /dev/null
+++ b/audio/oss/files/patch-setup-srcconf.c
@@ -0,0 +1,11 @@
+--- setup/srcconf.c.orig	2009-09-03 06:14:33.000000000 -0400
++++ setup/srcconf.c	2009-09-22 14:52:03.000000000 -0400
+@@ -195,7 +195,7 @@
+ 	{
+ 	  parms = "";
+ 	  if (getenv ("OGG_SUPPORT") != NULL)
+-	    parms = "-DOGG_SUPPORT";
++	    parms = "-DOGG_SUPPORT -I%%PREFIX%%/include";
+ 	}
+ 
+       if (strcmp (line, "project") == 0)
diff --git a/audio/oss/pkg-plist b/audio/oss/pkg-plist
index 2fd1a3adaa45..39868a1efdfb 100644
--- a/audio/oss/pkg-plist
+++ b/audio/oss/pkg-plist
@@ -1,12 +1,12 @@
 bin/ossinfo
 bin/ossmix
 bin/osspartysh
+bin/ossphone
 bin/ossplay
 bin/ossrecord
 bin/osstest
 bin/ossxmix
 etc/oss.conf
-lib/oss/conf/oss_allegro.conf.sample
 lib/oss/conf/oss_audigyls.conf.sample
 lib/oss/conf/oss_audioloop.conf.sample
 lib/oss/conf/oss_cs461x.conf.sample
@@ -17,6 +17,7 @@ lib/oss/conf/oss_fmedia.conf.sample
 lib/oss/conf/oss_hdaudio.conf.sample
 lib/oss/conf/oss_ich.conf.sample
 lib/oss/conf/oss_imux.conf.sample
+lib/oss/conf/oss_madi.conf.sample
 lib/oss/conf/oss_midiloop.conf.sample
 lib/oss/conf/oss_sblive.conf.sample
 lib/oss/conf/oss_sbpci.conf.sample
@@ -35,7 +36,6 @@ lib/oss/include/sys/soundcard.h
 @exec mkdir -p %D/lib/oss/logs
 @dirrmtry lib/oss/logs
 lib/oss/modules/oss_ali5455.ko
-lib/oss/modules/oss_allegro.ko
 lib/oss/modules/oss_atiaudio.ko
 lib/oss/modules/oss_audigyls.ko
 lib/oss/modules/oss_audioloop.ko
@@ -53,6 +53,7 @@ lib/oss/modules/oss_geode.ko
 lib/oss/modules/oss_hdaudio.ko
 lib/oss/modules/oss_ich.ko
 lib/oss/modules/oss_imux.ko
+lib/oss/modules/oss_madi.ko
 lib/oss/modules/oss_midiloop.ko
 lib/oss/modules/oss_midimix.ko
 lib/oss/modules/oss_sblive.ko
@@ -60,6 +61,7 @@ lib/oss/modules/oss_sbpci.ko
 lib/oss/modules/oss_sbxfi.ko
 lib/oss/modules/oss_solo.ko
 lib/oss/modules/oss_trident.ko
+lib/oss/modules/oss_userdev.ko
 lib/oss/modules/oss_via823x.ko
 lib/oss/modules/oss_via97.ko
 lib/oss/modules/oss_ymf7xx.ko