ports/153434: Update wine to 1.3.10

[Rusty Nejdl]

>Number:         153434
>Category:       ports
>Synopsis:       Update wine to 1.3.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 24 22:40:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rusty Nejdl
>Release:        FreeBSD 8.2-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD tethys.ringofsaturn.com 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #4: Fri Dec 24 11:10:16 CST 2010 root at tethys.ringofsaturn.com:/usr/obj/usr/src/sys/SATURN amd64


	
>Description:
	This patch updates the wine port to 1.3.10
>How-To-Repeat:
	
>Fix:

	

--- wine.diff begins here ---
diff -ruN wine/Makefile wine-new/Makefile
--- wine/Makefile	2010-11-14 09:38:32.000000000 -0600
+++ wine-new/Makefile	2010-12-24 15:43:38.000000000 -0600
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-DISTVERSION=	1.3.7
-PORTEPOCH=	1
+DISTVERSION=	1.3.10
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
 		http://ibiblio.org/pub/linux/system/emulators/wine/
diff -ruN wine/distinfo wine-new/distinfo
--- wine/distinfo	2010-11-14 09:38:32.000000000 -0600
+++ wine-new/distinfo	2010-12-24 15:44:05.000000000 -0600
@@ -1,2 +1,2 @@
-SHA256 (wine-1.3.7.tar.bz2) = 13cf54ec8b83d49abd6888b543ab359661d70af9df3e30ab70d7e54b6b5cd025
-SIZE (wine-1.3.7.tar.bz2) = 18379692
+SHA256 (wine-1.3.10.tar.bz2) = f7a2c0565ba7fd765f9498cf023ffb75c96caa999ae25ae16416eb09899b5038
+SIZE (wine-1.3.10.tar.bz2) = 18366433
diff -ruN wine/files/patch-partial-reservation wine-new/files/patch-partial-reservation
--- wine/files/patch-partial-reservation	2010-09-18 10:34:11.000000000 -0500
+++ wine-new/files/patch-partial-reservation	2010-12-24 16:25:09.000000000 -0600
@@ -1,12 +1,13 @@
 --- libs/wine/mmap.c
 +++ libs/wine/mmap.c
-@@ -383,6 +383,9 @@ void mmap_init(void)
+@@ -380,6 +380,9 @@
          reserve_area( base, end );
      }
      else reserve_area( user_space_limit, 0 );
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++    #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 +    wine_mmap_remove_reserved_area( (char *)0x82000000, 0xffffffff - 0x82000000, 1 );
-+#endif
- #endif /* __i386__ */
- 
++    #endif
+
      /* reserve the DOS area if not already done */
+ 
+     ptr = list_head( &reserved_areas );
--- wine.diff ends here ---


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