3 files changed, 48 insertions, 24 deletions

diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index 866937d00cbe..bce0327cfa19 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.7.47
+PORTVERSION=	1.7.48
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION}
diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo
index 9ed8cb7fa4fc..f9ba239f019b 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,16 +1,16 @@
-SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.47,1.txz) = 569ab9342b3796c060b6ae51e409d1261e84fa885f706ebba6f0f3555ae61527
-SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.47,1.txz) = 49571704
-SHA256 (freebsd:8:x86:64/i386-wine-staging-1.7.47,1.txz) = 9f5df1871b999aebcb757469d3c99bd881733774306e9c1c1edf71403f21ed66
-SIZE (freebsd:8:x86:64/i386-wine-staging-1.7.47,1.txz) = 52589596
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.47,1.txz) = c74af0fa9d254b60ded94d1bac08dad56137cd31f2017e6dfb2027ee9b154898
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.47,1.txz) = 48121520
-SHA256 (freebsd:9:x86:64/i386-wine-staging-1.7.47,1.txz) = b632a649d5768513a86ebd6c5872068c5bafcef10b4745b5f5fcecf2da475248
-SIZE (freebsd:9:x86:64/i386-wine-staging-1.7.47,1.txz) = 51173680
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.47,1.txz) = 386f7e0fd6cc3ee782cc634f5aea9080c90bcc51b36a3a1f2f50bc3bcbc54281
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.47,1.txz) = 33979292
-SHA256 (freebsd:10:x86:64/i386-wine-staging-1.7.47,1.txz) = 6e446f64340b80cd616a603cf521e9cd963a0b26115599d396f22d5d613aad11
-SIZE (freebsd:10:x86:64/i386-wine-staging-1.7.47,1.txz) = 36987872
-SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.47,1.txz) = 92b4a616ff3ea96ba9d83f15778214332ab5803df65718f68fe505098f86b63c
-SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.47,1.txz) = 37421948
-SHA256 (freebsd:11:x86:64/i386-wine-staging-1.7.47,1.txz) = 5c63904f2b2504ce9cf81fa76cb631b4ec2fb7ee6e7c539d53b4efdccac2fafd
-SIZE (freebsd:11:x86:64/i386-wine-staging-1.7.47,1.txz) = 39565496
+SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.48,1.txz) = 87e4c57d9bf2e60cbe87b9c7ad3abb270faf659fe0bc5e0efa7889cb79bce7ed
+SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.48,1.txz) = 49605628
+SHA256 (freebsd:8:x86:64/i386-wine-staging-1.7.48,1.txz) = 1370400ee015e6ada394dcc38a0d1ab281d94bd6155074dfa24cbc8b90ee1d3e
+SIZE (freebsd:8:x86:64/i386-wine-staging-1.7.48,1.txz) = 52559872
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.48,1.txz) = bb8a78ea5ea51b8720d0c704f8b1d97491792559551a49e2868925e278ede282
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.48,1.txz) = 48141348
+SHA256 (freebsd:9:x86:64/i386-wine-staging-1.7.48,1.txz) = eea02ba3f44aa785b7875f32fc28f15533e1ae38e54f90865a7e75c84f2e3bb9
+SIZE (freebsd:9:x86:64/i386-wine-staging-1.7.48,1.txz) = 51220864
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.48,1.txz) = 1585c5e1f777ebce3f5f56098b1d246655719ea16e3c5ff8072569e42cb828c5
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.48,1.txz) = 34053520
+SHA256 (freebsd:10:x86:64/i386-wine-staging-1.7.48,1.txz) = c6663a01edd9a474b7c56d269d17d0155b62096737672c1de3b910ca9a1ee8ba
+SIZE (freebsd:10:x86:64/i386-wine-staging-1.7.48,1.txz) = 37097820
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.48,1.txz) = 14e763906f85ec690c7b030a8d4660d7b03e5ab04f0b2618a4af8bda3e191e9f
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.48,1.txz) = 37549336
+SHA256 (freebsd:11:x86:64/i386-wine-staging-1.7.48,1.txz) = 7b145cfe25a6d2fa48a74c005bccd4671a67cc3cd9fcd153eaf5d5bbdc536c7b
+SIZE (freebsd:11:x86:64/i386-wine-staging-1.7.48,1.txz) = 39684580
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index 4d742b7de0e3..11ab673ca5ab 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -230,6 +230,14 @@ include/wine/windows/d3drmobj.h
 include/wine/windows/d3drmwin.h
 include/wine/windows/d3dtypes.h
 include/wine/windows/d3dvec.inl
+%%OSREL8-STAGING%%include/wine/windows/d3dx10core.h
+%%OSREL9-STAGING%%include/wine/windows/d3dx10core.h
+%%OSREL10-STAGING%%include/wine/windows/d3dx10core.h
+%%OSREL11-STAGING%%include/wine/windows/d3dx10core.h
+%%OSREL8-STAGING%%include/wine/windows/d3dx10core.idl
+%%OSREL9-STAGING%%include/wine/windows/d3dx10core.idl
+%%OSREL10-STAGING%%include/wine/windows/d3dx10core.idl
+%%OSREL11-STAGING%%include/wine/windows/d3dx10core.idl
 include/wine/windows/d3dx9.h
 include/wine/windows/d3dx9anim.h
 include/wine/windows/d3dx9core.h
@@ -241,6 +249,7 @@ include/wine/windows/d3dx9shader.h
 include/wine/windows/d3dx9shape.h
 include/wine/windows/d3dx9tex.h
 include/wine/windows/d3dx9xof.h
+include/wine/windows/davclnt.h
 include/wine/windows/dbccmd.idl
 include/wine/windows/dbcses.idl
 include/wine/windows/dbdsad.idl
@@ -380,6 +389,10 @@ include/wine/windows/gameux.idl
 include/wine/windows/gdiplus.h
 include/wine/windows/gdipluscolor.h
 include/wine/windows/gdipluscolormatrix.h
+%%OSREL8-STAGING%%include/wine/windows/gdipluseffects.h
+%%OSREL9-STAGING%%include/wine/windows/gdipluseffects.h
+%%OSREL10-STAGING%%include/wine/windows/gdipluseffects.h
+%%OSREL11-STAGING%%include/wine/windows/gdipluseffects.h
 include/wine/windows/gdiplusenums.h
 include/wine/windows/gdiplusflat.h
 include/wine/windows/gdiplusgpstubs.h
@@ -433,6 +446,8 @@ include/wine/windows/inputscope.h
 include/wine/windows/inputscope.idl
 include/wine/windows/inseng.h
 include/wine/windows/inseng.idl
+include/wine/windows/inspectable.h
+include/wine/windows/inspectable.idl
 include/wine/windows/intshcut.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
@@ -550,6 +565,7 @@ include/wine/windows/netcon.h
 include/wine/windows/netcon.idl
 include/wine/windows/netfw.h
 include/wine/windows/netfw.idl
+include/wine/windows/netioapi.h
 include/wine/windows/netlistmgr.h
 include/wine/windows/netlistmgr.idl
 include/wine/windows/nldef.h
@@ -775,6 +791,7 @@ include/wine/windows/wbemdisp.h
 include/wine/windows/wbemdisp.idl
 include/wine/windows/wbemprov.h
 include/wine/windows/wbemprov.idl
+include/wine/windows/webservices.h
 include/wine/windows/werapi.h
 include/wine/windows/wfext.h
 include/wine/windows/wia.h
@@ -900,6 +917,8 @@ lib32/libXxf86vm.so.1
 lib32/libdrm.so.2
 lib32/libdrm_intel.so.1
 lib32/libdrm_radeon.so.1
+%%OSREL10%%lib32/libedit.so.0
+%%OSREL11%%lib32/libedit.so.0
 lib32/libexpat.so.1
 %%OSREL8-STAGING%%lib32/libffi.so.6
 %%OSREL9-STAGING%%lib32/libffi.so.6
@@ -2089,10 +2108,6 @@ lib32/wine/libuserenv.def
 lib32/wine/libusp10.def
 lib32/wine/libuuid.a
 lib32/wine/libuxtheme.def
-%%OSREL8-STAGING%%lib32/wine/libvcomp.def
-%%OSREL9-STAGING%%lib32/wine/libvcomp.def
-%%OSREL10-STAGING%%lib32/wine/libvcomp.def
-%%OSREL11-STAGING%%lib32/wine/libvcomp.def
 lib32/wine/libvdmdbg.def
 lib32/wine/libversion.def
 lib32/wine/libwebservices.def
@@ -2600,6 +2615,15 @@ share/wine/fonts/vgasysg.fon
 share/wine/fonts/vgasysr.fon
 share/wine/fonts/vgasyst.fon
 share/wine/fonts/wingding.ttf
-share/wine/l_intl.nls
-share/wine/patch-nvidia.sh
-share/wine/wine.inf
+%%OSREL8-DEVEL%%share/wine/l_intl.nls
+%%OSREL9%%share/wine/l_intl.nls
+%%OSREL10%%share/wine/l_intl.nls
+%%OSREL11%%share/wine/l_intl.nls
+%%OSREL8-DEVEL%%share/wine/patch-nvidia.sh
+%%OSREL9%%share/wine/patch-nvidia.sh
+%%OSREL10%%share/wine/patch-nvidia.sh
+%%OSREL11%%share/wine/patch-nvidia.sh
+%%OSREL8-DEVEL%%share/wine/wine.inf
+%%OSREL9%%share/wine/wine.inf
+%%OSREL10%%share/wine/wine.inf
+%%OSREL11%%share/wine/wine.inf