Update to 4.2 build 2003.

Feature safe:	yes
This commit is contained in:
Jung-uk Kim 2010-06-28 20:46:44 +00:00
parent bcdfef32b7
commit 7671fa2fb9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=257121
4 changed files with 4 additions and 35 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= oss
DISTVERSION= 4.2-build2002
PORTREVISION= 4
DISTVERSION= 4.2-build2003
CATEGORIES= audio kld
MASTER_SITES= http://www.opensound.com/developer/sources/stable/bsd/
DISTNAME= ${PORTNAME}-v${DISTVERSION}-src-bsd

View file

@ -1,3 +1,3 @@
MD5 (oss-v4.2-build2002-src-bsd.tar.bz2) = da28b1fea261554a1480fcd3c5509cb5
SHA256 (oss-v4.2-build2002-src-bsd.tar.bz2) = e8216ded0dc4c73106623d184ee174fc4e91979b251c51a2fb50fa96bdb36e64
SIZE (oss-v4.2-build2002-src-bsd.tar.bz2) = 1646769
MD5 (oss-v4.2-build2003-src-bsd.tar.bz2) = 5038825c8acb0ce314753fb2c3495852
SHA256 (oss-v4.2-build2003-src-bsd.tar.bz2) = 42219b66dc58bce76ce7de5209d22e88064f25ac5bc2123a0470a2e4ba595db5
SIZE (oss-v4.2-build2003-src-bsd.tar.bz2) = 1633543

View file

@ -1,12 +0,0 @@
--- cmd/osspartysh/osspartysh.c.orig 2009-11-13 10:20:53.000000000 -0500
+++ cmd/osspartysh/osspartysh.c 2010-01-19 13:31:23.000000000 -0500
@@ -45,8 +45,8 @@
#include <libutil.h>
#else
#include <pty.h>
-#endif
#include <utmp.h>
+#endif
#include <errno.h>
#define PARTYSH_MAGIC "ParTySH"

View file

@ -1,18 +0,0 @@
--- kernel/OS/FreeBSD/os_freebsd.c.orig 2009-11-13 10:20:53.000000000 -0500
+++ kernel/OS/FreeBSD/os_freebsd.c 2010-01-19 12:58:43.000000000 -0500
@@ -902,9 +902,15 @@
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;