8 files changed, 86 insertions, 36 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 2588ada2afb0..f6655fedcd26 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-DISTVERSION=	1.1.17
+DISTVERSION=	1.1.18
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SFE \
@@ -48,8 +48,6 @@ OPTIONS=	CUPS	"Use CUPS (Common UNIX Printing System)"	On \
 		LDAP	"Use LDAP"					Off \
 		LIBXSLT	"Use libxslt (only used by msxml3.dll)"		Off
 
-IGNORE=		builds, but fails upon startup
-
 .include <bsd.port.pre.mk>
 
 .ifdef WITHOUT_CUPS
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 1a71be6df900..6370c0593d4e 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-1.1.17.tar.bz2) = ad73833f304e6c6e4d827989ff75db3d
-SHA256 (wine-1.1.17.tar.bz2) = 47962e6fc0d3ad46f33ee437a2c23d3876433ea98fd71efcce2c7f04f5224e79
-SIZE (wine-1.1.17.tar.bz2) = 15187387
+MD5 (wine-1.1.18.tar.bz2) = 86f72ab472b4f5d30961149831d0a0e1
+SHA256 (wine-1.1.18.tar.bz2) = 87e0afbce038d6cfd95d21fe824e97e7e88f5af6007a9d1bbad424160dfffc49
+SIZE (wine-1.1.18.tar.bz2) = 15184906
diff --git a/emulators/wine-devel/files/patch-partial-reservation b/emulators/wine-devel/files/patch-partial-reservation
new file mode 100644
index 000000000000..af9400870483
--- /dev/null
+++ b/emulators/wine-devel/files/patch-partial-reservation
@@ -0,0 +1,27 @@
+diff --git libs/wine/mmap.c libs/wine/mmap.c
+index d107fc7..a694e4f 100644
+--- libs/wine/mmap.c
++++ libs/wine/mmap.c
+@@ -344,9 +344,13 @@ void mmap_init(void)
+     struct reserved_area *area;
+     struct list *ptr;
+ #ifdef __i386__
++    char *user_space_limit = (char *)0x7ffe0000;
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++    reserve_malloc_space( 8 * 1024 * 1024 );
++    reserve_area( user_space_limit, (char *)0x82000000 );
++#else
+     char stack;
+     char * const stack_ptr = &stack;
+-    char *user_space_limit = (char *)0x7ffe0000;
+ 
+     reserve_malloc_space( 8 * 1024 * 1024 );
+ 
+@@ -377,6 +381,7 @@ void mmap_init(void)
+         reserve_area( base, end );
+     }
+     else reserve_area( user_space_limit, 0 );
++#endif
+ #endif /* __i386__ */
+ 
+     /* reserve the DOS area if not already done */
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 91f1ce483f4a..bed342ec72a0 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -580,7 +580,7 @@ lib/wine/atl.dll.so
 lib/wine/authz.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
-lib/wine/avifile.dll16
+lib/wine/avifile.dll16.so
 lib/wine/browseui.dll.so
 lib/wine/cabinet.dll.so
 lib/wine/cacls.exe.so
@@ -606,9 +606,9 @@ lib/wine/cryptdll.dll.so
 lib/wine/cryptnet.dll.so
 lib/wine/cryptui.dll.so
 lib/wine/ctapi32.dll.so
-lib/wine/ctl3d.dll16
+lib/wine/ctl3d.dll16.so
 lib/wine/ctl3d32.dll.so
-lib/wine/ctl3dv2.dll16
+lib/wine/ctl3dv2.dll16.so
 lib/wine/d3d10.dll.so
 lib/wine/d3d10core.dll.so
 lib/wine/d3d8.dll.so
@@ -692,7 +692,7 @@ lib/wine/iexplore.exe.so
 lib/wine/ifsmgr.vxd.so
 lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
-lib/wine/imm.dll16
+lib/wine/imm.dll16.so
 lib/wine/imm32.dll.so
 lib/wine/inetcomm.dll.so
 lib/wine/inetmib1.dll.so
@@ -954,7 +954,7 @@ lib/wine/qmgr.dll.so
 lib/wine/qmgrprxy.dll.so
 lib/wine/quartz.dll.so
 lib/wine/query.dll.so
