Update to build 1006.

5 files changed, 36 insertions, 27 deletions

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 1d11758533a8..4553486b13af 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	oss
-DISTVERSION=	4.0-build1004
+DISTVERSION=	4.0-build1006
 CATEGORIES=	audio kld
 MASTER_SITES=	http://developer.opensound.com/sources/stable/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-cddl
@@ -40,13 +40,15 @@ BROKEN=		Does not compile on 5.x.
 .endif
 
 pre-patch:
-	${FIND} ${WRKDIR}/${DISTNAME} -type f -name '*.[hc]' -or -name '*.man' | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|"/usr/include/stdarg.h"|<machine/stdarg.h>|g' \
-		-e 's|/usr/|${PREFIX}/|g' \
-		-e 's|/etc/oss|${PREFIX}/etc/oss|g'
-	${REINPLACE_CMD} -e "s|<i386/include/intr_machdep.h>|<${ARCH}/include/intr_machdep.h>|g" \
+	${REINPLACE_CMD} -e 's|"/usr/include/stdarg.h"|<${ARCH}/include/stdarg.h>|g' \
+		-e "s|<i386/include/intr_machdep.h>|<${ARCH}/include/intr_machdep.h>|g" \
+		${WRKDIR}/${DISTNAME}/setup/FreeBSD/oss/build/module.inc \
 		${WRKDIR}/${DISTNAME}/setup/FreeBSD/oss/build/osscore.c
 	${REINPLACE_CMD} -e "s|mkdir|mkdir -p|" ${WRKDIR}/${DISTNAME}/setup/FreeBSD/build.sh
+	${FIND} ${WRKDIR}/${DISTNAME} -type f -name '*.[hc]' -or -name '*.man' | \
+		${XARGS} ${REINPLACE_CMD} \
+		-e 's|/usr/|${PREFIX}/|g' \
+		-e 's|/etc/oss|${PREFIX}/etc/oss|g'
 
 post-patch:
 	${FIND} ${WRKDIR} -name soundon -or -name soundoff -or -name build.sh | ${XARGS} ${REINPLACE_CMD} \
@@ -64,13 +66,14 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossctl ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/prototype/usr/sbin/soundon ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/prototype/usr/sbin/soundoff ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/lib/oss/lib/libOSSlib.so ${PREFIX}/lib
+	#${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/lib/oss/lib/libOSSlib.so ${PREFIX}/lib
 	@# oss.conf does not contain any user-configurable data; it's ok to overwrite it.
 	${INSTALL_DATA} ${WRKSRC}/prototype/etc/oss.conf ${PREFIX}/etc/oss.conf
 	${MKDIR} ${PREFIX}/include/sys
 	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/include/sys/soundcard.h ${PREFIX}/include/sys
-	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/include/midiparser.h ${PREFIX}/include
+	#${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/include/midiparser.h ${PREFIX}/include
 	${MKDIR} ${PREFIX}/lib/oss
+	${MKDIR} ${PREFIX}/lib/oss/logs
 	${MKDIR} ${PREFIX}/lib/oss/etc
 	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/etc/devices.list ${PREFIX}/lib/oss/etc
 	${INSTALL_DATA} ${WRKSRC}/prototype/usr/lib/oss/version.dat ${PREFIX}/lib/oss
diff --git a/audio/oss/distinfo b/audio/oss/distinfo
index 45e7acecf57d..6c061c45ddd0 100644
--- a/audio/oss/distinfo
+++ b/audio/oss/distinfo
@@ -1,3 +1,3 @@
-MD5 (oss-v4.0-build1004-src-cddl.tar.bz2) = 1c250934b0283b39fa73a32f81852859
-SHA256 (oss-v4.0-build1004-src-cddl.tar.bz2) = 85a2f38b011265e4677e00288240e8690fc6500ce8a75fd44ad8eea58a432e4a
-SIZE (oss-v4.0-build1004-src-cddl.tar.bz2) = 1406896
+MD5 (oss-v4.0-build1006-src-cddl.tar.bz2) = 23b7b473bdbd8ab7598a01cf1b4fa8a8
+SHA256 (oss-v4.0-build1006-src-cddl.tar.bz2) = c6beda4aba1c50526e2faf26cee95b7a3c0b64b4c7a82cb1b958b0e0f5eec047
+SIZE (oss-v4.0-build1006-src-cddl.tar.bz2) = 1400519
diff --git a/audio/oss/files/patch-setup-FreeBSD-sbin-soundoff b/audio/oss/files/patch-setup-FreeBSD-sbin-soundoff
index c4ab583a751b..14369cd647f3 100644
--- a/audio/oss/files/patch-setup-FreeBSD-sbin-soundoff
+++ b/audio/oss/files/patch-setup-FreeBSD-sbin-soundoff
@@ -1,5 +1,5 @@
---- setup/FreeBSD/sbin/soundoff.orig	Fri Jun 22 15:30:11 2007
-+++ setup/FreeBSD/sbin/soundoff	Fri Jun 22 15:30:38 2007
+--- setup/FreeBSD/sbin/soundoff.orig	2007-07-18 19:22:00.000000000 -0400
++++ setup/FreeBSD/sbin/soundoff	2007-09-05 13:18:02.000000000 -0400
 @@ -1,10 +1,10 @@
  #!/bin/sh
  
