Date: Mon, 2 Dec 2013 16:49:37 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335510 - in head/emulators: i386-wine i386-wine-devel i386-wine/files wine wine-devel Message-ID: <201312021649.rB2Gnbf7071415@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Mon Dec 2 16:49:37 2013 New Revision: 335510 URL: http://svnweb.freebsd.org/changeset/ports/335510 Log: Update emulators/i386-wine to 1.6.1. Changes: * Backport changes from emulators/i386-wine-devel * Fix CONFLICTS_INSTALL [1] Approved by: gerald [1] Modified: head/emulators/i386-wine-devel/Makefile.i386 head/emulators/i386-wine-devel/Makefile.inc head/emulators/i386-wine/Makefile head/emulators/i386-wine/Makefile.i386 head/emulators/i386-wine/Makefile.inc head/emulators/i386-wine/distinfo head/emulators/i386-wine/files/nvidia.sh head/emulators/i386-wine/pkg-plist head/emulators/wine-devel/Makefile head/emulators/wine/Makefile Modified: head/emulators/i386-wine-devel/Makefile.i386 ============================================================================== --- head/emulators/i386-wine-devel/Makefile.i386 Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/i386-wine-devel/Makefile.i386 Mon Dec 2 16:49:37 2013 (r335510) @@ -13,7 +13,7 @@ PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= dri>0:${PORTSDIR}/graphics/dri -CONFLICTS_INSTALL= i386-wine-1.4* i386-wine-1.6* wine-[0-9]* +CONFLICTS_INSTALL= i386-wine-[0-9]* wine-[0-9]* wine-devel-[0-9]* ACTUAL-PACKAGE-DEPENDS= ${DO_NADA} WINELIBDIR= ${PREFIX}/lib32 Modified: head/emulators/i386-wine-devel/Makefile.inc ============================================================================== --- head/emulators/i386-wine-devel/Makefile.inc Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/i386-wine-devel/Makefile.inc Mon Dec 2 16:49:37 2013 (r335510) @@ -23,7 +23,7 @@ OPTIONS_DEFINE= GECKO MONO GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine -CONFLICTS_INSTALL= i386-wine-1.4* i386-wine-1.6* wine-[0-9]* +CONFLICTS_INSTALL= i386-wine-[0-9]* wine-[0-9]* wine-devel-[0-9]* EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ Modified: head/emulators/i386-wine/Makefile ============================================================================== --- head/emulators/i386-wine/Makefile Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/i386-wine/Makefile Mon Dec 2 16:49:37 2013 (r335510) @@ -1,7 +1,6 @@ # Created by: David Naylor (dbn@FreeBSD.org) # $FreeBSD$ -NO_STAGE= yes # Special bootstrapper to allow: # - i386 specific port to be slave to ${PORTSDIR}/emulators/wine # - amd64 specific port to be normal port (based on binary package) Modified: head/emulators/i386-wine/Makefile.i386 ============================================================================== --- head/emulators/i386-wine/Makefile.i386 Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/i386-wine/Makefile.i386 Mon Dec 2 16:49:37 2013 (r335510) @@ -13,8 +13,7 @@ PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= dri>0:${PORTSDIR}/graphics/dri -CONFLICTS_INSTALL= i386-wine-1.5* i396-wine-1.7* wine-[0-9]* -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} +CONFLICTS_INSTALL= i386-wine-devel-[0-9]* wine-[0-9]* wine-devel-[0-9]* ACTUAL-PACKAGE-DEPENDS= ${DO_NADA} WINELIBDIR= ${PREFIX}/lib32 @@ -28,39 +27,39 @@ USE_LDCONFIG32= ${WINELIBDIR} ${WINELIBD # under FreeBSD/amd64 post-install-script: # Install bounce script to access the 32bit executables - ${INSTALL_SCRIPT} ${.CURDIR}/files/binbounce ${PREFIX}/bin/wine + ${INSTALL_SCRIPT} ${.CURDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine for i in `grep ^bin ${TMPPLIST} | xargs -n1 basename` ; do \ - [ "$${i}" = "wine" ] || ${LN} -f ${PREFIX}/bin/wine ${PREFIX}/bin/$${i} ; \ + [ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \ echo bin32/$${i} >> ${TMPPLIST} ; \ done # Install dri libraries (internal libGL requirements) - ${MKDIR} ${PREFIX}/lib32/.libGL/dri + ${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri for i in ${LOCALBASE}/lib/dri/*.so; do \ - ${INSTALL_DATA} $${i} ${PREFIX}/lib32/.libGL/dri/ ; \ + ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri/ ; \ echo lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ done # Find all libraries that are linked too (via ldd(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${PREFIX}/!g" | \ + grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ xargs -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \ - env LD_LIBRARY_PATH=${PREFIX}/lib32:${LD_LIBRARY_PATH} xargs ldd -f '%p\n' \ - | sort -u | grep -v '^\(/usr\)\?/lib' | grep -v "^${PREFIX}/lib32/libwine.so" \ - | grep -v "^${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs + env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} xargs ldd -f '%p\n' \ + | sort -u | grep -v '^\(/usr\)\?/lib' | grep -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ + | grep -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs for i in `cat ${WRKDIR}/winelibs` ; do \ if [ `basename $${i}` != libGL.so.1 ]; then \ - ${INSTALL_DATA} $${i} ${PREFIX}/lib32/ ; \ + ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ echo lib32/$${i##*/} >> ${TMPPLIST} ; \ else \ - ${INSTALL_DATA} $${i} ${PREFIX}/lib32/.libGL/ ; \ + ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/ ; \ echo lib32/.libGL/libGL.so.1 >> ${TMPPLIST} ; \ fi ; \ done # Find all soft dependancies (via strings(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${PREFIX}/!g" | \ + grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ xargs -n1 file -F' ' | grep ELF | cut -f1 -d' ' | xargs strings | \ grep '^lib.*\.so' | sort -u > ${WRKDIR}/winesoftlibs for i in `cat ${WRKDIR}/winesoftlibs` ; do \ if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`grep $${i} ${TMPPLIST}`" ] ; then \ - ${INSTALL_DATA} ${LOCALBASE}/lib/$${i} ${PREFIX}/lib32/ ; \ + ${INSTALL_DATA} ${LOCALBASE}/lib/$${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ echo lib32/$${i} >> ${TMPPLIST} ; \ fi ; \ done @@ -73,17 +72,14 @@ post-install-script: fi echo '@dirrm bin32' >> ${TMPPLIST} # Install nvidia patching script - ${INSTALL_SCRIPT} ${.CURDIR}/files/nvidia.sh ${DATADIR}/patch-nvidia.sh + ${INSTALL_SCRIPT} ${.CURDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh echo ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} - @${ECHO} - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} post-package-script: if [ -n "${WITH_PKGNG}" -a -z "${PACKAGE_BUILDING}" ]; then \ ${XZ_CMD} -dc ${PKGFILE} | \ - ${SED} -e "s/^\(arch: freebsd:.*:x86\):32/\1:64/" | \ + ${SED} -e 's/\(freebsd:.*:x86\):32/\1:64/' -e 's/\(freebsd:.*:x86\):32/\1:64/' | \ ${XZ_CMD} > ${WRKDIR}/${PKGNAME}${PKG_SUFX}; \ ${MV} ${WRKDIR}/${PKGNAME}${PKG_SUFX} ${PKGFILE}; \ fi Modified: head/emulators/i386-wine/Makefile.inc ============================================================================== --- head/emulators/i386-wine/Makefile.inc Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/i386-wine/Makefile.inc Mon Dec 2 16:49:37 2013 (r335510) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= wine -PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTVERSION= 1.6.1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION} @@ -23,12 +22,12 @@ OPTIONS_DEFINE= GECKO MONO GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine -CONFLICTS_INSTALL= i386-wine-1.5* i386-wine-1.7* wine-[0-9]* -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} +CONFLICTS_INSTALL= i386-wine-devel-[0-9]* wine-[0-9]* wine-devel-[0-9]* EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ - --exclude libdata/ldconfig32/${LATEST_LINK} + --exclude libdata/ldconfig32/${UNIQUENAME} \ + -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= wine only runs on x86 architecture @@ -43,6 +42,7 @@ USE_XZ= yes .if !(${OSVERSION} >= 803000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) IGNORE= binaries compiled for FreeBSD 8.3+ and 9.1+ only +DISTFILES= .endif .if ${PORT_OPTIONS:MGECKO} @@ -53,10 +53,6 @@ RUN_DEPENDS+= ${DATADIR}/gecko/wine_ge RUN_DEPENDS+= ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono .endif -.if ${PREFIX} != /usr/local -EXTRACT_AFTER_ARGS+= -s '|/usr/local|${PREFIX}|gs' -.endif - do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @@ -64,15 +60,21 @@ do-extract: do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} - @${ECHO} - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} pkg-plist: extract ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$' | ${SED} 's|/usr/local/||g' | sort > ${WRKDIR}/pkg-plist ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} '/$$' | ${SED} 's|/usr/local/\(.*\)/$$|@dirrm \1|g' | sort -r >> ${WRKDIR}/pkg-plist - ${REINPLACE_CMD} -e 's|@dirrm share/applications|@dirrmtry share/applications|' -e 's|/$$||g' ${WRKDIR}/pkg-plist ${MV} ${WRKDIR}/pkg-plist ${PLIST} +port-update: + ${RM} -f ${.CURDIR}/distinfo ${.CURDIR}/distinfo~ +.for osrel in 8 9 + ${MAKE} fetch OSREL=${osrel} + ${MAKE} makesum OSREL=${osrel} + ${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~ + ${RM} ${.CURDIR}/distinfo +.endfor + ${MV} ${.CURDIR}/distinfo~ ${.CURDIR}/distinfo + ${MAKE} pkg-plist + .include <bsd.port.post.mk> Modified: head/emulators/i386-wine/distinfo ============================================================================== --- head/emulators/i386-wine/distinfo Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/i386-wine/distinfo Mon Dec 2 16:49:37 2013 (r335510) @@ -1,4 +1,4 @@ -SHA256 (freebsd:8:x86:64/i386-wine-1.4.1_2,1.txz) = c7a0949b3604959887f01284f9d712b5e50c18721096562bd328f326f9606384 -SIZE (freebsd:8:x86:64/i386-wine-1.4.1_2,1.txz) = 20783528 -SHA256 (freebsd:9:x86:64/i386-wine-1.4.1_2,1.txz) = 2f1eb019f7dcdccb97d7808b73113db3d42d075ea11c99a47857f08c8b497182 -SIZE (freebsd:9:x86:64/i386-wine-1.4.1_2,1.txz) = 20744032 +SHA256 (freebsd:8:x86:64/i386-wine-1.6.1,1.txz) = 2e074eb622398f6a945dfe1c8142eeefddb5dd252b96e58758305d0bfbb77c31 +SIZE (freebsd:8:x86:64/i386-wine-1.6.1,1.txz) = 22806912 +SHA256 (freebsd:9:x86:64/i386-wine-1.6.1,1.txz) = dc2acfc443c155e1f3a87ae06a03f859c749c82944d3a42658f5c54c54d92a83 +SIZE (freebsd:9:x86:64/i386-wine-1.6.1,1.txz) = 22967420 Modified: head/emulators/i386-wine/files/nvidia.sh ============================================================================== --- head/emulators/i386-wine/files/nvidia.sh Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/i386-wine/files/nvidia.sh Mon Dec 2 16:49:37 2013 (r335510) @@ -61,6 +61,8 @@ # Version 1.11 - 2013/05/26 # - install libGL.so.1 to ${PREFIX}/lib32/.nvidia and link to it # - add deinstall option +# Version 1.12 - 2013/11/03 +# - add detection for i386-wine-devel set -e @@ -84,7 +86,7 @@ terminate() { } -args=`getopt -dn $*` +args=`getopt dn $*` if [ $? -ne 0 ] then echo "Usage: $0 [-n]" @@ -145,7 +147,7 @@ echo "===> Patching i386-wine to work wi if [ -z "${WINE}" ] then - WINE=`version i386-wine` + WINE=`version i386-wine; version i386-wine-devel` fi [ -n "$WINE" ] \ || terminate 255 "Unable to detect i386-wine, please install first" Modified: head/emulators/i386-wine/pkg-plist ============================================================================== --- head/emulators/i386-wine/pkg-plist Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/i386-wine/pkg-plist Mon Dec 2 16:49:37 2013 (r335510) @@ -109,13 +109,16 @@ include/wine/windows/amstream.h include/wine/windows/amstream.idl include/wine/windows/amvideo.h include/wine/windows/amvideo.idl +include/wine/windows/appcompatapi.h include/wine/windows/appmgmt.h include/wine/windows/asptlb.h include/wine/windows/asptlb.idl include/wine/windows/asynot.idl include/wine/windows/asysta.idl +include/wine/windows/atlbase.h include/wine/windows/atliface.h include/wine/windows/atliface.idl +include/wine/windows/atlwin.h include/wine/windows/audevcod.h include/wine/windows/audioclient.h include/wine/windows/audioclient.idl @@ -220,6 +223,7 @@ include/wine/windows/dbs.idl include/wine/windows/dbt.h include/wine/windows/dciddi.h include/wine/windows/dciman.h +include/wine/windows/dcommon.h include/wine/windows/dde.h include/wine/windows/dde.rh include/wine/windows/ddeml.h @@ -249,6 +253,7 @@ include/wine/windows/devicetopology.h include/wine/windows/devicetopology.idl include/wine/windows/devpkey.h include/wine/windows/devpropdef.h +include/wine/windows/difxapi.h include/wine/windows/digitalv.h include/wine/windows/dimm.h include/wine/windows/dimm.idl @@ -262,6 +267,7 @@ include/wine/windows/dls1.h include/wine/windows/dls2.h include/wine/windows/dmdls.h include/wine/windows/dmerror.h +include/wine/windows/dmksctrl.h include/wine/windows/dmo.h include/wine/windows/dmoreg.h include/wine/windows/dmort.h @@ -290,6 +296,10 @@ include/wine/windows/dsound.h include/wine/windows/dsrole.h include/wine/windows/dvdmedia.h include/wine/windows/dwmapi.h +include/wine/windows/dwrite.h +include/wine/windows/dwrite.idl +include/wine/windows/dwrite_1.h +include/wine/windows/dwrite_1.idl include/wine/windows/dxdiag.h include/wine/windows/dxerr8.h include/wine/windows/dxerr9.h @@ -440,6 +450,8 @@ include/wine/windows/msctf.idl include/wine/windows/msdadc.h include/wine/windows/msdadc.idl include/wine/windows/msdaguid.h +include/wine/windows/msdasc.h +include/wine/windows/msdasc.idl include/wine/windows/mshtmcid.h include/wine/windows/mshtmdid.h include/wine/windows/mshtmhst.h @@ -448,6 +460,8 @@ include/wine/windows/mshtml.h include/wine/windows/mshtml.idl include/wine/windows/msi.h include/wine/windows/msidefs.h +include/wine/windows/msident.h +include/wine/windows/msident.idl include/wine/windows/msinkaut.h include/wine/windows/msinkaut.idl include/wine/windows/msiquery.h @@ -564,6 +578,7 @@ include/wine/windows/rpcsal.h include/wine/windows/rstbas.idl include/wine/windows/rstinf.idl include/wine/windows/rstloc.idl +include/wine/windows/rstnot.idl include/wine/windows/rtutils.h include/wine/windows/scarderr.h include/wine/windows/schannel.h @@ -626,8 +641,20 @@ include/wine/windows/tmschema.h include/wine/windows/tom.h include/wine/windows/tom.idl include/wine/windows/traffic.h +include/wine/windows/transact.h +include/wine/windows/transact.idl include/wine/windows/twain.h +include/wine/windows/txcoord.h +include/wine/windows/txcoord.idl +include/wine/windows/txdtc.h +include/wine/windows/txdtc.idl include/wine/windows/udpmib.h +include/wine/windows/uiautomation.h +include/wine/windows/uiautomationclient.h +include/wine/windows/uiautomationclient.idl +include/wine/windows/uiautomationcore.h +include/wine/windows/uiautomationcore.idl +include/wine/windows/uiautomationcoreapi.h include/wine/windows/unknwn.h include/wine/windows/unknwn.idl include/wine/windows/urlhist.h @@ -650,6 +677,8 @@ include/wine/windows/vsstyle.h include/wine/windows/vssym32.h include/wine/windows/wbemcli.h include/wine/windows/wbemcli.idl +include/wine/windows/wbemprov.h +include/wine/windows/wbemprov.idl include/wine/windows/werapi.h include/wine/windows/wfext.h include/wine/windows/wia.h @@ -670,6 +699,7 @@ include/wine/windows/windns.h include/wine/windows/windows.h include/wine/windows/windowsx.h include/wine/windows/winerror.h +include/wine/windows/winevt.h include/wine/windows/wingdi.h include/wine/windows/winhttp.h include/wine/windows/wininet.h @@ -701,6 +731,12 @@ include/wine/windows/winuser.h include/wine/windows/winuser.rh include/wine/windows/winver.h include/wine/windows/wmistr.h +include/wine/windows/wmiutils.h +include/wine/windows/wmiutils.idl +include/wine/windows/wmsbuffer.h +include/wine/windows/wmsbuffer.idl +include/wine/windows/wmsdkidl.h +include/wine/windows/wmsdkidl.idl include/wine/windows/wnaspi32.h include/wine/windows/wownt32.h include/wine/windows/wpcapi.h @@ -744,8 +780,6 @@ lib32/.libGL/dri/tdfx_dri.so lib32/.libGL/dri/unichrome_dri.so lib32/.libGL/libGL.so.1 lib32/libGLU.so.1 -lib32/libICE.so.6 -lib32/libSM.so.6 lib32/libX11-xcb.so.1 lib32/libX11.so.6 lib32/libXau.so.6 @@ -786,10 +820,26 @@ lib32/wine/actxprxy.dll.so lib32/wine/advapi32.dll.so lib32/wine/advpack.dll.so lib32/wine/amstream.dll.so +lib32/wine/api-ms-win-core-localregistry-l1-1-0.dll.so +lib32/wine/api-ms-win-core-processthreads-l1-1-0.dll.so +lib32/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so +lib32/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so +lib32/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so +lib32/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so +lib32/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so +lib32/wine/api-ms-win-downlevel-ole32-l1-1-0.dll.so +lib32/wine/api-ms-win-downlevel-shell32-l1-1-0.dll.so +lib32/wine/api-ms-win-downlevel-shlwapi-l1-1-0.dll.so +lib32/wine/api-ms-win-downlevel-shlwapi-l2-1-0.dll.so +lib32/wine/api-ms-win-downlevel-user32-l1-1-0.dll.so +lib32/wine/api-ms-win-downlevel-version-l1-1-0.dll.so +lib32/wine/api-ms-win-security-base-l1-1-0.dll.so lib32/wine/apphelp.dll.so lib32/wine/appwiz.cpl.so lib32/wine/aspnet_regiis.exe.so lib32/wine/atl.dll.so +lib32/wine/atl100.dll.so +lib32/wine/atl80.dll.so lib32/wine/attrib.exe.so lib32/wine/authz.dll.so lib32/wine/avicap32.dll.so @@ -814,6 +864,7 @@ lib32/wine/comm.drv16.so lib32/wine/commdlg.dll16.so lib32/wine/compobj.dll16.so lib32/wine/compstui.dll.so +lib32/wine/conhost.exe.so lib32/wine/control.exe.so lib32/wine/credui.dll.so lib32/wine/crtdll.dll.so @@ -829,6 +880,7 @@ lib32/wine/ctl3d32.dll.so lib32/wine/ctl3dv2.dll16.so lib32/wine/d3d10.dll.so lib32/wine/d3d10core.dll.so +lib32/wine/d3d11.dll.so lib32/wine/d3d8.dll.so lib32/wine/d3d9.dll.so lib32/wine/d3dcompiler_33.dll.so @@ -884,6 +936,7 @@ lib32/wine/ddraw.dll.so lib32/wine/ddrawex.dll.so lib32/wine/devenum.dll.so lib32/wine/dhcpcsvc.dll.so +lib32/wine/difxapi.dll.so lib32/wine/dinput.dll.so lib32/wine/dinput8.dll.so lib32/wine/dispdib.dll16.so @@ -911,6 +964,7 @@ lib32/wine/dsound.dll.so lib32/wine/dssenh.dll.so lib32/wine/dswave.dll.so lib32/wine/dwmapi.dll.so +lib32/wine/dwrite.dll.so lib32/wine/dxdiag.exe.so lib32/wine/dxdiagn.dll.so lib32/wine/dxgi.dll.so @@ -926,10 +980,26 @@ lib32/wine/fakedlls/actxprxy.dll lib32/wine/fakedlls/advapi32.dll lib32/wine/fakedlls/advpack.dll lib32/wine/fakedlls/amstream.dll +lib32/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-core-processthreads-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-downlevel-advapi32-l2-1-0.dll +lib32/wine/fakedlls/api-ms-win-downlevel-normaliz-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-downlevel-ole32-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-downlevel-shell32-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-downlevel-shlwapi-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-downlevel-shlwapi-l2-1-0.dll +lib32/wine/fakedlls/api-ms-win-downlevel-user32-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-downlevel-version-l1-1-0.dll +lib32/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll lib32/wine/fakedlls/apphelp.dll lib32/wine/fakedlls/appwiz.cpl lib32/wine/fakedlls/aspnet_regiis.exe lib32/wine/fakedlls/atl.dll +lib32/wine/fakedlls/atl100.dll +lib32/wine/fakedlls/atl80.dll lib32/wine/fakedlls/attrib.exe lib32/wine/fakedlls/authz.dll lib32/wine/fakedlls/avicap32.dll @@ -954,6 +1024,7 @@ lib32/wine/fakedlls/comm.drv16 lib32/wine/fakedlls/commdlg.dll16 lib32/wine/fakedlls/compobj.dll16 lib32/wine/fakedlls/compstui.dll +lib32/wine/fakedlls/conhost.exe lib32/wine/fakedlls/control.exe lib32/wine/fakedlls/credui.dll lib32/wine/fakedlls/crtdll.dll @@ -969,6 +1040,7 @@ lib32/wine/fakedlls/ctl3d32.dll lib32/wine/fakedlls/ctl3dv2.dll16 lib32/wine/fakedlls/d3d10.dll lib32/wine/fakedlls/d3d10core.dll +lib32/wine/fakedlls/d3d11.dll lib32/wine/fakedlls/d3d8.dll lib32/wine/fakedlls/d3d9.dll lib32/wine/fakedlls/d3dcompiler_33.dll @@ -1024,6 +1096,7 @@ lib32/wine/fakedlls/ddraw.dll lib32/wine/fakedlls/ddrawex.dll lib32/wine/fakedlls/devenum.dll lib32/wine/fakedlls/dhcpcsvc.dll +lib32/wine/fakedlls/difxapi.dll lib32/wine/fakedlls/dinput.dll lib32/wine/fakedlls/dinput8.dll lib32/wine/fakedlls/dispdib.dll16 @@ -1051,6 +1124,7 @@ lib32/wine/fakedlls/dsound.dll lib32/wine/fakedlls/dssenh.dll lib32/wine/fakedlls/dswave.dll lib32/wine/fakedlls/dwmapi.dll +lib32/wine/fakedlls/dwrite.dll lib32/wine/fakedlls/dxdiag.exe lib32/wine/fakedlls/dxdiagn.dll lib32/wine/fakedlls/dxgi.dll @@ -1060,6 +1134,7 @@ lib32/wine/fakedlls/explorer.exe lib32/wine/fakedlls/explorerframe.dll lib32/wine/fakedlls/extrac32.exe lib32/wine/fakedlls/faultrep.dll +lib32/wine/fakedlls/findstr.exe lib32/wine/fakedlls/fltlib.dll lib32/wine/fakedlls/fusion.dll lib32/wine/fakedlls/fwpuclnt.dll @@ -1099,6 +1174,7 @@ lib32/wine/fakedlls/ipconfig.exe lib32/wine/fakedlls/iphlpapi.dll lib32/wine/fakedlls/itircl.dll lib32/wine/fakedlls/itss.dll +lib32/wine/fakedlls/joy.cpl lib32/wine/fakedlls/jscript.dll lib32/wine/fakedlls/kernel32.dll lib32/wine/fakedlls/keyboard.drv16 @@ -1117,6 +1193,7 @@ lib32/wine/fakedlls/mcicda.dll lib32/wine/fakedlls/mciqtz32.dll lib32/wine/fakedlls/mciseq.dll lib32/wine/fakedlls/mciwave.dll +lib32/wine/fakedlls/mgmtapi.dll lib32/wine/fakedlls/midimap.dll lib32/wine/fakedlls/mlang.dll lib32/wine/fakedlls/mmcndmgr.dll @@ -1146,12 +1223,14 @@ lib32/wine/fakedlls/mshta.exe lib32/wine/fakedlls/mshtml.dll lib32/wine/fakedlls/mshtml.tlb lib32/wine/fakedlls/msi.dll +lib32/wine/fakedlls/msident.dll lib32/wine/fakedlls/msiexec.exe lib32/wine/fakedlls/msimg32.dll lib32/wine/fakedlls/msimsg.dll lib32/wine/fakedlls/msimtf.dll lib32/wine/fakedlls/msisip.dll lib32/wine/fakedlls/msisys.ocx +lib32/wine/fakedlls/msls31.dll lib32/wine/fakedlls/msnet32.dll lib32/wine/fakedlls/mspatcha.dll lib32/wine/fakedlls/msrle32.dll @@ -1159,13 +1238,17 @@ lib32/wine/fakedlls/mssign32.dll lib32/wine/fakedlls/mssip32.dll lib32/wine/fakedlls/mstask.dll lib32/wine/fakedlls/msvcirt.dll +lib32/wine/fakedlls/msvcm80.dll +lib32/wine/fakedlls/msvcm90.dll lib32/wine/fakedlls/msvcp100.dll +lib32/wine/fakedlls/msvcp110.dll lib32/wine/fakedlls/msvcp60.dll lib32/wine/fakedlls/msvcp70.dll lib32/wine/fakedlls/msvcp71.dll lib32/wine/fakedlls/msvcp80.dll lib32/wine/fakedlls/msvcp90.dll lib32/wine/fakedlls/msvcr100.dll +lib32/wine/fakedlls/msvcr110.dll lib32/wine/fakedlls/msvcr70.dll lib32/wine/fakedlls/msvcr71.dll lib32/wine/fakedlls/msvcr80.dll @@ -1187,6 +1270,7 @@ lib32/wine/fakedlls/nddeapi.dll lib32/wine/fakedlls/net.exe lib32/wine/fakedlls/netapi32.dll lib32/wine/fakedlls/netsh.exe +lib32/wine/fakedlls/netstat.exe lib32/wine/fakedlls/newdev.dll lib32/wine/fakedlls/ngen.exe lib32/wine/fakedlls/normaliz.dll @@ -1199,6 +1283,7 @@ lib32/wine/fakedlls/ntprint.dll lib32/wine/fakedlls/objsel.dll lib32/wine/fakedlls/odbc32.dll lib32/wine/fakedlls/odbccp32.dll +lib32/wine/fakedlls/odbccu32.dll lib32/wine/fakedlls/ole2.dll16 lib32/wine/fakedlls/ole2conv.dll16 lib32/wine/fakedlls/ole2disp.dll16 @@ -1263,7 +1348,9 @@ lib32/wine/fakedlls/sc.exe lib32/wine/fakedlls/scarddlg.dll lib32/wine/fakedlls/sccbase.dll lib32/wine/fakedlls/schannel.dll +lib32/wine/fakedlls/schtasks.exe lib32/wine/fakedlls/scrrun.dll +lib32/wine/fakedlls/scsiport.sys lib32/wine/fakedlls/secedit.exe lib32/wine/fakedlls/secur32.dll lib32/wine/fakedlls/security.dll @@ -1322,6 +1409,8 @@ lib32/wine/fakedlls/usp10.dll lib32/wine/fakedlls/uxtheme.dll lib32/wine/fakedlls/vbscript.dll lib32/wine/fakedlls/vcomp.dll +lib32/wine/fakedlls/vcomp100.dll +lib32/wine/fakedlls/vcomp90.dll lib32/wine/fakedlls/vdhcp.vxd lib32/wine/fakedlls/vdmdbg.dll lib32/wine/fakedlls/ver.dll16 @@ -1335,13 +1424,16 @@ lib32/wine/fakedlls/vwin32.vxd lib32/wine/fakedlls/w32skrnl.dll lib32/wine/fakedlls/w32sys.dll16 lib32/wine/fakedlls/wbemprox.dll +lib32/wine/fakedlls/webservices.dll lib32/wine/fakedlls/wer.dll +lib32/wine/fakedlls/wevtapi.dll lib32/wine/fakedlls/wiaservc.dll lib32/wine/fakedlls/win32s16.dll16 lib32/wine/fakedlls/win87em.dll16 lib32/wine/fakedlls/winaspi.dll16 lib32/wine/fakedlls/windebug.dll16 lib32/wine/fakedlls/windowscodecs.dll +lib32/wine/fakedlls/windowscodecsext.dll lib32/wine/fakedlls/wineboot.exe lib32/wine/fakedlls/winebrowser.exe lib32/wine/fakedlls/winecfg.exe @@ -1383,6 +1475,7 @@ lib32/wine/fakedlls/wldap32.dll lib32/wine/fakedlls/wmi.dll lib32/wine/fakedlls/wmic.exe lib32/wine/fakedlls/wmiutils.dll +lib32/wine/fakedlls/wmvcore.dll lib32/wine/fakedlls/wnaspi32.dll lib32/wine/fakedlls/wordpad.exe lib32/wine/fakedlls/wow32.dll @@ -1390,10 +1483,12 @@ lib32/wine/fakedlls/write.exe lib32/wine/fakedlls/ws2_32.dll lib32/wine/fakedlls/wscript.exe lib32/wine/fakedlls/wshom.ocx +lib32/wine/fakedlls/wsnmp32.dll lib32/wine/fakedlls/wsock32.dll lib32/wine/fakedlls/wtsapi32.dll lib32/wine/fakedlls/wuapi.dll lib32/wine/fakedlls/wuaueng.dll +lib32/wine/fakedlls/wusa.exe lib32/wine/fakedlls/xapofx1_1.dll lib32/wine/fakedlls/xcopy.exe lib32/wine/fakedlls/xinput1_1.dll @@ -1403,7 +1498,9 @@ lib32/wine/fakedlls/xinput9_1_0.dll lib32/wine/fakedlls/xmllite.dll lib32/wine/fakedlls/xolehlp.dll lib32/wine/fakedlls/xpsprint.dll +lib32/wine/fakedlls/xpssvcs.dll lib32/wine/faultrep.dll.so +lib32/wine/findstr.exe.so lib32/wine/fltlib.dll.so lib32/wine/fusion.dll.so lib32/wine/fwpuclnt.dll.so @@ -1443,6 +1540,7 @@ lib32/wine/ipconfig.exe.so lib32/wine/iphlpapi.dll.so lib32/wine/itircl.dll.so lib32/wine/itss.dll.so +lib32/wine/joy.cpl.so lib32/wine/jscript.dll.so lib32/wine/kernel32.dll.so lib32/wine/keyboard.drv16.so @@ -1454,6 +1552,8 @@ lib32/wine/libadsiid.a lib32/wine/libadvapi32.def lib32/wine/libadvpack.def lib32/wine/libatl.def +lib32/wine/libatl100.def +lib32/wine/libatl80.def lib32/wine/libavicap32.def lib32/wine/libavifil32.def lib32/wine/libavrt.def @@ -1495,6 +1595,7 @@ lib32/wine/libdplayx.def lib32/wine/libdpnet.def lib32/wine/libdsound.def lib32/wine/libdwmapi.def +lib32/wine/libdwrite.def lib32/wine/libdxerr8.a lib32/wine/libdxerr9.a lib32/wine/libdxgi.def @@ -1505,6 +1606,7 @@ lib32/wine/libgdiplus.def lib32/wine/libglu32.def lib32/wine/libhid.def lib32/wine/libhlink.def +lib32/wine/libhtmlhelp.def lib32/wine/libieframe.def lib32/wine/libimagehlp.def lib32/wine/libimm32.def @@ -1577,6 +1679,7 @@ lib32/wine/libspoolss.def lib32/wine/libsti.def lib32/wine/libstrmbase.a lib32/wine/libstrmiids.a +lib32/wine/libsxs.def lib32/wine/libtapi32.def lib32/wine/libunicows.def lib32/wine/liburl.def @@ -1589,8 +1692,10 @@ lib32/wine/libuuid.a lib32/wine/libuxtheme.def lib32/wine/libvdmdbg.def lib32/wine/libversion.def +lib32/wine/libwebservices.def lib32/wine/libwer.def lib32/wine/libwindowscodecs.def +lib32/wine/libwindowscodecsext.def lib32/wine/libwinecrt0.a lib32/wine/libwined3d.def lib32/wine/libwinhttp.def @@ -1621,6 +1726,7 @@ lib32/wine/mcicda.dll.so lib32/wine/mciqtz32.dll.so lib32/wine/mciseq.dll.so lib32/wine/mciwave.dll.so +lib32/wine/mgmtapi.dll.so lib32/wine/midimap.dll.so lib32/wine/mlang.dll.so lib32/wine/mmcndmgr.dll.so @@ -1650,12 +1756,14 @@ lib32/wine/mshta.exe.so lib32/wine/mshtml.dll.so lib32/wine/mshtml.tlb.so lib32/wine/msi.dll.so +lib32/wine/msident.dll.so lib32/wine/msiexec.exe.so lib32/wine/msimg32.dll.so lib32/wine/msimsg.dll.so lib32/wine/msimtf.dll.so lib32/wine/msisip.dll.so lib32/wine/msisys.ocx.so +lib32/wine/msls31.dll.so lib32/wine/msnet32.dll.so lib32/wine/mspatcha.dll.so lib32/wine/msrle32.dll.so @@ -1663,13 +1771,17 @@ lib32/wine/mssign32.dll.so lib32/wine/mssip32.dll.so lib32/wine/mstask.dll.so lib32/wine/msvcirt.dll.so +lib32/wine/msvcm80.dll.so +lib32/wine/msvcm90.dll.so lib32/wine/msvcp100.dll.so +lib32/wine/msvcp110.dll.so lib32/wine/msvcp60.dll.so lib32/wine/msvcp70.dll.so lib32/wine/msvcp71.dll.so lib32/wine/msvcp80.dll.so lib32/wine/msvcp90.dll.so lib32/wine/msvcr100.dll.so +lib32/wine/msvcr110.dll.so lib32/wine/msvcr70.dll.so lib32/wine/msvcr71.dll.so lib32/wine/msvcr80.dll.so @@ -1691,6 +1803,7 @@ lib32/wine/nddeapi.dll.so lib32/wine/net.exe.so lib32/wine/netapi32.dll.so lib32/wine/netsh.exe.so +lib32/wine/netstat.exe.so lib32/wine/newdev.dll.so lib32/wine/ngen.exe.so lib32/wine/normaliz.dll.so @@ -1703,6 +1816,7 @@ lib32/wine/ntprint.dll.so lib32/wine/objsel.dll.so lib32/wine/odbc32.dll.so lib32/wine/odbccp32.dll.so +lib32/wine/odbccu32.dll.so lib32/wine/ole2.dll16.so lib32/wine/ole2conv.dll16.so lib32/wine/ole2disp.dll16.so @@ -1767,7 +1881,9 @@ lib32/wine/sc.exe.so lib32/wine/scarddlg.dll.so lib32/wine/sccbase.dll.so lib32/wine/schannel.dll.so +lib32/wine/schtasks.exe.so lib32/wine/scrrun.dll.so +lib32/wine/scsiport.sys.so lib32/wine/secedit.exe.so lib32/wine/secur32.dll.so lib32/wine/security.dll.so @@ -1826,6 +1942,8 @@ lib32/wine/usp10.dll.so lib32/wine/uxtheme.dll.so lib32/wine/vbscript.dll.so lib32/wine/vcomp.dll.so +lib32/wine/vcomp100.dll.so +lib32/wine/vcomp90.dll.so lib32/wine/vdhcp.vxd.so lib32/wine/vdmdbg.dll.so lib32/wine/ver.dll16.so @@ -1839,13 +1957,16 @@ lib32/wine/vwin32.vxd.so lib32/wine/w32skrnl.dll.so lib32/wine/w32sys.dll16.so lib32/wine/wbemprox.dll.so +lib32/wine/webservices.dll.so lib32/wine/wer.dll.so +lib32/wine/wevtapi.dll.so lib32/wine/wiaservc.dll.so lib32/wine/win32s16.dll16.so lib32/wine/win87em.dll16.so lib32/wine/winaspi.dll16.so lib32/wine/windebug.dll16.so lib32/wine/windowscodecs.dll.so +lib32/wine/windowscodecsext.dll.so lib32/wine/wineboot.exe.so lib32/wine/winebrowser.exe.so lib32/wine/winecfg.exe.so @@ -1887,6 +2008,7 @@ lib32/wine/wldap32.dll.so lib32/wine/wmi.dll.so lib32/wine/wmic.exe.so lib32/wine/wmiutils.dll.so +lib32/wine/wmvcore.dll.so lib32/wine/wnaspi32.dll.so lib32/wine/wordpad.exe.so lib32/wine/wow32.dll.so @@ -1894,10 +2016,12 @@ lib32/wine/write.exe.so lib32/wine/ws2_32.dll.so lib32/wine/wscript.exe.so lib32/wine/wshom.ocx.so +lib32/wine/wsnmp32.dll.so lib32/wine/wsock32.dll.so lib32/wine/wtsapi32.dll.so lib32/wine/wuapi.dll.so lib32/wine/wuaueng.dll.so +lib32/wine/wusa.exe.so lib32/wine/xapofx1_1.dll.so lib32/wine/xcopy.exe.so lib32/wine/xinput1_1.dll.so @@ -1907,6 +2031,7 @@ lib32/wine/xinput9_1_0.dll.so lib32/wine/xmllite.dll.so lib32/wine/xolehlp.dll.so lib32/wine/xpsprint.dll.so +lib32/wine/xpssvcs.dll.so man/man1/msiexec.1.gz man/man1/notepad.1.gz man/man1/regedit.1.gz @@ -1929,7 +2054,6 @@ man/man1/winepath.1.gz man/man1/wineserver.1.gz man/man1/wmc.1.gz man/man1/wrc.1.gz -share/applications/wine.desktop share/doc/wine/ANNOUNCE share/doc/wine/AUTHORS share/doc/wine/README @@ -1946,6 +2070,7 @@ share/wine/fonts/couret.fon share/wine/fonts/cvgasys.fon share/wine/fonts/hvgasys.fon share/wine/fonts/jsmalle.fon +share/wine/fonts/jvgafix.fon share/wine/fonts/jvgasys.fon share/wine/fonts/marlett.ttf share/wine/fonts/smae1255.fon @@ -1960,15 +2085,25 @@ share/wine/fonts/ssee1255.fon share/wine/fonts/ssee1256.fon share/wine/fonts/ssee1257.fon share/wine/fonts/ssee874.fon +share/wine/fonts/ssef1255.fon +share/wine/fonts/ssef1256.fon +share/wine/fonts/ssef1257.fon +share/wine/fonts/ssef874.fon share/wine/fonts/sserife.fon share/wine/fonts/sserifee.fon share/wine/fonts/sserifeg.fon share/wine/fonts/sserifer.fon share/wine/fonts/sserifet.fon +share/wine/fonts/sseriff.fon +share/wine/fonts/sseriffe.fon +share/wine/fonts/sseriffg.fon +share/wine/fonts/sseriffr.fon +share/wine/fonts/sserifft.fon share/wine/fonts/svgasys.fon share/wine/fonts/symbol.ttf share/wine/fonts/tahoma.ttf share/wine/fonts/tahomabd.ttf +share/wine/fonts/vgafix.fon share/wine/fonts/vgas1255.fon share/wine/fonts/vgas1256.fon share/wine/fonts/vgas1257.fon @@ -1978,6 +2113,7 @@ share/wine/fonts/vgasyse.fon share/wine/fonts/vgasysg.fon share/wine/fonts/vgasysr.fon share/wine/fonts/vgasyst.fon +share/wine/fonts/wingding.ttf share/wine/generic.ppd share/wine/l_intl.nls share/wine/patch-nvidia.sh Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/wine-devel/Makefile Mon Dec 2 16:49:37 2013 (r335510) @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 -CONFLICTS_INSTALL= i386-wine-* wine-1.4* wine-1.6* +CONFLICTS_INSTALL= i386-wine-[0-9]* i386-wine-devel-[0-9]* wine-[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Mon Dec 2 16:39:13 2013 (r335509) +++ head/emulators/wine/Makefile Mon Dec 2 16:49:37 2013 (r335510) @@ -23,7 +23,7 @@ LIB_DEPENDS= libfontconfig.so:${PORTSDIR libpng15.so:${PORTSDIR}/graphics/png \ libxml2.so:${PORTSDIR}/textproc/libxml2 -CONFLICTS_INSTALL= i386-wine-* wine-1.5* wine-1.7* +CONFLICTS_INSTALL= i386-wine-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312021649.rB2Gnbf7071415>