update to Wine-980628

1998-07-06 06:15:38 +00:00 · 1998-07-06 06:15:38 +00:00 · a97ffbfcd3
commit a97ffbfcd3
parent 290bc97b5e
5 changed files with 44 additions and 99 deletions
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@ -4,9 +4,9 @@
 # Whom:			todd@OpenBSD.org
 #

-DATE=		971116
+DATE=		980628
 DISTNAME=	Wine-${DATE}
-PKGNAME=	wine-97.11.16
+PKGNAME=	wine-98.06.28
 CATEGORIES=	emulators x11
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@ -20,7 +20,7 @@ OS_HAS_XPM=	2.3
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 .endif

-WRKSRC=		${WRKDIR}/wine${DATE}
+WRKSRC=		${WRKDIR}/wine-${DATE}
 GNU_CONFIGURE=	yes
 MAN1=		wine.1

--- a/emulators/wine/files/md5
+++ b/emulators/wine/files/md5
@ -1 +1 @@
-MD5 (Wine-971116.tar.gz) = 0fa11955b8ed44b20523a0be021681cc
+MD5 (Wine-980628.tar.gz) = b5020f7801d8436423323ca6af9a64af
--- a/emulators/wine/patches/patch-ad
+++ b/emulators/wine/patches/patch-ad
@ -1,40 +1,28 @@
-*** wine.ini.orig	Wed Jul 17 22:00:24 1996
--- wine.ini	Mon Aug 12 19:51:38 1996
-***************
-*** 35,39 ****
-  Temp=e:\
-  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
-! SymbolTableFile=./wine.sym
-  
-  [options]
--- 35,39 ----
-  Temp=e:\
-  Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
-! SymbolTableFile=/usr/local/etc/wine.sym
-  
-  [options]
-***************
-*** 54,64 ****
-  
-  [serialports]
-! Com1=/dev/cua0
-! Com2=/dev/cua1
-  Com3=/dev/modem,38400
-  Com4=/dev/modem
-  
-  [parallelports]
-! Lpt1=/dev/lp0
-  
-  [spy]
--- 54,64 ----
-  
-  [serialports]
-! Com1=/dev/cua00
-! Com2=/dev/cua01
-  Com3=/dev/modem,38400
-  Com4=/dev/modem
-  
-  [parallelports]
-! Lpt1=/dev/lpt0
-  
-  [spy]
+--- wine.ini.orig	Sat May 30 10:29:40 1998
+++ wine.ini	Wed Jun 24 23:39:29 1998
+@@ -44,7 +44,7 @@
+ System=c:\windows\system
+ Temp=e:\
+ Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
+-SymbolTableFile=./wine.sym
+SymbolTableFile=/usr/local/etc/wine.sym
+ 
+ [options]
+ AllocSystemColors=100
+@@ -55,13 +55,13 @@
+ Default = -adobe-times-
+ 
+ [serialports]
+-Com1=/dev/cua0
+-Com2=/dev/cua1
+Com1=/dev/cua00
+Com2=/dev/cua01
+ Com3=/dev/modem,38400
+ Com4=/dev/modem
+ 
+ [parallelports]
+-Lpt1=/dev/lp0
+Lpt1=/dev/lpt0
+ 
+ [spooler]
+ LPT1:=|lpr
--- a/emulators/wine/patches/patch-am
+++ b/emulators/wine/patches/patch-am
@ -1,36 +1,12 @@
-*** debugger/stabs.c~	Sun Dec 22 21:42:50 1996
--- debugger/stabs.c	Mon Dec 23 01:29:26 1996
-***************
-*** 5,8 ****
--- 5,9 ----
-   */
-  
-+ #include <sys/types.h>
-  #include <sys/mman.h>
-  #include <fcntl.h>
-*** windows/dialog.c~	Mon Jan 20 23:59:13 1997
--- windows/dialog.c	Mon Jan 20 23:59:42 1997
-***************
-*** 10,13 ****
--- 10,16 ----
-  #include <stdio.h>
-  #include <string.h>
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
-+ #include <sys/errno.h>
-+ #endif
-  #include "windows.h"
-  #include "dialog.h"
-*** multimedia/midi.c~	Mon May 26 14:13:17 1997
--- multimedia/midi.c	Mon May 26 14:11:25 1997
-***************
-*** 9,13 ****
--- 9,17 ----
-  #include <unistd.h>
-  #include <fcntl.h>
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
-+ #include <string.h>
-+ #include <sys/errno.h>
-+ #endif
-  #include <sys/ioctl.h>
-  #include "windows.h"
-  #include "ldt.h"
+--- multimedia/midi.c.orig	Sat Jun 13 07:31:15 1998
+++ multimedia/midi.c	Thu Jun 25 19:49:07 1998
+@@ -10,6 +10,9 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <sys/errno.h>
+#endif
+ #include "windows.h"
+ #include "ldt.h"
+ #include "multimedia.h"
--- a/emulators/wine/patches/patch-an
+++ b/emulators/wine/patches/patch-an
@ -1,19 +0,0 @@
-*** memory/selector.c.orig	Thu Jan  2 01:19:12 1997
--- memory/selector.c	Thu Jan  2 01:40:25 1997
-***************
-*** 14,18 ****
--- 14,27 ----
-  
-  
-+ #ifdef __FreeBSD__
-+ #include <osreldate.h>
-+ #if __FreeBSD_version < 220000
-+ #define FIRST_LDT_ENTRY_TO_ALLOC  17
-+ #else
-  #define FIRST_LDT_ENTRY_TO_ALLOC  17
-+ #endif
-+ #else
-+ #define FIRST_LDT_ENTRY_TO_ALLOC  6
-+ #endif
-  
-