From f1eb4bbbf12408cfbddb033f0213c7c6f4c0fb05 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 13 Nov 2007 15:59:06 +0000
Subject: - Unbreak build on 5.x.[1] - Remove userdefs if it is unchanged or
 empty.

PR:		ports/117826
Reported by:	pointyhat
Submitted by:	Yen-Ming Lee (leeym at leeym dot com)[1]
Approved by:	portmgr (linimon)
---
 audio/oss/Makefile                                   |  7 ++-----
 audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c | 14 +++++++++++---
 audio/oss/files/pkg-deinstall.in                     | 17 +++++++++++++++++
 audio/oss/pkg-plist                                  |  1 -
 4 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 audio/oss/files/pkg-deinstall.in

(limited to 'audio/oss')

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 2937045ce2b8..ede1b3aa01e7 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	oss
 DISTVERSION=	4.0-build1008
+PORTREVISION=	1
 CATEGORIES=	audio kld
 MASTER_SITES=	http://developer.opensound.com/sources/stable/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-cddl
@@ -23,7 +24,7 @@ USE_GNOME=	gtk20
 USE_RC_SUBR=	oss
 WRKSRC=		${WRKDIR}/build
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
-SUB_FILES=	pkg-install
+SUB_FILES=	pkg-install pkg-deinstall
 ONLY_FOR_ARCHS=	amd64 i386
 
 MAN1=		ossinfo.1 ossmix.1 ossplay.1 ossrecord.1 osstest.1 ossxmix.1
@@ -35,10 +36,6 @@ IGNORE=		requires kernel source to be installed
 
 .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" \
diff --git a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
index b738f690f972..72a2c7d98168 100644
--- a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
+++ b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
@@ -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-12 15:40:51.000000000 -0500
++++ kernel/OS/FreeBSD/os_freebsd.c	2007-11-12 15:42:12.000000000 -0500
+@@ -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;
diff --git a/audio/oss/files/pkg-deinstall.in b/audio/oss/files/pkg-deinstall.in
new file mode 100644
index 000000000000..2403c03ce8e5
--- /dev/null
+++ b/audio/oss/files/pkg-deinstall.in
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+case $2 in
+DEINSTALL)
+	if test -f %%PREFIX%%/lib/oss/etc/installed_drivers; then
+		rm -f %%PREFIX%%/lib/oss/etc/installed_drivers
+	fi
+	if test -f %%PREFIX%%/lib/oss/etc/userdefs; then
+		mv -f %%PREFIX%%/lib/oss/etc/userdefs %%PREFIX%%/lib/oss/etc/userdefs.bak
+		/usr/bin/grep -v '^autosave_mixer yes$' %%PREFIX%%/lib/oss/etc/userdefs.bak > %%PREFIX%%/lib/oss/etc/userdefs
+		if /usr/bin/cmp %%PREFIX%%/lib/oss/etc/userdefs /dev/null; then
+			rm -f %%PREFIX%%/lib/oss/etc/userdefs %%PREFIX%%/lib/oss/etc/userdefs.bak
+		else
+			mv -f %%PREFIX%%/lib/oss/etc/userdefs.bak %%PREFIX%%/lib/oss/etc/userdefs
+		fi
+	fi
+esac
diff --git a/audio/oss/pkg-plist b/audio/oss/pkg-plist
index 7da9ebe2f4c6..179fb811475e 100644
--- a/audio/oss/pkg-plist
+++ b/audio/oss/pkg-plist
@@ -6,7 +6,6 @@ bin/osstest
 bin/ossxmix
 etc/oss.conf
 lib/oss/etc/devices.list
-@unexec rm -f %D/lib/oss/etc/installed_drivers 2>/dev/null || true
 @dirrmtry lib/oss/etc
 @dirrmtry lib/oss/logs
 lib/oss/modules/osscore.ko
-- 
cgit v1.2.3