-lib/wine/rasapi16.dll16
+lib/wine/rasapi16.dll16.so
 lib/wine/rasapi32.dll.so
 lib/wine/rasdlg.dll.so
 lib/wine/reg.exe.so
@@ -991,7 +991,7 @@ lib/wine/slbcsp.dll.so
 lib/wine/slc.dll.so
 lib/wine/snmpapi.dll.so
 lib/wine/softpub.dll.so
-lib/wine/sound.drv16
+lib/wine/sound.drv16.so
 lib/wine/spoolss.dll.so
 lib/wine/spoolsv.exe.so
 lib/wine/start.exe.so
@@ -1008,7 +1008,7 @@ lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
 lib/wine/toolhelp.dll16
 lib/wine/traffic.dll.so
-lib/wine/twain.dll16
+lib/wine/twain.dll16.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll16.so
 lib/wine/unicows.dll.so
@@ -1032,10 +1032,10 @@ lib/wine/vnetbios.vxd.so
 lib/wine/vtdapi.vxd.so
 lib/wine/vwin32.vxd.so
 lib/wine/w32skrnl.dll.so
-lib/wine/w32sys.dll16
-lib/wine/win32s16.dll16
+lib/wine/w32sys.dll16.so
+lib/wine/win32s16.dll16.so
 lib/wine/win87em.dll16.so
-lib/wine/winaspi.dll16
+lib/wine/winaspi.dll16.so
 lib/wine/windebug.dll16.so
 lib/wine/winealsa.drv.so
 lib/wine/wineaudioio.drv.so
@@ -1069,13 +1069,13 @@ lib/wine/winhlp32.exe.so
 lib/wine/winhttp.dll.so
 lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
-lib/wine/winnls.dll16
+lib/wine/winnls.dll16.so
 lib/wine/winnls32.dll.so
 lib/wine/winoldap.mod16.so
 lib/wine/winscard.dll.so
 lib/wine/winsock.dll16
 lib/wine/winspool.drv.so
-lib/wine/wintab.dll16
+lib/wine/wintab.dll16.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 2588ada2afb0..f6655fedcd26 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-DISTVERSION=	1.1.17
+DISTVERSION=	1.1.18
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SFE \
@@ -48,8 +48,6 @@ OPTIONS=	CUPS	"Use CUPS (Common UNIX Printing System)"	On \
 		LDAP	"Use LDAP"					Off \
 		LIBXSLT	"Use libxslt (only used by msxml3.dll)"		Off
 
-IGNORE=		builds, but fails upon startup
-
 .include <bsd.port.pre.mk>
 
 .ifdef WITHOUT_CUPS
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 1a71be6df900..6370c0593d4e 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-1.1.17.tar.bz2) = ad73833f304e6c6e4d827989ff75db3d
-SHA256 (wine-1.1.17.tar.bz2) = 47962e6fc0d3ad46f33ee437a2c23d3876433ea98fd71efcce2c7f04f5224e79
-SIZE (wine-1.1.17.tar.bz2) = 15187387
+MD5 (wine-1.1.18.tar.bz2) = 86f72ab472b4f5d30961149831d0a0e1
+SHA256 (wine-1.1.18.tar.bz2) = 87e0afbce038d6cfd95d21fe824e97e7e88f5af6007a9d1bbad424160dfffc49
+SIZE (wine-1.1.18.tar.bz2) = 15184906
diff --git a/emulators/wine/files/patch-partial-reservation b/emulators/wine/files/patch-partial-reservation
new file mode 100644
index 000000000000..af9400870483
--- /dev/null
+++ b/emulators/wine/files/patch-partial-reservation
@@ -0,0 +1,27 @@
+diff --git libs/wine/mmap.c libs/wine/mmap.c
+index d107fc7..a694e4f 100644
+--- libs/wine/mmap.c
++++ libs/wine/mmap.c
+@@ -344,9 +344,13 @@ void mmap_init(void)
+     struct reserved_area *area;
+     struct list *ptr;
+ #ifdef __i386__
++    char *user_space_limit = (char *)0x7ffe0000;
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++    reserve_malloc_space( 8 * 1024 * 1024 );
++    reserve_area( user_space_limit, (char *)0x82000000 );
++#else
+     char stack;
+     char * const stack_ptr = &stack;
+-    char *user_space_limit = (char *)0x7ffe0000;
+ 
+     reserve_malloc_space( 8 * 1024 * 1024 );
+ 
+@@ -377,6 +381,7 @@ void mmap_init(void)
+         reserve_area( base, end );
+     }
+     else reserve_area( user_space_limit, 0 );
++#endif
+ #endif /* __i386__ */
+ 
+     /* reserve the DOS area if not already done */
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 91f1ce483f4a..bed342ec72a0 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -580,7 +580,7 @@ lib/wine/atl.dll.so
 lib/wine/authz.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
