Upgrade to January 31st version.

CAUTION: The format of $PREFIX/etc/wine.conf has changed!
Check against wine.ini from the build directory ...

6 files changed, 102 insertions, 108 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 7e5b4ed824ed..6d323353ecab 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Oct  6 23:43:28 MET 1995
 # Whom:			se
 #
-# $Id: Makefile,v 1.18 1995/12/16 12:50:24 se Exp $
+# $Id: Makefile,v 1.19 1996/01/16 14:44:36 se Exp $
 #
 
-DATE=		960114
+DATE=		960131
 DISTNAME=	Wine-${DATE}
-PKGNAME=	wine-96.01.14
+PKGNAME=	wine-96.01.31
 CATEGORIES+=	emulators x11
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/ \
 		ftp://aris.com/pub/linux/ALPHA/Wine/development/ \
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 1ed9c2427057..e7ae829f2c6f 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-951212.tar.gz) = dcce4398661036aad0e594316104229c
+MD5 (Wine-960131.tar.gz) = 47e546d3b5940fe48ef7cf168ae7ae76
diff --git a/emulators/wine-devel/files/patch-ad b/emulators/wine-devel/files/patch-ad
index def7c3a8cac4..98f8f49df9ee 100644
--- a/emulators/wine-devel/files/patch-ad
+++ b/emulators/wine-devel/files/patch-ad
@@ -1,53 +1,50 @@
-*** wine.ini~	Mon May 22 11:29:28 1995
---- wine.ini	Fri Oct  6 17:10:27 1995
+*** wine.ini~	Fri Feb  2 22:19:35 1996
+--- wine.ini	Fri Feb  2 22:21:27 1996
 ***************
-*** 3,7 ****
-  A=/mnt/fd0

-  C=/dos

-! D=/usr/windows

-  E=/home/bob/wine/work

-  F=/home/bob/test

---- 3,7 ----
-  A=/mnt/fd0

-  C=/dos

-! D=/usr/local/share/windows

-  E=/home/bob/wine/work

-  F=/home/bob/test

+*** 35,39 ****
+  Temp=e:\
+  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
+! SymbolTableFile=./wine.sym
+  
+  [fonts]
+--- 35,39 ----
+  Temp=e:\
+  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
+! SymbolTableFile=/usr/local/etc/wine.sym
+  
+  [fonts]
 ***************
-*** 12,16 ****
-  Temp=c:\temp

-  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\

-! SymbolTableFile=./wine.sym

-  

-  [fonts]

---- 12,16 ----
-  Temp=c:\temp

-  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\

-! SymbolTableFile=/usr/local/etc/wine.sym

-  

-  [fonts]

+*** 48,58 ****
+  
+  [serialports]
+! Com1=/dev/cua0
+! Com2=/dev/cua1
+  Com3=/dev/modem,38400
+  Com4=/dev/modem
+  
+  [parallelports]
+! Lpt1=/dev/lp0
+  
+  [spy]
+--- 48,58 ----
+  
+  [serialports]
+! Com1=/dev/ttyd0
+! Com2=/dev/ttyd1
+  Com3=/dev/modem,38400
+  Com4=/dev/modem
+  
+  [parallelports]
+! Lpt1=/dev/lpt0
+  
+  [spy]
+*** files/drive.c~	Wed Jan 31 19:57:23 1996
+--- files/drive.c	Fri Feb  2 22:33:16 1996
 ***************
-*** 25,35 ****
-  

-  [serialports]

-! Com1=/dev/cua0

-! Com2=/dev/cua1

-  Com3=/dev/modem,38400

-  Com4=/dev/modem

-  

-  [parallelports]

-! Lpt1=/dev/lp0

-  

-  [spy]

---- 25,35 ----
-  

-  [serialports]

-! Com1=/dev/ttyd0

-! Com2=/dev/ttyd1

-  Com3=/dev/modem,38400

-  Com4=/dev/modem

-  

-  [parallelports]

-! Lpt1=/dev/lpt0

-  

-  [spy]

