sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 01:09:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to Wine 0.9.8.

Browse source
This commit is contained in:
Gerald Pfeifer 2006-02-16 00:18:39 +00:00
parent 948f97b3ca
commit f7cb797cc1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=156139
10 changed files with 20 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emulators/wine-devel/Makefile
View file

@ -7,7 +7,7 @@
#
PORTNAME= wine
PORTVERSION= 0.9.7
PORTVERSION= 0.9.8
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \

6
emulators/wine-devel/distinfo
View file

@ -1,3 +1,3 @@
MD5 (wine-0.9.7.tar.bz2) = 92b9af6e2c108bda8d23497abd9d0356
SHA256 (wine-0.9.7.tar.bz2) = c48bb18fd89b7ffd21931fcc258b8f3d8ce30f0a57c9e1a78569b6861fc1b1e4
SIZE (wine-0.9.7.tar.bz2) = 10503641
MD5 (wine-0.9.8.tar.bz2) = a3b3914c9e34df910045384d64baee87
SHA256 (wine-0.9.8.tar.bz2) = 6e6442aec2a889f04897ad739b863abec05c320a6f43c12198914cf7f830ee48
SIZE (wine-0.9.8.tar.bz2) = 10563571

81
emulators/wine-devel/files/patch-dlls-ntdll-tape.c
View file