@@ -14,3 +14,12 @@
  fi
  
  if ! /sbin/kldstat | grep -q osscore.ko
+@@ -22,7 +22,7 @@
+ # Save mixer settings automatically if requested
+ if test -f $OSSLIBDIR/etc/userdefs && grep -q "autosave_mixer yes" $OSSLIBDIR/etc/userdefs
+ then
+-	/usr/sbin/savemixer 
++	%%PREFIX%%/sbin/savemixer 
+ fi
+ 
+ for n in `cat $OSSLIBDIR/etc/installed_drivers | sed 's/ .*//'`
diff --git a/audio/oss/files/patch-setup-FreeBSD-sbin-soundon b/audio/oss/files/patch-setup-FreeBSD-sbin-soundon
index eccd421ccb6c..9883c0441d5b 100644
--- a/audio/oss/files/patch-setup-FreeBSD-sbin-soundon
+++ b/audio/oss/files/patch-setup-FreeBSD-sbin-soundon
@@ -1,6 +1,6 @@
---- setup/FreeBSD/sbin/soundon.orig	Tue Feb 20 23:36:33 2007
-+++ setup/FreeBSD/sbin/soundon	Mon Jun 25 14:21:10 2007
-@@ -1,13 +1,13 @@
+--- setup/FreeBSD/sbin/soundon.orig	2007-08-28 03:30:00.000000000 -0400
++++ setup/FreeBSD/sbin/soundon	2007-09-05 14:22:59.000000000 -0400
+@@ -1,10 +1,10 @@
  #!/bin/sh
  
 -if test -f /etc/oss.conf
@@ -13,12 +13,8 @@
 +  OSSLIBDIR=%%PREFIX%%/lib/oss
  fi
  
--LOG=$OSSLIBDIR/logs/soundon.log
-+LOG=/var/log/soundon.log
- echo "Open Sound System starting" `date` > $LOG
- echo "OSS version: " `cat $OSSLIBDIR/version.dat` >> $LOG 2>&1
- echo "Kernel version: " `uname -a` >> $LOG
-@@ -29,7 +29,7 @@
+ mkdir $OSSLIBDIR/logs > /dev/null 2>&1
+@@ -31,7 +31,7 @@
  
  if test -f $OSSLIBDIR/etc/license.asc
  then
@@ -27,7 +23,7 @@
  fi
  
  if ! /sbin/kldload $OSSLIBDIR/modules/osscore.ko
-@@ -50,7 +50,7 @@
+@@ -52,7 +52,7 @@
  done
  
  echo "+++ ossinfo -v3 +++" >> $LOG
@@ -36,7 +32,7 @@
  echo "+++ /dev/sndstat +++" >> $LOG
  cat /dev/sndstat >> $LOG 2>&1
  echo "+++ dmesg +++" >> $LOG
-@@ -65,7 +65,7 @@
+@@ -67,7 +67,7 @@
  	sh $OSSLIBDIR/etc/legacy_devices >> $LOG 2>&1
  fi
  
@@ -45,7 +41,7 @@
  
  if test ! -f /dev/dsp
  then
-@@ -74,7 +74,7 @@
+@@ -76,7 +76,7 @@
  
  ls -l /dev/dsp* /dev/sndstat /dev/mixer* /dev/oss/*/* >> $LOG 2>&1
  
diff --git a/audio/oss/pkg-plist b/audio/oss/pkg-plist
index 78e5438b4e27..8d16250ddd4d 100644
--- a/audio/oss/pkg-plist
+++ b/audio/oss/pkg-plist
@@ -11,10 +11,10 @@ sbin/ossdetect
 sbin/ossctl
 sbin/soundon
 sbin/soundoff
-lib/libOSSlib.so
+@comment lib/libOSSlib.so
 include/sys/soundcard.h
 @dirrmtry include/sys
-include/midiparser.h
+@comment include/midiparser.h
 lib/oss/modules/osscore.ko
 lib/oss/modules/ali5455.ko
 lib/oss/modules/allegro.ko
@@ -53,6 +53,7 @@ lib/oss/modules/ymf7xx.ko
 lib/oss/etc/devices.list
 @unexec rm -f %D/lib/oss/etc/installed_drivers
 @unexec rm -f %D/lib/oss/etc/legacy_devices
+@dirrm lib/oss/logs
 @dirrm lib/oss/etc
 lib/oss/version.dat
 lib/oss/sysfiles.list