3 files changed, 71 insertions, 9 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index dcbc9f832ff5..70de3f3f7e4c 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	1.7.9
+DISTVERSION=	1.7.10
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -92,13 +92,13 @@ PORTDATA=	l_intl.nls wine.inf
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MX11}
-PORTDATA+=	fonts/
-.endif
-
 pre-build:
 	cd ${WRKSRC} && ${GMAKE} depend
 
+pre-install:
+	${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | ${GREP} ^@dirrm | \
+		${CUT} -f 2 -d ' ' | ${SORT} | ${XARGS} -R 1 -I % ${MKDIR} ${STAGEDIR}${PREFIX}/%
+
 post-install:
 	@${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \
 	          ${STAGEDIR}${WINELIBDIR}/libwine.so.1
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index d9cef24ab949..651b78b6c4dd 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wine-1.7.9.tar.bz2) = 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a
-SIZE (wine-1.7.9.tar.bz2) = 21323337
+SHA256 (wine-1.7.10.tar.bz2) = 44270e4b97ef930e4e4b59088e6e3972e91e85bacf9a9a4d8712a877c9d5cbdb
+SIZE (wine-1.7.10.tar.bz2) = 21312974
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 4986a15099f5..028d35c63ea7 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -157,6 +157,9 @@ include/wine/windows/ctxtcall.h
 include/wine/windows/ctxtcall.idl
 include/wine/windows/custcntl.h
 include/wine/windows/cvconst.h
+include/wine/windows/d2d1.h
+include/wine/windows/d2d1.idl
+include/wine/windows/d2dbasetypes.h
 include/wine/windows/d3d.h
 include/wine/windows/d3d10.h
 include/wine/windows/d3d10.idl
@@ -1269,7 +1272,7 @@ lib/wine/fakedlls/olesvr32.dll
 lib/wine/fakedlls/olethk32.dll
 lib/wine/fakedlls/oleview.exe
 %%OPENAL%%lib/wine/fakedlls/openal32.dll
-%%X11%%lib/wine/fakedlls/opengl32.dll
+lib/wine/fakedlls/opengl32.dll
 lib/wine/fakedlls/pdh.dll
 lib/wine/fakedlls/photometadatahandler.dll
 lib/wine/fakedlls/pidgen.dll
@@ -1356,6 +1359,7 @@ lib/wine/fakedlls/tapi32.dll
 lib/wine/fakedlls/taskkill.exe
 lib/wine/fakedlls/tasklist.exe
 lib/wine/fakedlls/taskmgr.exe
+lib/wine/fakedlls/taskschd.dll
 lib/wine/fakedlls/termsv.exe
 lib/wine/fakedlls/toolhelp.dll16
 lib/wine/fakedlls/traffic.dll
@@ -1812,7 +1816,7 @@ lib/wine/olesvr32.dll.so
 lib/wine/olethk32.dll.so
 lib/wine/oleview.exe.so
 %%OPENAL%%lib/wine/openal32.dll.so
-%%X11%%lib/wine/opengl32.dll.so
+lib/wine/opengl32.dll.so
 lib/wine/pdh.dll.so
 lib/wine/photometadatahandler.dll.so
 lib/wine/pidgen.dll.so
@@ -1899,6 +1903,7 @@ lib/wine/tapi32.dll.so
 lib/wine/taskkill.exe.so
 lib/wine/tasklist.exe.so
 lib/wine/taskmgr.exe.so
+lib/wine/taskschd.dll.so
 lib/wine/termsv.exe.so
 lib/wine/toolhelp.dll16.so
 lib/wine/traffic.dll.so
@@ -2046,7 +2051,64 @@ share/applications/wine.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.winedbg
 %%PORTDOCS%%%%DOCSDIR%%/README.winedump
+%%X11%%%%DATADIR%%/fonts/coue1255.fon
+%%X11%%%%DATADIR%%/fonts/coue1256.fon
+%%X11%%%%DATADIR%%/fonts/coue1257.fon
+%%X11%%%%DATADIR%%/fonts/coure.fon
+%%X11%%%%DATADIR%%/fonts/couree.fon
+%%X11%%%%DATADIR%%/fonts/coureg.fon
+%%X11%%%%DATADIR%%/fonts/courer.fon
+%%X11%%%%DATADIR%%/fonts/couret.fon
+%%X11%%%%DATADIR%%/fonts/cvgasys.fon
+%%X11%%%%DATADIR%%/fonts/hvgasys.fon
+%%X11%%%%DATADIR%%/fonts/jsmalle.fon
+%%X11%%%%DATADIR%%/fonts/jvgafix.fon
+%%X11%%%%DATADIR%%/fonts/jvgasys.fon
+%%X11%%%%DATADIR%%/fonts/marlett.ttf
+%%X11%%%%DATADIR%%/fonts/smae1255.fon
+%%X11%%%%DATADIR%%/fonts/smae1256.fon
+%%X11%%%%DATADIR%%/fonts/smae1257.fon
+%%X11%%%%DATADIR%%/fonts/smalle.fon
+%%X11%%%%DATADIR%%/fonts/smallee.fon
+%%X11%%%%DATADIR%%/fonts/smalleg.fon
+%%X11%%%%DATADIR%%/fonts/smaller.fon
+%%X11%%%%DATADIR%%/fonts/smallet.fon
+%%X11%%%%DATADIR%%/fonts/ssee1255.fon
+%%X11%%%%DATADIR%%/fonts/ssee1256.fon
+%%X11%%%%DATADIR%%/fonts/ssee1257.fon
+%%X11%%%%DATADIR%%/fonts/ssee874.fon
+%%X11%%%%DATADIR%%/fonts/ssef1255.fon
+%%X11%%%%DATADIR%%/fonts/ssef1256.fon
+%%X11%%%%DATADIR%%/fonts/ssef1257.fon
+%%X11%%%%DATADIR%%/fonts/ssef874.fon
+%%X11%%%%DATADIR%%/fonts/sserife.fon
+%%X11%%%%DATADIR%%/fonts/sserifee.fon
+%%X11%%%%DATADIR%%/fonts/sserifeg.fon
+%%X11%%%%DATADIR%%/fonts/sserifer.fon
+%%X11%%%%DATADIR%%/fonts/sserifet.fon
+%%X11%%%%DATADIR%%/fonts/sseriff.fon
+%%X11%%%%DATADIR%%/fonts/sseriffe.fon
+%%X11%%%%DATADIR%%/fonts/sseriffg.fon
+%%X11%%%%DATADIR%%/fonts/sseriffr.fon
+%%X11%%%%DATADIR%%/fonts/sserifft.fon
+%%X11%%%%DATADIR%%/fonts/svgasys.fon
+%%X11%%%%DATADIR%%/fonts/symbol.ttf
+%%X11%%%%DATADIR%%/fonts/tahoma.ttf
+%%X11%%%%DATADIR%%/fonts/tahomabd.ttf
+%%X11%%%%DATADIR%%/fonts/vgafix.fon
+%%X11%%%%DATADIR%%/fonts/vgas1255.fon
+%%X11%%%%DATADIR%%/fonts/vgas1256.fon
+%%X11%%%%DATADIR%%/fonts/vgas1257.fon
+%%X11%%%%DATADIR%%/fonts/vgas874.fon
+%%X11%%%%DATADIR%%/fonts/vgasys.fon
+%%X11%%%%DATADIR%%/fonts/vgasyse.fon
+%%X11%%%%DATADIR%%/fonts/vgasysg.fon
+%%X11%%%%DATADIR%%/fonts/vgasysr.fon
+%%X11%%%%DATADIR%%/fonts/vgasyst.fon
+%%X11%%%%DATADIR%%/fonts/wingding.ttf
+%%X11%%@dirrm %%DATADIR%%/fonts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry %%DATADIR%%
 @dirrmtry man/pl.UTF-8/man1
 @dirrmtry man/pl.UTF-8
 @dirrmtry man/fr.UTF-8/man1