diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2004-03-03 10:12:22 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2004-03-03 10:12:22 +0000 |
| commit | e79fa9453b469b6fbdc91617500848d48ea843ea (patch) | |
| tree | 0213813440d71810106227caa75dba4af8b61a7c /emulators | |
| parent | Chase qmake dependency. (diff) | |
Fix the cdev patch to work correctly with FreeBSD4. One check has
been wrong.
Bump portrevision.
Notes
Notes:
svn path=/head/; revision=102800
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/vmware3/Makefile | 2 | ||||
| -rw-r--r-- | emulators/vmware3/files/freebsd5.patch | 23 |
2 files changed, 11 insertions, 14 deletions
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index cde2e4f9c125..7c3d433f1fc7 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware3 PORTVERSION= 3.2.1.2242 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= emulators linux MASTER_SITES= http://www4.vmware.com/software/ \ diff --git a/emulators/vmware3/files/freebsd5.patch b/emulators/vmware3/files/freebsd5.patch index f02364800620..2fb3f71e1da9 100644 --- a/emulators/vmware3/files/freebsd5.patch +++ b/emulators/vmware3/files/freebsd5.patch @@ -1,6 +1,6 @@ --- vmnet-only/freebsd/vmnet.c Sun Feb 29 11:17:28 2004 +++ vmnet-only/freebsd/vmnet.c Sun Feb 29 10:52:01 2004 -@@ -104,6 +104,10 @@ +@@ -104,14 +104,22 @@ static struct cdevsw vmnet_cdevsw = { #if __FreeBSD_version >= 500104 @@ -11,12 +11,14 @@ .d_open = vmnet_open, .d_close = vmnet_close, .d_read = vmnet_read, -@@ -111,7 +115,9 @@ + .d_write = vmnet_write, .d_ioctl = vmnet_ioctl, .d_poll = vmnet_poll, ++#if __FreeBSD_version < 502104 .d_name = DEVICE_NAME, -+#if __FreeBSD_version > 502104 .d_maj = CDEV_MAJOR ++#else ++ .d_name = DEVICE_NAME +#endif #else /* open */ vmnet_open, @@ -48,7 +50,7 @@ .include <bsd.kmod.mk> --- vmmon-only/freebsd/driver.c Sun Feb 29 11:17:28 2004 +++ vmmon-only/freebsd/driver.c Sun Feb 29 10:58:11 2004 -@@ -163,6 +163,10 @@ +@@ -163,9 +163,15 @@ static struct cdevsw vmmon_cdevsw = { #if __FreeBSD_version >= 500104 @@ -58,14 +60,9 @@ +#endif .d_open = FreeBSD_Driver_Open, .d_name = DEVICE_NAME, ++#if __FreeBSD_version < 502104 .d_maj = CDEV_MAJOR -@@ -172,7 +176,9 @@ - /* read */ noread, - /* psize */ nopsize, - /* flags */ 0, -+#if __FreeBSD_version > 502104 - /* bmaj */ -1 +#endif - #endif - }; - + #else + /* open */ FreeBSD_Driver_Open, + /* close */ noclose, |