Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Jul 1999 19:41:31 -0700 (PDT)
From:      jobaldwi@vt.edu
To:        freebsd-gnats-submit@freebsd.org
Subject:   ports/12750: [PATCH] Update emulators/wine port to wine-990704
Message-ID:  <19990722024131.844C614C48@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         12750
>Category:       ports
>Synopsis:       [PATCH] Update emulators/wine port to wine-990704
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 21 19:50:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     John Baldwin
>Release:        3.2-STABLE
>Organization:
>Environment:
n/a
>Description:
The patches below update the wine port to 990704.  Also, install a
configuration file to ${PREFIX}/etc/wine.conf.default so the user can
look for changes/additions to the default ini file easily.

Also note that wine-990704 will *not* work on FreeBSD 2.2.x, it
requires at least 3.0.
>How-To-Repeat:
The wine port is old
>Fix:
Remove the following patches under patches/:
patch-am
patch-an
patch-aw
patch-ar

Patch to Makefile:
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/emulators/wine/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- Makefile    1999/05/03 22:36:09     1.71
+++ Makefile    1999/07/22 02:31:57
@@ -6,9 +6,9 @@
 # $Id: Makefile,v 1.71 1999/05/03 22:36:09 se Exp $
 #
 
-DATE=          990426
+DATE=          990704
 DISTNAME=      Wine-${DATE}
-PKGNAME=       wine-99.04.26
+PKGNAME=       wine-99.07.04
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=    ALPHA/wine/development
@@ -30,11 +30,10 @@
                cd ${WRKSRC} && make depend
 
 do-install:
-       ${INSTALL} -c ${WRKSRC}/wine ${PREFIX}/bin
+       ${INSTALL_PROGRAM} -c ${WRKSRC}/wine ${PREFIX}/bin
        -@${MKDIR} ${PREFIX}/etc 2>/dev/null
-       [ -f ${PREFIX}/etc/wine.conf ] \
-               || ${CP} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
-       ${CP} ${WRKSRC}/wine.sym ${PREFIX}/etc
-       ${CP} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1
+       ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.default
+       ${INSTALL_DATA} ${WRKSRC}/wine.sym ${PREFIX}/etc
+       ${INSTALL_MAN} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.
1
 
 .include <bsd.port.mk>

Patch to files/md5:
Index: files/md5
===================================================================
RCS file: /usr/cvs/ports/emulators/wine/files/md5,v
retrieving revision 1.46
diff -u -r1.46 md5
--- md5 1999/05/03 22:36:11     1.46
+++ md5 1999/07/20 01:30:50
@@ -1 +1 @@
-MD5 (Wine-990426.tar.gz) = ddc5561393b7fedb02b933889658eb7f
+MD5 (Wine-990704.tar.gz) = ba1c1038cf0210a9cc86c1688b32344c

Patch to patches/patch-ad:
Index: patches/patch-ad
===================================================================
RCS file: /usr/cvs/ports/emulators/wine/patches/patch-ad,v
retrieving revision 1.5
diff -u -r1.5 patch-ad
--- patch-ad    1996/08/13 16:35:27     1.5
+++ patch-ad    1999/07/20 01:35:35
@@ -1,40 +1,48 @@
-*** wine.ini.orig      Wed Jul 17 22:00:24 1996
---- wine.ini   Mon Aug 12 19:51:38 1996
+*** wine.ini.orig      Mon May 17 11:03:47 1999
+--- wine.ini   Mon Jul 19 21:35:07 1999
 ***************
-*** 35,39 ****
+*** 52,58 ****
+  System=c:\windows\system
   Temp=e:\
   Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
 ! SymbolTableFile=./wine.sym
   
-  [options]
---- 35,39 ----
+  # <wineconf>
+  
+--- 52,58 ----
+  System=c:\windows\system
   Temp=e:\
   Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
 ! SymbolTableFile=/usr/local/etc/wine.sym
+  
+  # <wineconf>
   
-  [options]
 ***************
-*** 54,64 ****
+*** 105,117 ****
+  Default = -adobe-times-
   
   [serialports]
-! Com1=/dev/cua0
-! Com2=/dev/cua1
+! Com1=/dev/ttyS0
+! Com2=/dev/ttyS1
   Com3=/dev/modem,38400
   Com4=/dev/modem
   
   [parallelports]
 ! Lpt1=/dev/lp0
   
-  [spy]
---- 54,64 ----
+  [spooler]
+  LPT1:=|lpr
+--- 105,117 ----
+  Default = -adobe-times-
   
   [serialports]
-! Com1=/dev/ttyd0
-! Com2=/dev/ttyd1
+! Com1=/dev/cuaa0
+! Com2=/dev/cuaa1
   Com3=/dev/modem,38400
   Com4=/dev/modem
   
   [parallelports]
 ! Lpt1=/dev/lpt0
   
-  [spy]
+  [spooler]
+  LPT1:=|lpr

Patche to pkg/PLIST:
Index: pkg/PLIST
===================================================================
RCS file: /usr/cvs/ports/emulators/wine/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST       1998/08/17 09:43:16     1.3
+++ PLIST       1999/07/22 02:31:44
@@ -1,3 +1,3 @@
 bin/wine
-etc/wine.conf
+etc/wine.conf.default
 etc/wine.sym


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990722024131.844C614C48>