-lib/wine/avifile.dll16
+lib/wine/avifile.dll16.so
 lib/wine/browseui.dll.so
 lib/wine/cabinet.dll.so
 lib/wine/cacls.exe.so
@@ -606,9 +606,9 @@ lib/wine/cryptdll.dll.so
 lib/wine/cryptnet.dll.so
 lib/wine/cryptui.dll.so
 lib/wine/ctapi32.dll.so
-lib/wine/ctl3d.dll16
+lib/wine/ctl3d.dll16.so
 lib/wine/ctl3d32.dll.so
-lib/wine/ctl3dv2.dll16
+lib/wine/ctl3dv2.dll16.so
 lib/wine/d3d10.dll.so
 lib/wine/d3d10core.dll.so
 lib/wine/d3d8.dll.so
@@ -692,7 +692,7 @@ lib/wine/iexplore.exe.so
 lib/wine/ifsmgr.vxd.so
 lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
-lib/wine/imm.dll16
+lib/wine/imm.dll16.so
 lib/wine/imm32.dll.so
 lib/wine/inetcomm.dll.so
 lib/wine/inetmib1.dll.so
@@ -954,7 +954,7 @@ lib/wine/qmgr.dll.so
 lib/wine/qmgrprxy.dll.so
 lib/wine/quartz.dll.so
 lib/wine/query.dll.so
-lib/wine/rasapi16.dll16
+lib/wine/rasapi16.dll16.so
 lib/wine/rasapi32.dll.so
 lib/wine/rasdlg.dll.so
 lib/wine/reg.exe.so
@@ -991,7 +991,7 @@ lib/wine/slbcsp.dll.so
 lib/wine/slc.dll.so
 lib/wine/snmpapi.dll.so
 lib/wine/softpub.dll.so
-lib/wine/sound.drv16
+lib/wine/sound.drv16.so
 lib/wine/spoolss.dll.so
 lib/wine/spoolsv.exe.so
 lib/wine/start.exe.so
@@ -1008,7 +1008,7 @@ lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
 lib/wine/toolhelp.dll16
 lib/wine/traffic.dll.so
-lib/wine/twain.dll16
+lib/wine/twain.dll16.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll16.so
 lib/wine/unicows.dll.so
@@ -1032,10 +1032,10 @@ lib/wine/vnetbios.vxd.so
 lib/wine/vtdapi.vxd.so
 lib/wine/vwin32.vxd.so
 lib/wine/w32skrnl.dll.so
-lib/wine/w32sys.dll16
-lib/wine/win32s16.dll16
+lib/wine/w32sys.dll16.so
+lib/wine/win32s16.dll16.so
 lib/wine/win87em.dll16.so
-lib/wine/winaspi.dll16
+lib/wine/winaspi.dll16.so
 lib/wine/windebug.dll16.so
 lib/wine/winealsa.drv.so
 lib/wine/wineaudioio.drv.so
@@ -1069,13 +1069,13 @@ lib/wine/winhlp32.exe.so
 lib/wine/winhttp.dll.so
 lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
-lib/wine/winnls.dll16
+lib/wine/winnls.dll16.so
 lib/wine/winnls32.dll.so
 lib/wine/winoldap.mod16.so
 lib/wine/winscard.dll.so
 lib/wine/winsock.dll16
 lib/wine/winspool.drv.so
-lib/wine/wintab.dll16
+lib/wine/wintab.dll16.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so