+*** 8,11 ****
+--- 8,12 ----
+  #include <string.h>
+  #include <stdlib.h>
++ #include <sys/types.h>
+  #include <sys/stat.h>
+  
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 7e5b4ed824ed..6d323353ecab 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Oct  6 23:43:28 MET 1995
 # Whom:			se
 #
-# $Id: Makefile,v 1.18 1995/12/16 12:50:24 se Exp $
+# $Id: Makefile,v 1.19 1996/01/16 14:44:36 se Exp $
 #
 
-DATE=		960114
+DATE=		960131
 DISTNAME=	Wine-${DATE}
-PKGNAME=	wine-96.01.14
+PKGNAME=	wine-96.01.31
 CATEGORIES+=	emulators x11
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/ \
 		ftp://aris.com/pub/linux/ALPHA/Wine/development/ \
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 1ed9c2427057..e7ae829f2c6f 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-951212.tar.gz) = dcce4398661036aad0e594316104229c
+MD5 (Wine-960131.tar.gz) = 47e546d3b5940fe48ef7cf168ae7ae76
diff --git a/emulators/wine/files/patch-ad b/emulators/wine/files/patch-ad
index def7c3a8cac4..98f8f49df9ee 100644
--- a/emulators/wine/files/patch-ad
+++ b/emulators/wine/files/patch-ad
@@ -1,53 +1,50 @@
-*** wine.ini~	Mon May 22 11:29:28 1995
---- wine.ini	Fri Oct  6 17:10:27 1995
+*** wine.ini~	Fri Feb  2 22:19:35 1996
+--- wine.ini	Fri Feb  2 22:21:27 1996
 ***************
-*** 3,7 ****
-  A=/mnt/fd0

-  C=/dos

-! D=/usr/windows

-  E=/home/bob/wine/work

-  F=/home/bob/test

---- 3,7 ----
-  A=/mnt/fd0

-  C=/dos

-! D=/usr/local/share/windows

-  E=/home/bob/wine/work

-  F=/home/bob/test

+*** 35,39 ****
+  Temp=e:\
+  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
+! SymbolTableFile=./wine.sym
+  
+  [fonts]
+--- 35,39 ----
+  Temp=e:\
+  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
+! SymbolTableFile=/usr/local/etc/wine.sym
+  
+  [fonts]
 ***************
-*** 12,16 ****
-  Temp=c:\temp

-  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\

-! SymbolTableFile=./wine.sym

-  

-  [fonts]

---- 12,16 ----
-  Temp=c:\temp

-  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\

-! SymbolTableFile=/usr/local/etc/wine.sym

-  

-  [fonts]

+*** 48,58 ****
+  
+  [serialports]
+! Com1=/dev/cua0
+! Com2=/dev/cua1
+  Com3=/dev/modem,38400
+  Com4=/dev/modem
+  
+  [parallelports]
+! Lpt1=/dev/lp0
+  
+  [spy]
+--- 48,58 ----
+  
+  [serialports]
+! Com1=/dev/ttyd0
+! Com2=/dev/ttyd1
+  Com3=/dev/modem,38400
+  Com4=/dev/modem
+  
+  [parallelports]
+! Lpt1=/dev/lpt0
+  
+  [spy]
+*** files/drive.c~	Wed Jan 31 19:57:23 1996
+--- files/drive.c	Fri Feb  2 22:33:16 1996
 ***************
-*** 25,35 ****
-  

-  [serialports]

-! Com1=/dev/cua0

-! Com2=/dev/cua1

-  Com3=/dev/modem,38400

-  Com4=/dev/modem

-  

-  [parallelports]

-! Lpt1=/dev/lp0

-  

-  [spy]

---- 25,35 ----
-  

-  [serialports]

-! Com1=/dev/ttyd0

-! Com2=/dev/ttyd1

-  Com3=/dev/modem,38400

-  Com4=/dev/modem

-  

-  [parallelports]

-! Lpt1=/dev/lpt0

-  

-  [spy]

+*** 8,11 ****
+--- 8,12 ----
+  #include <string.h>
+  #include <stdlib.h>
++ #include <sys/types.h>
+  #include <sys/stat.h>
+