[pkgsrc/trunk]: pkgsrc/emulators/wine Redundant; the code already handles the...

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f20a4c681fa
branches:  trunk
changeset: 543946:8f20a4c681fa
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sat Jun 28 06:02:26 2008 +0000

description:
Redundant; the code already handles the __NetBSD__ case.

diffstat:

 emulators/wine/distinfo         |   3 +--
 emulators/wine/patches/patch-ak |  40 ----------------------------------------
 2 files changed, 1 insertions(+), 42 deletions(-)

diffs (61 lines):

diff -r 05729a1d5c6c -r 8f20a4c681fa emulators/wine/distinfo
--- a/emulators/wine/distinfo   Sat Jun 28 05:18:57 2008 +0000
+++ b/emulators/wine/distinfo   Sat Jun 28 06:02:26 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.82 2008/06/28 05:18:57 jmcneill Exp $
+$NetBSD: distinfo,v 1.83 2008/06/28 06:02:26 jmcneill Exp $
 
 SHA1 (wine-1.0.tar.bz2) = 84150abdda18bc34b187335c6862718a6e08d255
 RMD160 (wine-1.0.tar.bz2) = 1dbfa38e54e7d6269ad4110f22b2791393fd3b59
@@ -12,7 +12,6 @@
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
-SHA1 (patch-ak) = 5f9836d5b6c957a2a6828b1979c1beeb4e900b31
 SHA1 (patch-ba) = 342564062296d316a20f1c0b3ad7aaa17e7e79be
 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
 SHA1 (patch-bc) = 1542a59718229a41e23aff93e4571bf7127a276b
diff -r 05729a1d5c6c -r 8f20a4c681fa emulators/wine/patches/patch-ak
--- a/emulators/wine/patches/patch-ak   Sat Jun 28 05:18:57 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-ak,v 1.15 2007/07/01 10:04:27 adam Exp $
-
---- dlls/ntdll/file.c.orig     2007-06-29 19:36:20.000000000 +0200
-+++ dlls/ntdll/file.c
-@@ -1843,6 +1843,35 @@ static NTSTATUS get_device_info( int fd,
-             info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
-             break;
-         }
-+#elif defined(__NetBSD__)
-+      struct statvfs stfs;
-+
-+      if (fstatvfs( fd, &stfs) < 0)
-+          info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
-+      else if (!strncmp("cd9660", stfs.f_fstypename,
-+                      sizeof(stfs.f_fstypename)))
-+      {
-+          info->DeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM;
-+          info->Characteristics |= FILE_REMOVABLE_MEDIA;
-+      }
-+      else if (!strncmp("nfs", stfs.f_fstypename,
-+                      sizeof(stfs.f_fstypename)))
-+      {
-+          info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM;
-+          info->Characteristics |= FILE_REMOTE_DEVICE;
-+      }
-+      else if (!strncmp("procfs", stfs.f_fstypename,
-+                      sizeof(stfs.f_fstypename)))
-+          info->DeviceType = FILE_DEVICE_VIRTUAL_DISK;
-+      else
-+          info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
-+      if (stfs.f_flag & MNT_RDONLY)
-+          info->Characteristics |= FILE_READ_ONLY_DEVICE;
-+      if (!(stfs.f_flag & MNT_LOCAL))
-+      {
-+          info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM;
-+          info->Characteristics |= FILE_REMOTE_DEVICE;
-+      }
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
-         struct statfs stfs;
-