- Update to 4.2-build2019.

- Fix build on current after r343485.
- Drop support for 8.x and earlier.

http://ossnext.trueinstruments.com/forum/viewtopic.php?f=19&t=5876

5 files changed, 22 insertions, 30 deletions

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index d8c528907486..0662b0b8ae53 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oss
-DISTVERSION=	4.2-build2017
+DISTVERSION=	4.2-build2019
 CATEGORIES=	audio
 MASTER_SITES=	http://www.opensound.com/developer/sources/stable/bsd/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-bsd
diff --git a/audio/oss/distinfo b/audio/oss/distinfo
index 0663abaa9308..e1bfb4e7837c 100644
--- a/audio/oss/distinfo
+++ b/audio/oss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486110185
-SHA256 (oss-v4.2-build2017-src-bsd.tar.bz2) = 8ef2b1b964719b4c356de234d4b28832302027dc23bf636820be1afe1b099972
-SIZE (oss-v4.2-build2017-src-bsd.tar.bz2) = 1714709
+TIMESTAMP = 1552427700
+SHA256 (oss-v4.2-build2019-src-bsd.tar.bz2) = 3eaa2f66cc5f9cc66843eae9ae4601cf7206d00e7229d1f3144a122adea4e7c9
+SIZE (oss-v4.2-build2019-src-bsd.tar.bz2) = 1723557
diff --git a/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c b/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c
new file mode 100644
index 000000000000..271092de6e54
--- /dev/null
+++ b/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c
@@ -0,0 +1,18 @@
+--- kernel/OS/FreeBSD/os_freebsd.c.orig	2019-03-06 07:52:21 UTC
++++ kernel/OS/FreeBSD/os_freebsd.c
+@@ -920,15 +920,9 @@ oss_poll (struct cdev *bsd_dev, int events, struct thr
+   return ev.revents;
+ }
+ 
+-#if defined(D_VERSION_03) && (D_VERSION == D_VERSION_03)
+ static int
+ oss_mmap (struct cdev *bsd_dev, vm_ooffset_t offset, vm_paddr_t * paddr,
+ 	  int nprot, vm_memattr_t *memattr)
+-#else
+-static int
+-oss_mmap (struct cdev *bsd_dev, vm_offset_t offset, vm_paddr_t * paddr,
+-	  int nprot)
+-#endif
+ {
+   int retval;
+   int dev;
diff --git a/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h b/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h
deleted file mode 100644
index 5d54af4237ab..000000000000
--- a/audio/oss/files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig	2019-01-12 19:57:42 UTC
-+++ kernel/OS/FreeBSD/wrapper/bsddefs.h
-@@ -91,6 +91,9 @@ typedef int ddi_iblock_cookie_t;
- extern void oss_udelay (unsigned long t);
- 
- #ifdef _KERNEL
-+#ifdef memset
-+#undef memset
-+#endif
- #define memset oss_memset
- extern void *oss_memset (void *t, int val, int l);
- #endif
diff --git a/audio/oss/files/patch-setup_srcconf__freebsd.inc b/audio/oss/files/patch-setup_srcconf__freebsd.inc
deleted file mode 100644
index 0e72423536da..000000000000
--- a/audio/oss/files/patch-setup_srcconf__freebsd.inc
+++ /dev/null
@@ -1,14 +0,0 @@
---- setup/srcconf_freebsd.inc.orig	2014-02-14 22:59:55 UTC
-+++ setup/srcconf_freebsd.inc
-@@ -10,8 +10,10 @@ check_sysdep (conf_t * conf, struct utsname *un)
- static void
- add_kernel_flags (FILE * f)
- {
-+  fprintf (f, "CFLAGS += -DKLD_MODULE ");
- # if defined(__x86_64__)
-   fprintf (f,
--	     "CFLAGS += -O3 -fno-common  -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding\n");
-+	     "-O3 -fno-common -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding -mno-sse");
- # endif
-+  fprintf(f, "\n");
- }