ports/117826: [PATCH] audio/oss: fix plist and unbreak

[Yen-Ming Lee]

>Number:         117826
>Category:       ports
>Synopsis:       [PATCH] audio/oss: fix plist and unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 04 21:10:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD db1.leeym.com 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 10:40:27 UTC 2007
>Description:
- fix plist
- patch and unbreak on 5.x

Port maintainer (jkim at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- oss-4.0.b1008.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/oss/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- Makefile	26 Oct 2007 15:15:16 -0000	1.14
+++ Makefile	4 Nov 2007 21:07:20 -0000
@@ -35,10 +35,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 600000
-BROKEN=		Does not compile on 5.x.
-.endif
-
 pre-patch:
 	${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" \
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/audio/oss/pkg-plist,v
retrieving revision 1.6
diff -u -u -r1.6 pkg-plist
--- pkg-plist	26 Oct 2007 15:15:17 -0000	1.6
+++ pkg-plist	4 Nov 2007 21:07:20 -0000
@@ -6,6 +6,7 @@
 bin/ossxmix
 etc/oss.conf
 lib/oss/etc/devices.list
+lib/oss/etc/userdefs
 @unexec rm -f %D/lib/oss/etc/installed_drivers 2>/dev/null || true
 @dirrmtry lib/oss/etc
 @dirrmtry lib/oss/logs
Index: files/patch-kernel-OS-FreeBSD-os_freebsd.c
===================================================================
RCS file: /home/pcvs/ports/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c,v
retrieving revision 1.1
diff -u -u -r1.1 patch-kernel-OS-FreeBSD-os_freebsd.c
--- files/patch-kernel-OS-FreeBSD-os_freebsd.c	12 Jul 2007 18:40:39 -0000	1.1
+++ files/patch-kernel-OS-FreeBSD-os_freebsd.c	4 Nov 2007 21:07:20 -0000
@@ -1,6 +1,14 @@
---- kernel/OS/FreeBSD/os_freebsd.c.orig	2007-06-12 17:32:57.000000000 -0400
-+++ kernel/OS/FreeBSD/os_freebsd.c	2007-07-11 20:41:43.000000000 -0400
-@@ -145,7 +145,7 @@
+--- kernel/OS/FreeBSD/os_freebsd.c.orig	2007-11-04 12:51:54.000000000 -0800
++++ kernel/OS/FreeBSD/os_freebsd.c	2007-11-04 12:52:26.000000000 -0800
+@@ -28,6 +28,7 @@
+ #include <sys/proc.h>
+ #include <sys/sx.h>
+ #include <sys/mman.h>
++#include <sys/lockmgr.h>
+ #include <fs/devfs/devfs.h>
+ #include <sys/poll.h>
+ 
+@@ -153,7 +154,7 @@
      return 0;
  
    wq->flags = 0;
--- oss-4.0.b1008.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: