aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorgerald <gerald@FreeBSD.org>2011-07-09 07:15:38 +0800
committergerald <gerald@FreeBSD.org>2011-07-09 07:15:38 +0800
commit0b377312eae8e464fe671166b606020a53f5c342 (patch)
treeec8869a2e7f8a8367a045b038e74112f6f94ba77 /emulators
parent263a96b2ae96073e7fd02c27c101aa32aab7beec (diff)
downloadfreebsd-ports-gnome-0b377312eae8e464fe671166b606020a53f5c342.tar.gz
freebsd-ports-gnome-0b377312eae8e464fe671166b606020a53f5c342.tar.zst
freebsd-ports-gnome-0b377312eae8e464fe671166b606020a53f5c342.zip
Update to Wine 1.3.23. This includes the following changes:
- Support for stubless COM proxies on x86-64. - Builtin dxdiag now outputs real information. - Monochrome bitmap format in the DIB engine. - Beginnings of a true shell Explorer builtin. - A number of new D3DX9 functions. - More support for Indic text shaping. - Various bug fixes. Also fix pkg-plist with respect to the USE_OPENAL option. Remove an obsolete (pre FreeBSD 7.x) post-patch target. [1] PR: 158406 Submitted by: David Naylor <naylor.b.david@gmail.com> Reported by: Alex Kozlov <spam@rm-rf.kiev.ua> [1]
Diffstat (limited to 'emulators')
-rw-r--r--emulators/wine-devel/Makefile11
-rw-r--r--emulators/wine-devel/distinfo4
-rw-r--r--emulators/wine-devel/pkg-plist6
-rw-r--r--emulators/wine/Makefile11
-rw-r--r--emulators/wine/distinfo4
-rw-r--r--emulators/wine/pkg-plist6
6 files changed, 20 insertions, 22 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 87e7e06a31ec..49f4a86831c3 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= wine
-DISTVERSION= 1.3.22
-PORTREVISION= 1
+DISTVERSION= 1.3.23
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
@@ -107,8 +106,10 @@ CONFIGURE_ARGS+= --without-xslt
.ifdef WITH_OPENAL
CONFIGURE_ARGS+= --with-openal
USE_OPENAL= yes
+PLIST_SUB= OPENAL=""
.else
CONFIGURE_ARGS+= --without-openal
+PLIST_SUB= OPENAL="@comment "
.endif
.ifdef WITH_WINEMAKER
@@ -119,12 +120,6 @@ RUN_DEPENDS+= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
IGNORE= lacks required sound support on FreeBSD before 8.0
.endif
-post-patch:
-.if ${OSVERSION} < 700041
- ${REINPLACE_CMD} 's/-lpthread/-lthr/g' ${WRKSRC}/configure
- ${REINPLACE_CMD} '/ac_hal_libs=/s/"$$/ -lthr"/' ${WRKSRC}/configure
-.endif
-
pre-build:
cd ${WRKSRC} && ${GMAKE} depend
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 43fee4a22600..2cc14df883ce 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wine-1.3.22.tar.bz2) = 87c05c140c7e316f9533f01e888952221880d047be33ca25b4a343c19aa9a586
-SIZE (wine-1.3.22.tar.bz2) = 19393697
+SHA256 (wine-1.3.23.tar.bz2) = 386c8939c5881b4625b045356a18ed7c7b20eab693f643e17185c96bac084792
+SIZE (wine-1.3.23.tar.bz2) = 19474860
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 2d5d2d01b7fa..af24ecb29446 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -255,8 +255,8 @@ include/wine/windows/dxerr9.h
include/wine/windows/dxfile.h
include/wine/windows/dxgi.h
include/wine/windows/dxgi.idl
+include/wine/windows/dxgiformat.h
include/wine/windows/dxgitype.h
-include/wine/windows/dxgitype.idl
include/wine/windows/dyngraph.idl
include/wine/windows/endpointvolume.h
include/wine/windows/endpointvolume.idl
@@ -1107,6 +1107,7 @@ lib/wine/fakedlls/olesvr.dll16
lib/wine/fakedlls/olesvr32.dll
lib/wine/fakedlls/olethk32.dll
lib/wine/fakedlls/oleview.exe
+%%OPENAL%%lib/wine/fakedlls/openal32.dll
lib/wine/fakedlls/opengl32.dll
lib/wine/fakedlls/pdh.dll
lib/wine/fakedlls/pidgen.dll
@@ -1205,6 +1206,7 @@ lib/wine/fakedlls/user32.dll
lib/wine/fakedlls/userenv.dll
lib/wine/fakedlls/usp10.dll
lib/wine/fakedlls/uxtheme.dll
+lib/wine/fakedlls/vbscript.dll
lib/wine/fakedlls/vcomp.dll
lib/wine/fakedlls/vdhcp.vxd
lib/wine/fakedlls/vdmdbg.dll
@@ -1598,6 +1600,7 @@ lib/wine/olesvr.dll16.so
lib/wine/olesvr32.dll.so
lib/wine/olethk32.dll.so
lib/wine/oleview.exe.so
+%%OPENAL%%lib/wine/openal32.dll.so
lib/wine/opengl32.dll.so
lib/wine/pdh.dll.so
lib/wine/pidgen.dll.so
@@ -1696,6 +1699,7 @@ lib/wine/user32.dll.so
lib/wine/userenv.dll.so
lib/wine/usp10.dll.so
lib/wine/uxtheme.dll.so
+lib/wine/vbscript.dll.so
lib/wine/vcomp.dll.so
lib/wine/vdhcp.vxd.so
lib/wine/vdmdbg.dll.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 87e7e06a31ec..49f4a86831c3 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= wine
-DISTVERSION= 1.3.22
-PORTREVISION= 1
+DISTVERSION= 1.3.23
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
@@ -107,8 +106,10 @@ CONFIGURE_ARGS+= --without-xslt
.ifdef WITH_OPENAL
CONFIGURE_ARGS+= --with-openal
USE_OPENAL= yes
+PLIST_SUB= OPENAL=""
.else
CONFIGURE_ARGS+= --without-openal
+PLIST_SUB= OPENAL="@comment "
.endif
.ifdef WITH_WINEMAKER
@@ -119,12 +120,6 @@ RUN_DEPENDS+= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
IGNORE= lacks required sound support on FreeBSD before 8.0
.endif
-post-patch:
-.if ${OSVERSION} < 700041
- ${REINPLACE_CMD} 's/-lpthread/-lthr/g' ${WRKSRC}/configure
- ${REINPLACE_CMD} '/ac_hal_libs=/s/"$$/ -lthr"/' ${WRKSRC}/configure
-.endif
-
pre-build:
cd ${WRKSRC} && ${GMAKE} depend
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 43fee4a22600..2cc14df883ce 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wine-1.3.22.tar.bz2) = 87c05c140c7e316f9533f01e888952221880d047be33ca25b4a343c19aa9a586
-SIZE (wine-1.3.22.tar.bz2) = 19393697
+SHA256 (wine-1.3.23.tar.bz2) = 386c8939c5881b4625b045356a18ed7c7b20eab693f643e17185c96bac084792
+SIZE (wine-1.3.23.tar.bz2) = 19474860
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 2d5d2d01b7fa..af24ecb29446 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -255,8 +255,8 @@ include/wine/windows/dxerr9.h
include/wine/windows/dxfile.h
include/wine/windows/dxgi.h
include/wine/windows/dxgi.idl
+include/wine/windows/dxgiformat.h
include/wine/windows/dxgitype.h
-include/wine/windows/dxgitype.idl
include/wine/windows/dyngraph.idl
include/wine/windows/endpointvolume.h
include/wine/windows/endpointvolume.idl
@@ -1107,6 +1107,7 @@ lib/wine/fakedlls/olesvr.dll16
lib/wine/fakedlls/olesvr32.dll
lib/wine/fakedlls/olethk32.dll
lib/wine/fakedlls/oleview.exe
+%%OPENAL%%lib/wine/fakedlls/openal32.dll
lib/wine/fakedlls/opengl32.dll
lib/wine/fakedlls/pdh.dll
lib/wine/fakedlls/pidgen.dll
@@ -1205,6 +1206,7 @@ lib/wine/fakedlls/user32.dll
lib/wine/fakedlls/userenv.dll
lib/wine/fakedlls/usp10.dll
lib/wine/fakedlls/uxtheme.dll
+lib/wine/fakedlls/vbscript.dll
lib/wine/fakedlls/vcomp.dll
lib/wine/fakedlls/vdhcp.vxd
lib/wine/fakedlls/vdmdbg.dll
@@ -1598,6 +1600,7 @@ lib/wine/olesvr.dll16.so
lib/wine/olesvr32.dll.so
lib/wine/olethk32.dll.so
lib/wine/oleview.exe.so
+%%OPENAL%%lib/wine/openal32.dll.so
lib/wine/opengl32.dll.so
lib/wine/pdh.dll.so
lib/wine/pidgen.dll.so
@@ -1696,6 +1699,7 @@ lib/wine/user32.dll.so
lib/wine/userenv.dll.so
lib/wine/usp10.dll.so
lib/wine/uxtheme.dll.so
+lib/wine/vbscript.dll.so
lib/wine/vcomp.dll.so
lib/wine/vdhcp.vxd.so
lib/wine/vdmdbg.dll.so