@ -1,81 +0,0 @@
Index: dlls/ntdll/tape.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/tape.c,v
retrieving revision 1.3
diff -u -3 -p -r1.3 tape.c
--- tape.c 31 Jan 2006 12:08:47 -0000 1.3
+++ tape.c 3 Feb 2006 17:30:28 -0000
@@ -34,6 +34,10 @@
#if !defined(MTCOMPRESSION) && defined(MTCOMP)
#define MTCOMPRESSION MTCOMP
#endif
+/* FreeBSD, for example, has MTSETBSIZ instead of MTSETBLK. */
+#if !defined(MTSETBLK) && defined(MTSETBSIZ)
+#define MTSETBLK MTSETBSIZ
+#endif
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
@@ -177,7 +181,11 @@ static NTSTATUS TAPE_GetDriveParams( int
data->Compression = FALSE;
data->DataPadding = FALSE;
data->ReportSetmarks = FALSE;
+#ifdef __FreeBSD__
+ data->DefaultBlockSize = get.mt_blksiz;
+#else
data->DefaultBlockSize = get.mt_dsreg & MT_ST_BLKSIZE_MASK;
+#endif
data->MaximumBlockSize = data->DefaultBlockSize;
data->MinimumBlockSize = data->DefaultBlockSize;
data->MaximumPartitionCount = 1;
@@ -208,9 +216,17 @@ static NTSTATUS TAPE_GetMediaParams( int
data->Capacity.u.LowPart = 1024 * 1024 * 1024;
data->Remaining.u.LowPart = 1024 * 1024 * 1024;
+#ifdef __FreeBSD__
+ data->BlockSize = get.mt_blksiz;
+#else
data->BlockSize = get.mt_dsreg & MT_ST_BLKSIZE_MASK;
+#endif
data->PartitionCount = 1;
+#ifdef __FreeBSD__
+ data->WriteProtected = 0;
+#else
data->WriteProtected = GMT_WR_PROT(get.mt_gstat);
+#endif
return status;
#else
@@ -226,7 +242,9 @@ static NTSTATUS TAPE_GetPosition( int fd
{
#ifdef HAVE_SYS_MTIO_H
struct mtget get;
+#ifndef __FreeBSD__
struct mtpos pos;
+#endif
NTSTATUS status;
TRACE( "fd: %d type: 0x%08lx\n", fd, type );
@@ -237,16 +255,22 @@ static NTSTATUS TAPE_GetPosition( int fd
if (status != STATUS_SUCCESS)
return status;
+#ifndef __FreeBSD__
status = TAPE_GetStatus( ioctl( fd, MTIOCPOS, &pos ) );
if (status != STATUS_SUCCESS)
return status;
+#endif
switch (type)
{
case TAPE_ABSOLUTE_BLOCK:
data->Type = type;
data->Partition = get.mt_resid;
+#ifndef __FreeBSD__
data->OffsetLow = pos.mt_blkno;
+#else
+ data->OffsetLow = get.mt_blkno;
+#endif
break;
case TAPE_LOGICAL_BLOCK:
case TAPE_PSEUDO_LOGICAL_BLOCK:

39
emulators/wine-devel/files/patch-server-change.c
View file

@ -1,39 +0,0 @@
Index: server/change.c
===================================================================
RCS file: /home/wine/wine/server/change.c,v
retrieving revision 1.32
diff -u -3 -p -r1.32 change.c
--- change.c 30 Jan 2006 18:46:00 -0000 1.32
+++ change.c 3 Feb 2006 21:12:14 -0000
@@ -406,6 +406,7 @@ static void inotify_do_change_notify( st
static void inotify_poll_event( struct fd *fd, int event )
{
+#ifdef linux
int r, ofs, unix_fd;
char buffer[0x1000];
struct inotify_event *ie;
@@ -427,6 +428,7 @@ static void inotify_poll_event( struct f
inotify_do_change_notify( dir );
ofs += (sizeof (*ie) + ie->len - 1);
}
+#endif
}
static int inotify_get_info( struct fd *fd )
@@ -436,6 +438,7 @@ static int inotify_get_info( struct fd *
static void inotify_adjust_changes( struct dir *dir )
{
+#ifdef linux
int filter = dir->filter;
unsigned int mask = 0;
char link[32];
@@ -461,6 +464,7 @@ static void inotify_adjust_changes( stru
dir->wd = inotify_add_watch( get_unix_fd( dir->inotify_fd ), link, mask );
if (dir->wd != -1)
set_fd_events( dir->inotify_fd, POLLIN );
+#endif
}
static struct fd *create_inotify_fd( struct dir *dir )

9
emulators/wine-devel/pkg-plist
View file

@ -155,6 +155,7 @@ include/wine/windows/dplay.h
include/wine/windows/dplay8.h
include/wine/windows/dplobby.h
include/wine/windows/dplobby8.h
include/wine/windows/dpnathlp.h
include/wine/windows/dsconf.h
include/wine/windows/dshow.h
include/wine/windows/dsdriver.h
@ -312,6 +313,7 @@ include/wine/windows/sensevts.idl
include/wine/windows/servprov.h
include/wine/windows/servprov.idl
include/wine/windows/setupapi.h
include/wine/windows/sfc.h
include/wine/windows/shellapi.h
include/wine/windows/shldisp.h
include/wine/windows/shldisp.idl
@ -394,6 +396,7 @@ include/wine/windows/xmldso.idl
include/wine/windows/xmldsodid.h
include/wine/windows/zmouse.h
include/wine/windows/ddk/cfgmgr32.h
include/wine/windows/ddk/ntddcdvd.h
include/wine/windows/ddk/ntddser.h
include/wine/windows/ddk/ntddtape.h
include/wine/windows/ddk/wdm.h
@ -565,11 +568,11 @@ lib/wine/librasapi32.def
lib/wine/librsaenh.def
lib/wine/libriched20.def
lib/wine/librpcrt4.def
lib/wine/librsabase.def
lib/wine/libsecur32.def
lib/wine/libsensapi.def
lib/wine/libserialui.def
lib/wine/libsetupapi.def
lib/wine/libsfc.def
lib/wine/libshdocvw.def
lib/wine/libshell32.def
lib/wine/libshfolder.def
@ -587,7 +590,6 @@ lib/wine/libuuid.a
lib/wine/libuxtheme.def
lib/wine/libvdmdbg.def
lib/wine/libversion.def
lib/wine/libw32skrnl.def
lib/wine/libwldap32.def
lib/wine/libwinecrt0.a
lib/wine/libwined3d.def
@ -685,6 +687,7 @@ lib/wine/sensapi.dll.so
lib/wine/serialui.dll.so
lib/wine/setupapi.dll.so
lib/wine/setupx.dll.so
lib/wine/sfc.dll.so
lib/wine/shdocvw.dll.so
lib/wine/shell.dll.so
lib/wine/shell32.dll.so
@ -750,7 +753,6 @@ lib/wine/winenas.drv.so
lib/wine/winepath.exe.so
lib/wine/wineps.drv.so
lib/wine/wineps16.drv.so
lib/wine/winetest.exe.so
lib/wine/winevdm.exe.so
lib/wine/winex11.drv.so
lib/wine/wing.dll.so
@ -767,6 +769,7 @@ lib/wine/wintrust.dll.so
lib/wine/winver.exe.so
lib/wine/wldap32.dll.so
lib/wine/wnaspi32.dll.so
lib/wine/wordpad.exe.so
lib/wine/wow32.dll.so
lib/wine/wprocs.dll.so
lib/wine/ws2_32.dll.so

2
emulators/wine/Makefile
View file

@ -7,7 +7,7 @@
#
PORTNAME= wine
PORTVERSION= 0.9.7
PORTVERSION= 0.9.8
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \

6
emulators/wine/distinfo
View file

@ -1,3 +1,3 @@
MD5 (wine-0.9.7.tar.bz2) = 92b9af6e2c108bda8d23497abd9d0356
SHA256 (wine-0.9.7.tar.bz2) = c48bb18fd89b7ffd21931fcc258b8f3d8ce30f0a57c9e1a78569b6861fc1b1e4
SIZE (wine-0.9.7.tar.bz2) = 10503641
MD5 (wine-0.9.8.tar.bz2) = a3b3914c9e34df910045384d64baee87
SHA256 (wine-0.9.8.tar.bz2) = 6e6442aec2a889f04897ad739b863abec05c320a6f43c12198914cf7f830ee48
SIZE (wine-0.9.8.tar.bz2) = 10563571

81
emulators/wine/files/patch-dlls-ntdll-tape.c
View file

@ -1,81 +0,0 @@
Index: dlls/ntdll/tape.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/tape.c,v
retrieving revision 1.3
diff -u -3 -p -r1.3 tape.c
--- tape.c 31 Jan 2006 12:08:47 -0000 1.3
+++ tape.c 3 Feb 2006 17:30:28 -0000
@@ -34,6 +34,10 @@
#if !defined(MTCOMPRESSION) && defined(MTCOMP)
#define MTCOMPRESSION MTCOMP
#endif
+/* FreeBSD, for example, has MTSETBSIZ instead of MTSETBLK. */
+#if !defined(MTSETBLK) && defined(MTSETBSIZ)
+#define MTSETBLK MTSETBSIZ
+#endif
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
@@ -177,7 +181,11 @@ static NTSTATUS TAPE_GetDriveParams( int
data->Compression = FALSE;
data->DataPadding = FALSE;
data->ReportSetmarks = FALSE;
+#ifdef __FreeBSD__
+ data->DefaultBlockSize = get.mt_blksiz;
+#else
data->DefaultBlockSize = get.mt_dsreg & MT_ST_BLKSIZE_MASK;
+#endif
data->MaximumBlockSize = data->DefaultBlockSize;
data->MinimumBlockSize = data->DefaultBlockSize;
data->MaximumPartitionCount = 1;
@@ -208,9 +216,17 @@ static NTSTATUS TAPE_GetMediaParams( int
data->Capacity.u.LowPart = 1024 * 1024 * 1024;
data->Remaining.u.LowPart = 1024 * 1024 * 1024;
+#ifdef __FreeBSD__
+ data->BlockSize = get.mt_blksiz;
+#else
data->BlockSize = get.mt_dsreg & MT_ST_BLKSIZE_MASK;
+#endif
data->PartitionCount = 1;
+#ifdef __FreeBSD__
+ data->WriteProtected = 0;
+#else
data->WriteProtected = GMT_WR_PROT(get.mt_gstat);
+#endif
return status;
#else
@@ -226,7 +242,9 @@ static NTSTATUS TAPE_GetPosition( int fd
{
#ifdef HAVE_SYS_MTIO_H
struct mtget get;
+#ifndef __FreeBSD__
struct mtpos pos;
+#endif
NTSTATUS status;
TRACE( "fd: %d type: 0x%08lx\n", fd, type );
@@ -237,16 +255,22 @@ static NTSTATUS TAPE_GetPosition( int fd
if (status != STATUS_SUCCESS)
return status;
+#ifndef __FreeBSD__
status = TAPE_GetStatus( ioctl( fd, MTIOCPOS, &pos ) );
if (status != STATUS_SUCCESS)
return status;
+#endif
switch (type)
{
case TAPE_ABSOLUTE_BLOCK:
data->Type = type;
data->Partition = get.mt_resid;
+#ifndef __FreeBSD__
data->OffsetLow = pos.mt_blkno;
+#else
+ data->OffsetLow = get.mt_blkno;
+#endif
break;
case TAPE_LOGICAL_BLOCK:
case TAPE_PSEUDO_LOGICAL_BLOCK:

39
emulators/wine/files/patch-server-change.c
View file

@ -1,39 +0,0 @@
Index: server/change.c
===================================================================
RCS file: /home/wine/wine/server/change.c,v
retrieving revision 1.32
diff -u -3 -p -r1.32 change.c
--- change.c 30 Jan 2006 18:46:00 -0000 1.32
+++ change.c 3 Feb 2006 21:12:14 -0000
@@ -406,6 +406,7 @@ static void inotify_do_change_notify( st
static void inotify_poll_event( struct fd *fd, int event )
{
+#ifdef linux
int r, ofs, unix_fd;
char buffer[0x1000];
struct inotify_event *ie;
@@ -427,6 +428,7 @@ static void inotify_poll_event( struct f
inotify_do_change_notify( dir );
ofs += (sizeof (*ie) + ie->len - 1);
}
+#endif
}
static int inotify_get_info( struct fd *fd )
@@ -436,6 +438,7 @@ static int inotify_get_info( struct fd *
static void inotify_adjust_changes( struct dir *dir )
{
+#ifdef linux
int filter = dir->filter;
unsigned int mask = 0;
char link[32];
@@ -461,6 +464,7 @@ static void inotify_adjust_changes( stru
dir->wd = inotify_add_watch( get_unix_fd( dir->inotify_fd ), link, mask );
if (dir->wd != -1)
set_fd_events( dir->inotify_fd, POLLIN );
+#endif
}
static struct fd *create_inotify_fd( struct dir *dir )

9
emulators/wine/pkg-plist
View file

@ -155,6 +155,7 @@ include/wine/windows/dplay.h
include/wine/windows/dplay8.h
include/wine/windows/dplobby.h
include/wine/windows/dplobby8.h
include/wine/windows/dpnathlp.h
include/wine/windows/dsconf.h
include/wine/windows/dshow.h
include/wine/windows/dsdriver.h
@ -312,6 +313,7 @@ include/wine/windows/sensevts.idl
include/wine/windows/servprov.h
include/wine/windows/servprov.idl
include/wine/windows/setupapi.h
include/wine/windows/sfc.h
include/wine/windows/shellapi.h
include/wine/windows/shldisp.h
include/wine/windows/shldisp.idl
@ -394,6 +396,7 @@ include/wine/windows/xmldso.idl
include/wine/windows/xmldsodid.h
include/wine/windows/zmouse.h
include/wine/windows/ddk/cfgmgr32.h
include/wine/windows/ddk/ntddcdvd.h
include/wine/windows/ddk/ntddser.h
include/wine/windows/ddk/ntddtape.h
include/wine/windows/ddk/wdm.h
@ -565,11 +568,11 @@ lib/wine/librasapi32.def
lib/wine/librsaenh.def
lib/wine/libriched20.def
lib/wine/librpcrt4.def
lib/wine/librsabase.def
lib/wine/libsecur32.def
lib/wine/libsensapi.def
lib/wine/libserialui.def
lib/wine/libsetupapi.def
lib/wine/libsfc.def
lib/wine/libshdocvw.def
lib/wine/libshell32.def
lib/wine/libshfolder.def
@ -587,7 +590,6 @@ lib/wine/libuuid.a
lib/wine/libuxtheme.def
lib/wine/libvdmdbg.def
lib/wine/libversion.def
lib/wine/libw32skrnl.def
lib/wine/libwldap32.def
lib/wine/libwinecrt0.a
lib/wine/libwined3d.def
@ -685,6 +687,7 @@ lib/wine/sensapi.dll.so
lib/wine/serialui.dll.so
lib/wine/setupapi.dll.so
lib/wine/setupx.dll.so
lib/wine/sfc.dll.so
lib/wine/shdocvw.dll.so
lib/wine/shell.dll.so
lib/wine/shell32.dll.so
@ -750,7 +753,6 @@ lib/wine/winenas.drv.so
lib/wine/winepath.exe.so
lib/wine/wineps.drv.so
lib/wine/wineps16.drv.so
lib/wine/winetest.exe.so
lib/wine/winevdm.exe.so
lib/wine/winex11.drv.so
lib/wine/wing.dll.so
@ -767,6 +769,7 @@ lib/wine/wintrust.dll.so
lib/wine/winver.exe.so
lib/wine/wldap32.dll.so
lib/wine/wnaspi32.dll.so
lib/wine/wordpad.exe.so
lib/wine/wow32.dll.so
lib/wine/wprocs.dll.so
lib/wine/ws2_32.dll.so