Attachment #153850 for bug #197798

View | Details | Raw Unified | Return to bug 197798 | Differences between
Collapse All | Expand All




.if !defined(USE_LDCONFIG32)
USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
.endif
ONLY_FOR_ARCHS=	i386 amd64
USES=		bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2
SHEBANG_FILES=	tools/make_requests tools/winemaker \
		tools/winedump/function_grep.pl

			liblcms2.so:${PORTSDIR}/graphics/lcms2 \
			libpng.so:${PORTSDIR}/graphics/png

.include <bsd.port.pre.mk>

.if ${ARCH} == amd64
# --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64.
CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
PLIST_SUB+=		WINE32="@comment " WINE64=""

.if ${COMPILER_TYPE} == clang
CPPFLAGS+=		-D__builtin_ms_va_list=__builtin_va_list \
			-D__builtin_ms_va_start=__builtin_va_start \
			-D__builtin_ms_va_end=__builtin_va_end \
			-D__builtin_ms_va_copy=__builtin_va_copy
.endif

post-patch:
	${REINPLACE_CMD} 's|/wine|/wine64|g' ${WRKSRC}/tools/wineapploader.in

.else 
PLIST_SUB+=		WINE32="" WINE64="@comment "
.endif

.if ${PORT_OPTIONS:MCOMPHOLIO}
MASTER_SITES+=	https://github.com/compholio/wine-compholio-daily/archive/:cho
COMP_DIST=	v${DISTVERSION}.tar.gz

	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump

.include <bsd.port.post.mk>




commit 1625bb8e07d1dee8f0b6c98466e0185c7c7431be
Author: David Naylor <naylor.b.david@gmail.com>
Date:   Tue Jan 20 21:55:03 2015 +0200

    configure: explicitly set host_cpu for 'amd64'.
    
    In the case of host starting with 'amd64', the host_cpu variable will not be
    set to the correct CPU value of 'x86_64'.  Set it explicitly to the correct
    value.

diff --git a/configure b/configure
index bc2f434..62b2ca3 100755
--- configure
+++ configure
@@ -4912,6 +4912,7 @@ $as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       fi
+      host_cpu="x86_64"
       TARGETFLAGS="-m64"
 
     fi
diff --git a/configure.ac b/configure.ac
index db26333..9579245 100644
--- configure.ac
+++ configure.ac
@@ -165,6 +165,7 @@ case $host in
                           [AC_MSG_RESULT([no])
                            AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])])
       fi
+      host_cpu="x86_64"
       AC_SUBST(TARGETFLAGS,"-m64")
     fi
     ;;

commit 0d268d62ad93ca1d1cf1c2fead43e2143b5529b3
Author: David Naylor <naylor.b.david@gmail.com>
Date:   Tue Jan 20 17:54:38 2015 +0200

    configure: recognise host starting in 'amd64'.
    
    FreeBSD uses amd64 to identify a CPU architecture based on AMD's 64-bit
    instruction set.

diff --git a/configure b/configure
index 0431209..bc2f434 100755
--- configure
+++ configure
@@ -4852,7 +4852,7 @@ case $host in
     fi
     with_fontconfig=${with_fontconfig:-no}
     ;;
-  x86_64*)
+  x86_64*|amd64*)
     if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
     then
       CC="$CC -m32"
diff --git a/configure.ac b/configure.ac
index a931730..db26333 100644
--- configure.ac
+++ configure.ac
@@ -143,7 +143,7 @@ case $host in
     fi
     with_fontconfig=${with_fontconfig:-no}
     ;;
-  x86_64*)
+  x86_64*|amd64*)
     if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
     then
       CC="$CC -m32"




commit 595a3ccfe8aa02ccc287f9a4b23a3f177ae220b9
Author: David Naylor <naylor.b.david@gmail.com>
Date:   Mon Feb 2 22:10:55 2015 +0200

    kernel32: force 4096 byte page alignment.
    
    FreeBSD prefers to use a 0x200000 (super) page alignment however this causes
    the image base to be displaced from the requested 0x7b800000.  Forcing a
    smaller page size ensures FreeBSD can place the image startin at 0x7b800000.

diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
index c09771d..a006c2c 100644
--- dlls/kernel32/Makefile.in
+++ dlls/kernel32/Makefile.in
@@ -3,7 +3,8 @@ MODULE    = kernel32.dll
 IMPORTLIB = kernel32
 IMPORTS   = winecrt0 ntdll
 EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS)
-EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
+EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 \
+	-Wl,-z,max-page-size=0x1000
 
 C_SRCS = \
 	actctx.c \




bin/regedit
bin/regsvr32
bin/widl
%%WINE32%%bin/wine
%%WINE64%%bin/wine64
bin/wineboot
bin/winebuild
bin/winecfg

include/wine/windows/ctfutb.idl
include/wine/windows/ctxtcall.h
include/wine/windows/ctxtcall.idl
%%COMPHOLIO%%include/wine/windows/cuda.h
include/wine/windows/custcntl.h
%%COMPHOLIO%%include/wine/windows/cuviddec.h
include/wine/windows/cvconst.h
include/wine/windows/d2d1.h
include/wine/windows/d2d1.idl

include/wine/windows/dxgi1_2.idl
include/wine/windows/dxgiformat.h
include/wine/windows/dxgitype.h
%%COMPHOLIO%%include/wine/windows/dxva.h
include/wine/windows/dxva2api.h
include/wine/windows/dxva2api.idl
include/wine/windows/dyngraph.idl

include/wine/windows/mediaobj.idl
include/wine/windows/metahost.h
include/wine/windows/metahost.idl
include/wine/windows/mferror.h
include/wine/windows/midles.h
include/wine/windows/mimeinfo.h
include/wine/windows/mimeinfo.idl

include/wine/windows/ntsecapi.h
include/wine/windows/ntsecpkg.h
include/wine/windows/ntstatus.h
%%COMPHOLIO%%include/wine/windows/nvapi.h
%%COMPHOLIO%%include/wine/windows/nvcuvid.h
%%COMPHOLIO%%include/wine/windows/nvencodeapi.h
include/wine/windows/oaidl.h
include/wine/windows/oaidl.idl
include/wine/windows/objbase.h

include/wine/windows/xmllite.idl
include/wine/windows/zmouse.h
include/wine/windows/ddk/compstui.h
include/wine/windows/ddk/csq.h
include/wine/windows/ddk/hidsdi.h
include/wine/windows/ddk/imm.h
include/wine/windows/ddk/mountmgr.h

lib/wine/amstream.dll.so
lib/wine/api-ms-win-core-com-l1-1-0.dll.so
lib/wine/api-ms-win-core-console-l1-1-0.dll.so
lib/wine/api-ms-win-core-datetime-l1-1-0.dll.so
lib/wine/api-ms-win-core-datetime-l1-1-1.dll.so
lib/wine/api-ms-win-core-debug-l1-1-1.dll.so
lib/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so
lib/wine/api-ms-win-core-errorhandling-l1-1-2.dll.so
lib/wine/api-ms-win-core-fibers-l1-1-0.dll.so
lib/wine/api-ms-win-core-fibers-l1-1-1.dll.so
lib/wine/api-ms-win-core-file-l1-2-0.dll.so
lib/wine/api-ms-win-core-file-l2-1-0.dll.so
lib/wine/api-ms-win-core-file-l2-1-1.dll.so
lib/wine/api-ms-win-core-handle-l1-1-0.dll.so
lib/wine/api-ms-win-core-heap-l1-2-0.dll.so

lib/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so
lib/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so
lib/wine/api-ms-win-core-localization-l1-2-0.dll.so
lib/wine/api-ms-win-core-localization-l1-2-1.dll.so
lib/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so
lib/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
lib/wine/api-ms-win-core-memory-l1-1-1.dll.so

lib/wine/api-ms-win-core-url-l1-1-0.dll.so
lib/wine/api-ms-win-core-util-l1-1-0.dll.so
lib/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so
lib/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
lib/wine/api-ms-win-core-winrt-l1-1-0.dll.so
lib/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
lib/wine/api-ms-win-core-xstate-l2-1-0.dll.so
lib/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so
lib/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so
lib/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so

lib/wine/authz.dll.so
lib/wine/avicap32.dll.so
lib/wine/avifil32.dll.so
%%WINE32%%lib/wine/avifile.dll16.so
lib/wine/avrt.dll.so
lib/wine/bcrypt.dll.so
lib/wine/browseui.dll.so

lib/wine/comcat.dll.so
lib/wine/comctl32.dll.so
lib/wine/comdlg32.dll.so
%%WINE32%%lib/wine/comm.drv16.so
%%WINE32%%lib/wine/commdlg.dll16.so
%%WINE32%%lib/wine/compobj.dll16.so
lib/wine/compstui.dll.so
lib/wine/comsvcs.dll.so
lib/wine/conhost.exe.so

lib/wine/cryptui.dll.so
lib/wine/cscript.exe.so
lib/wine/ctapi32.dll.so
%%WINE32%%lib/wine/ctl3d.dll16.so
lib/wine/ctl3d32.dll.so
%%WINE32%%lib/wine/ctl3dv2.dll16.so
lib/wine/d2d1.dll.so
lib/wine/d3d10.dll.so
lib/wine/d3d10_1.dll.so

lib/wine/dbgeng.dll.so
lib/wine/dbghelp.dll.so
lib/wine/dciman32.dll.so
%%WINE32%%lib/wine/ddeml.dll16.so
lib/wine/ddraw.dll.so
lib/wine/ddrawex.dll.so
lib/wine/devenum.dll.so

lib/wine/difxapi.dll.so
lib/wine/dinput.dll.so
lib/wine/dinput8.dll.so
%%WINE32%%lib/wine/dispdib.dll16.so
lib/wine/dispex.dll.so
%%WINE32%%lib/wine/display.drv16.so
lib/wine/dmband.dll.so
lib/wine/dmcompos.dll.so
lib/wine/dmime.dll.so

lib/wine/fakedlls/amstream.dll
lib/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-debug-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-2.dll
lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-file-l1-2-0.dll
lib/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
lib/wine/fakedlls/api-ms-win-core-file-l2-1-1.dll
lib/wine/fakedlls/api-ms-win-core-handle-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-heap-l1-2-0.dll

lib/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll
lib/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
lib/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-memory-l1-1-1.dll

lib/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
lib/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll
lib/wine/fakedlls/api-ms-win-downlevel-advapi32-l2-1-0.dll
lib/wine/fakedlls/api-ms-win-downlevel-normaliz-l1-1-0.dll

lib/wine/fakedlls/authz.dll
lib/wine/fakedlls/avicap32.dll
lib/wine/fakedlls/avifil32.dll
%%WINE32%%lib/wine/fakedlls/avifile.dll16
lib/wine/fakedlls/avrt.dll
lib/wine/fakedlls/bcrypt.dll
lib/wine/fakedlls/browseui.dll

lib/wine/fakedlls/comcat.dll
lib/wine/fakedlls/comctl32.dll
lib/wine/fakedlls/comdlg32.dll
%%WINE32%%lib/wine/fakedlls/comm.drv16
%%WINE32%%lib/wine/fakedlls/commdlg.dll16
%%WINE32%%lib/wine/fakedlls/compobj.dll16
lib/wine/fakedlls/compstui.dll
lib/wine/fakedlls/comsvcs.dll
lib/wine/fakedlls/conhost.exe

lib/wine/fakedlls/cryptui.dll
lib/wine/fakedlls/cscript.exe
lib/wine/fakedlls/ctapi32.dll
%%WINE32%%lib/wine/fakedlls/ctl3d.dll16
lib/wine/fakedlls/ctl3d32.dll
%%WINE32%%lib/wine/fakedlls/ctl3dv2.dll16
lib/wine/fakedlls/d2d1.dll
lib/wine/fakedlls/d3d10.dll
lib/wine/fakedlls/d3d10_1.dll

lib/wine/fakedlls/dbgeng.dll
lib/wine/fakedlls/dbghelp.dll
lib/wine/fakedlls/dciman32.dll
%%WINE32%%lib/wine/fakedlls/ddeml.dll16
lib/wine/fakedlls/ddraw.dll
lib/wine/fakedlls/ddrawex.dll
lib/wine/fakedlls/devenum.dll

lib/wine/fakedlls/difxapi.dll
lib/wine/fakedlls/dinput.dll
lib/wine/fakedlls/dinput8.dll
%%WINE32%%lib/wine/fakedlls/dispdib.dll16
lib/wine/fakedlls/dispex.dll
%%WINE32%%lib/wine/fakedlls/display.drv16
lib/wine/fakedlls/dmband.dll
lib/wine/fakedlls/dmcompos.dll
lib/wine/fakedlls/dmime.dll

lib/wine/fakedlls/fusion.dll
lib/wine/fakedlls/fwpuclnt.dll
lib/wine/fakedlls/gameux.dll
%%WINE32%%lib/wine/fakedlls/gdi.exe16
lib/wine/fakedlls/gdi32.dll
lib/wine/fakedlls/gdiplus.dll
%%X11%%lib/wine/fakedlls/glu32.dll

lib/wine/fakedlls/icmp.dll
lib/wine/fakedlls/ieframe.dll
lib/wine/fakedlls/iexplore.exe
%%WINE32%%lib/wine/fakedlls/ifsmgr.vxd
lib/wine/fakedlls/imaadp32.acm
lib/wine/fakedlls/imagehlp.dll
%%WINE32%%lib/wine/fakedlls/imm.dll16
lib/wine/fakedlls/imm32.dll
lib/wine/fakedlls/inetcomm.dll
lib/wine/fakedlls/inetcpl.cpl

lib/wine/fakedlls/jscript.dll
lib/wine/fakedlls/jsproxy.dll
lib/wine/fakedlls/kernel32.dll
%%WINE32%%lib/wine/fakedlls/keyboard.drv16
%%WINE32%%lib/wine/fakedlls/krnl386.exe16
lib/wine/fakedlls/ksuser.dll
lib/wine/fakedlls/ktmw32.dll
lib/wine/fakedlls/loadperf.dll

lib/wine/fakedlls/localui.dll
lib/wine/fakedlls/lodctr.exe
lib/wine/fakedlls/lz32.dll
%%WINE32%%lib/wine/fakedlls/lzexpand.dll16
lib/wine/fakedlls/mapi32.dll
lib/wine/fakedlls/mapistub.dll
lib/wine/fakedlls/mciavi32.dll

lib/wine/fakedlls/mgmtapi.dll
lib/wine/fakedlls/midimap.dll
lib/wine/fakedlls/mlang.dll
%%WINE32%%lib/wine/fakedlls/mmcndmgr.dll
lib/wine/fakedlls/mmdevapi.dll
%%WINE32%%lib/wine/fakedlls/mmdevldr.vxd
%%WINE32%%lib/wine/fakedlls/mmsystem.dll16
lib/wine/fakedlls/mofcomp.exe
%%WINE32%%lib/wine/fakedlls/monodebg.vxd
lib/wine/fakedlls/mountmgr.sys
%%WINE32%%lib/wine/fakedlls/mouse.drv16
lib/wine/fakedlls/mpr.dll
lib/wine/fakedlls/mprapi.dll
%%WINE32%%lib/wine/fakedlls/msacm.dll16
lib/wine/fakedlls/msacm32.dll
lib/wine/fakedlls/msacm32.drv
lib/wine/fakedlls/msadp32.acm

lib/wine/fakedlls/msvcrtd.dll
lib/wine/fakedlls/msvfw32.dll
lib/wine/fakedlls/msvidc32.dll
%%WINE32%%lib/wine/fakedlls/msvideo.dll16
lib/wine/fakedlls/mswsock.dll
lib/wine/fakedlls/msxml.dll
lib/wine/fakedlls/msxml2.dll

lib/wine/fakedlls/ntdsapi.dll
lib/wine/fakedlls/ntoskrnl.exe
lib/wine/fakedlls/ntprint.dll
%%WINE32%%%%COMPHOLIO%%lib/wine/fakedlls/nvapi.dll
%%WINE64%%%%COMPHOLIO%%lib/wine/fakedlls/nvapi64.dll
%%COMPHOLIO%%lib/wine/fakedlls/nvcuda.dll
%%COMPHOLIO%%lib/wine/fakedlls/nvcuvid.dll
%%WINE32%%%%COMPHOLIO%%lib/wine/fakedlls/nvencodeapi.dll
%%WINE64%%%%COMPHOLIO%%lib/wine/fakedlls/nvencodeapi64.dll
lib/wine/fakedlls/objsel.dll
lib/wine/fakedlls/odbc32.dll
lib/wine/fakedlls/odbccp32.dll
lib/wine/fakedlls/odbccu32.dll
%%WINE32%%lib/wine/fakedlls/ole2.dll16
%%WINE32%%lib/wine/fakedlls/ole2conv.dll16
%%WINE32%%lib/wine/fakedlls/ole2disp.dll16
%%WINE32%%lib/wine/fakedlls/ole2nls.dll16
%%WINE32%%lib/wine/fakedlls/ole2prox.dll16
%%WINE32%%lib/wine/fakedlls/ole2thk.dll16
lib/wine/fakedlls/ole32.dll
lib/wine/fakedlls/oleacc.dll
lib/wine/fakedlls/oleaut32.dll
%%WINE32%%lib/wine/fakedlls/olecli.dll16
lib/wine/fakedlls/olecli32.dll
lib/wine/fakedlls/oledb32.dll
lib/wine/fakedlls/oledlg.dll
lib/wine/fakedlls/olepro32.dll
%%WINE32%%lib/wine/fakedlls/olesvr.dll16
lib/wine/fakedlls/olesvr32.dll
lib/wine/fakedlls/olethk32.dll
lib/wine/fakedlls/oleview.exe

lib/wine/fakedlls/qmgrprxy.dll
lib/wine/fakedlls/quartz.dll
lib/wine/fakedlls/query.dll
%%WINE32%%lib/wine/fakedlls/rasapi16.dll16
lib/wine/fakedlls/rasapi32.dll
lib/wine/fakedlls/rasdlg.dll
lib/wine/fakedlls/reg.exe

lib/wine/fakedlls/rsaenh.dll
lib/wine/fakedlls/rstrtmgr.dll
lib/wine/fakedlls/rtutils.dll
%%WINE32%%lib/wine/fakedlls/rundll.exe16
lib/wine/fakedlls/rundll32.exe
lib/wine/fakedlls/samlib.dll
lib/wine/fakedlls/sane.ds

lib/wine/fakedlls/servicemodelreg.exe
lib/wine/fakedlls/services.exe
lib/wine/fakedlls/setupapi.dll
%%WINE32%%lib/wine/fakedlls/setupx.dll16
lib/wine/fakedlls/sfc.dll
lib/wine/fakedlls/sfc_os.dll
lib/wine/fakedlls/shdoclc.dll
lib/wine/fakedlls/shdocvw.dll
%%WINE32%%lib/wine/fakedlls/shell.dll16
lib/wine/fakedlls/shell32.dll
lib/wine/fakedlls/shfolder.dll
lib/wine/fakedlls/shlwapi.dll

lib/wine/fakedlls/slc.dll
lib/wine/fakedlls/snmpapi.dll
lib/wine/fakedlls/softpub.dll
%%WINE32%%lib/wine/fakedlls/sound.drv16
lib/wine/fakedlls/spoolss.dll
lib/wine/fakedlls/spoolsv.exe
lib/wine/fakedlls/start.exe

lib/wine/fakedlls/stdole2.tlb
lib/wine/fakedlls/stdole32.tlb
lib/wine/fakedlls/sti.dll
%%WINE32%%lib/wine/fakedlls/storage.dll16
%%WINE32%%lib/wine/fakedlls/stress.dll16
lib/wine/fakedlls/svchost.exe
lib/wine/fakedlls/svrapi.dll
lib/wine/fakedlls/sxs.dll
%%WINE32%%lib/wine/fakedlls/system.drv16
lib/wine/fakedlls/systeminfo.exe
lib/wine/fakedlls/t2embed.dll
lib/wine/fakedlls/tapi32.dll

lib/wine/fakedlls/taskmgr.exe
lib/wine/fakedlls/taskschd.dll
lib/wine/fakedlls/termsv.exe
%%WINE32%%lib/wine/fakedlls/toolhelp.dll16
lib/wine/fakedlls/traffic.dll
%%WINE32%%lib/wine/fakedlls/twain.dll16
lib/wine/fakedlls/twain_32.dll
%%WINE32%%lib/wine/fakedlls/typelib.dll16
lib/wine/fakedlls/unicows.dll
lib/wine/fakedlls/uninstaller.exe
lib/wine/fakedlls/unlodctr.exe

lib/wine/fakedlls/url.dll
lib/wine/fakedlls/urlmon.dll
lib/wine/fakedlls/usbd.sys
%%WINE32%%lib/wine/fakedlls/user.exe16
lib/wine/fakedlls/user32.dll
lib/wine/fakedlls/userenv.dll
lib/wine/fakedlls/usp10.dll

lib/wine/fakedlls/vcomp.dll
lib/wine/fakedlls/vcomp100.dll
lib/wine/fakedlls/vcomp90.dll
%%WINE32%%lib/wine/fakedlls/vdhcp.vxd
lib/wine/fakedlls/vdmdbg.dll
%%WINE32%%lib/wine/fakedlls/ver.dll16
lib/wine/fakedlls/version.dll
lib/wine/fakedlls/view.exe
%%WINE32%%lib/wine/fakedlls/vmm.vxd
%%WINE32%%lib/wine/fakedlls/vnbt.vxd
%%WINE32%%lib/wine/fakedlls/vnetbios.vxd
lib/wine/fakedlls/vssapi.dll
%%WINE32%%lib/wine/fakedlls/vtdapi.vxd
%%WINE32%%lib/wine/fakedlls/vwin32.vxd
%%WINE32%%lib/wine/fakedlls/w32skrnl.dll
%%WINE32%%lib/wine/fakedlls/w32sys.dll16
lib/wine/fakedlls/wbemdisp.dll
lib/wine/fakedlls/wbemprox.dll
lib/wine/fakedlls/webservices.dll

lib/wine/fakedlls/wevtapi.dll
lib/wine/fakedlls/wevtutil.exe
lib/wine/fakedlls/wiaservc.dll
%%WINE32%%lib/wine/fakedlls/win32s16.dll16
%%WINE32%%lib/wine/fakedlls/win87em.dll16
%%WINE32%%lib/wine/fakedlls/winaspi.dll16
%%WINE32%%lib/wine/fakedlls/windebug.dll16
lib/wine/fakedlls/windowscodecs.dll
lib/wine/fakedlls/windowscodecsext.dll
lib/wine/fakedlls/wineboot.exe

lib/wine/fakedlls/wineoss.drv
lib/wine/fakedlls/winepath.exe
lib/wine/fakedlls/wineps.drv
%%WINE32%%lib/wine/fakedlls/wineps16.drv16
%%WINE32%%lib/wine/fakedlls/winevdm.exe
%%X11%%lib/wine/fakedlls/winex11.drv
%%WINE32%%lib/wine/fakedlls/wing.dll16
lib/wine/fakedlls/wing32.dll
%%WINE32%%lib/wine/fakedlls/winhelp.exe16
lib/wine/fakedlls/winhlp32.exe
lib/wine/fakedlls/winhttp.dll
lib/wine/fakedlls/wininet.dll
lib/wine/fakedlls/winmm.dll
%%WINE32%%lib/wine/fakedlls/winnls.dll16
lib/wine/fakedlls/winnls32.dll
%%WINE32%%lib/wine/fakedlls/winoldap.mod16
lib/wine/fakedlls/winscard.dll
%%WINE32%%lib/wine/fakedlls/winsock.dll16
lib/wine/fakedlls/winspool.drv
lib/wine/fakedlls/winsta.dll
%%WINE32%%lib/wine/fakedlls/wintab.dll16
lib/wine/fakedlls/wintab32.dll
lib/wine/fakedlls/wintrust.dll
lib/wine/fakedlls/winver.exe

lib/wine/fakedlls/wmvcore.dll
lib/wine/fakedlls/wnaspi32.dll
lib/wine/fakedlls/wordpad.exe
%%WINE32%%lib/wine/fakedlls/wow32.dll
lib/wine/fakedlls/wpcap.dll
lib/wine/fakedlls/write.exe
lib/wine/fakedlls/ws2_32.dll

lib/wine/fusion.dll.so
lib/wine/fwpuclnt.dll.so
lib/wine/gameux.dll.so
%%WINE32%%lib/wine/gdi.exe16.so
lib/wine/gdi32.dll.so
lib/wine/gdiplus.dll.so
%%X11%%lib/wine/glu32.dll.so

lib/wine/icmp.dll.so
lib/wine/ieframe.dll.so
lib/wine/iexplore.exe.so
%%WINE32%%lib/wine/ifsmgr.vxd.so
lib/wine/imaadp32.acm.so
lib/wine/imagehlp.dll.so
%%WINE32%%lib/wine/imm.dll16.so
lib/wine/imm32.dll.so
lib/wine/inetcomm.dll.so
lib/wine/inetcpl.cpl.so

lib/wine/jscript.dll.so
lib/wine/jsproxy.dll.so
lib/wine/kernel32.dll.so
%%WINE32%%lib/wine/keyboard.drv16.so
%%WINE32%%lib/wine/krnl386.exe16.so
lib/wine/ksuser.dll.so
lib/wine/ktmw32.dll.so
lib/wine/libaclui.def

lib/wine/libinetcomm.def
lib/wine/libiphlpapi.def
lib/wine/libjsproxy.def
%%WINE32%%lib/wine/libkernel.def
lib/wine/libkernel32.def
lib/wine/libloadperf.def
lib/wine/liblz32.def

lib/wine/libusp10.def
lib/wine/libuuid.a
lib/wine/libuxtheme.def
%%COMPHOLIO%%lib/wine/libvcomp.def
lib/wine/libvdmdbg.def
lib/wine/libversion.def
lib/wine/libwebservices.def
lib/wine/libwer.def
%%COMPHOLIO%%lib/wine/libwinealsa.drv.def
lib/wine/libwindowscodecs.def
lib/wine/libwindowscodecsext.def
lib/wine/libwinecrt0.a

lib/wine/libwintrust.def
lib/wine/libwldap32.def
lib/wine/libwnaspi32.def
%%WINE32%%lib/wine/libwow32.def
lib/wine/libws2_32.def
lib/wine/libwsnmp32.def
lib/wine/libwsock32.def

lib/wine/localui.dll.so
lib/wine/lodctr.exe.so
lib/wine/lz32.dll.so
%%WINE32%%lib/wine/lzexpand.dll16.so
lib/wine/mapi32.dll.so
lib/wine/mapistub.dll.so
lib/wine/mciavi32.dll.so

lib/wine/mlang.dll.so
lib/wine/mmcndmgr.dll.so
lib/wine/mmdevapi.dll.so
%%WINE32%%lib/wine/mmdevldr.vxd.so
%%WINE32%%lib/wine/mmsystem.dll16.so
lib/wine/mofcomp.exe.so
%%WINE32%%lib/wine/monodebg.vxd.so
lib/wine/mountmgr.sys.so
%%WINE32%%lib/wine/mouse.drv16.so
lib/wine/mpr.dll.so
lib/wine/mprapi.dll.so
%%WINE32%%lib/wine/msacm.dll16.so
lib/wine/msacm32.dll.so
lib/wine/msacm32.drv.so
lib/wine/msadp32.acm.so

lib/wine/msvcrtd.dll.so
lib/wine/msvfw32.dll.so
lib/wine/msvidc32.dll.so
%%WINE32%%lib/wine/msvideo.dll16.so
lib/wine/mswsock.dll.so
lib/wine/msxml.dll.so
lib/wine/msxml2.dll.so

lib/wine/ntdsapi.dll.so
lib/wine/ntoskrnl.exe.so
lib/wine/ntprint.dll.so
%%WINE32%%%%COMPHOLIO%%lib/wine/nvapi.dll.so
%%WINE64%%%%COMPHOLIO%%lib/wine/nvapi64.dll.so
%%COMPHOLIO%%lib/wine/nvcuda.dll.so
%%COMPHOLIO%%lib/wine/nvcuvid.dll.so
%%WINE32%%%%COMPHOLIO%%lib/wine/nvencodeapi.dll.so
%%WINE64%%%%COMPHOLIO%%lib/wine/nvencodeapi64.dll.so
lib/wine/objsel.dll.so
lib/wine/odbc32.dll.so
lib/wine/odbccp32.dll.so
lib/wine/odbccu32.dll.so
%%WINE32%%lib/wine/ole2.dll16.so
%%WINE32%%lib/wine/ole2conv.dll16.so
%%WINE32%%lib/wine/ole2disp.dll16.so
%%WINE32%%lib/wine/ole2nls.dll16.so
%%WINE32%%lib/wine/ole2prox.dll16.so
%%WINE32%%lib/wine/ole2thk.dll16.so
lib/wine/ole32.dll.so
lib/wine/oleacc.dll.so
lib/wine/oleaut32.dll.so
%%WINE32%%lib/wine/olecli.dll16.so
lib/wine/olecli32.dll.so
lib/wine/oledb32.dll.so
lib/wine/oledlg.dll.so
lib/wine/olepro32.dll.so
%%WINE32%%lib/wine/olesvr.dll16.so
lib/wine/olesvr32.dll.so
lib/wine/olethk32.dll.so
lib/wine/oleview.exe.so

lib/wine/qmgrprxy.dll.so
lib/wine/quartz.dll.so
lib/wine/query.dll.so
%%WINE32%%lib/wine/rasapi16.dll16.so
lib/wine/rasapi32.dll.so
lib/wine/rasdlg.dll.so
lib/wine/reg.exe.so

lib/wine/rsaenh.dll.so
lib/wine/rstrtmgr.dll.so
lib/wine/rtutils.dll.so
%%WINE32%%lib/wine/rundll.exe16.so
lib/wine/rundll32.exe.so
lib/wine/samlib.dll.so
lib/wine/sane.ds.so

lib/wine/servicemodelreg.exe.so
lib/wine/services.exe.so
lib/wine/setupapi.dll.so
%%WINE32%%lib/wine/setupx.dll16.so
lib/wine/sfc.dll.so
lib/wine/sfc_os.dll.so
lib/wine/shdoclc.dll.so
lib/wine/shdocvw.dll.so
%%WINE32%%lib/wine/shell.dll16.so
lib/wine/shell32.dll.so
lib/wine/shfolder.dll.so
lib/wine/shlwapi.dll.so

lib/wine/slc.dll.so
lib/wine/snmpapi.dll.so
lib/wine/softpub.dll.so
%%WINE32%%lib/wine/sound.drv16.so
lib/wine/spoolss.dll.so
lib/wine/spoolsv.exe.so
lib/wine/start.exe.so

lib/wine/stdole2.tlb.so
lib/wine/stdole32.tlb.so
lib/wine/sti.dll.so
%%WINE32%%lib/wine/storage.dll16.so
%%WINE32%%lib/wine/stress.dll16.so
lib/wine/svchost.exe.so
lib/wine/svrapi.dll.so
lib/wine/sxs.dll.so
%%WINE32%%lib/wine/system.drv16.so
lib/wine/systeminfo.exe.so
lib/wine/t2embed.dll.so
lib/wine/tapi32.dll.so

lib/wine/taskmgr.exe.so
lib/wine/taskschd.dll.so
lib/wine/termsv.exe.so
%%WINE32%%lib/wine/toolhelp.dll16.so
lib/wine/traffic.dll.so
%%WINE32%%lib/wine/twain.dll16.so
lib/wine/twain_32.dll.so
%%WINE32%%lib/wine/typelib.dll16.so
lib/wine/unicows.dll.so
lib/wine/uninstaller.exe.so
lib/wine/unlodctr.exe.so

lib/wine/url.dll.so
lib/wine/urlmon.dll.so
lib/wine/usbd.sys.so
%%WINE32%%lib/wine/user.exe16.so
lib/wine/user32.dll.so
lib/wine/userenv.dll.so
lib/wine/usp10.dll.so

lib/wine/vcomp.dll.so
lib/wine/vcomp100.dll.so
lib/wine/vcomp90.dll.so
%%WINE32%%lib/wine/vdhcp.vxd.so
lib/wine/vdmdbg.dll.so
%%WINE32%%lib/wine/ver.dll16.so
lib/wine/version.dll.so
lib/wine/view.exe.so
%%WINE32%%lib/wine/vmm.vxd.so
%%WINE32%%lib/wine/vnbt.vxd.so
%%WINE32%%lib/wine/vnetbios.vxd.so
lib/wine/vssapi.dll.so
%%WINE32%%lib/wine/vtdapi.vxd.so
%%WINE32%%lib/wine/vwin32.vxd.so
%%WINE32%%lib/wine/w32skrnl.dll.so
%%WINE32%%lib/wine/w32sys.dll16.so
lib/wine/wbemdisp.dll.so
lib/wine/wbemprox.dll.so
lib/wine/webservices.dll.so

lib/wine/wevtapi.dll.so
lib/wine/wevtutil.exe.so
lib/wine/wiaservc.dll.so
%%WINE32%%lib/wine/win32s16.dll16.so
%%WINE32%%lib/wine/win87em.dll16.so
%%WINE32%%lib/wine/winaspi.dll16.so
%%WINE32%%lib/wine/windebug.dll16.so
lib/wine/windowscodecs.dll.so
lib/wine/windowscodecsext.dll.so
lib/wine/wineboot.exe.so

%%MPG123%%lib/wine/winemp3.acm.so
lib/wine/winepath.exe.so
lib/wine/wineps.drv.so
%%WINE32%%lib/wine/wineps16.drv16.so
%%WINE32%%lib/wine/winevdm.exe.so
%%X11%%lib/wine/winex11.drv.so
%%WINE32%%lib/wine/wing.dll16.so
lib/wine/wing32.dll.so
%%WINE32%%lib/wine/winhelp.exe16.so
lib/wine/winhlp32.exe.so
lib/wine/winhttp.dll.so
lib/wine/wininet.dll.so
lib/wine/winmm.dll.so
%%WINE32%%lib/wine/winnls.dll16.so
lib/wine/winnls32.dll.so
%%WINE32%%lib/wine/winoldap.mod16.so
lib/wine/winscard.dll.so
%%WINE32%%lib/wine/winsock.dll16.so
lib/wine/winspool.drv.so
lib/wine/winsta.dll.so
%%WINE32%%lib/wine/wintab.dll16.so
lib/wine/wintab32.dll.so
lib/wine/wintrust.dll.so
lib/wine/winver.exe.so

lib/wine/wmvcore.dll.so
lib/wine/wnaspi32.dll.so
lib/wine/wordpad.exe.so
%%WINE32%%lib/wine/wow32.dll.so
lib/wine/wpcap.dll.so
lib/wine/write.exe.so
lib/wine/ws2_32.dll.so

Return to bug 197798

Lines 42-48 Link Here

(-)Makefile (-3 / +22 lines)
42	.if !defined(USE_LDCONFIG32)	42	.if !defined(USE_LDCONFIG32)
43	USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine	43	USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine
44	.endif	44	.endif
45	ONLY_FOR_ARCHS= i386	45	ONLY_FOR_ARCHS= i386 amd64
46	USES= bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2	46	USES= bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2
47	SHEBANG_FILES= tools/make_requests tools/winemaker \	47	SHEBANG_FILES= tools/make_requests tools/winemaker \
48	tools/winedump/function_grep.pl	48	tools/winedump/function_grep.pl
Lines 103-110 Link Here
103	liblcms2.so:${PORTSDIR}/graphics/lcms2 \	103	liblcms2.so:${PORTSDIR}/graphics/lcms2 \
104	libpng.so:${PORTSDIR}/graphics/png	104	libpng.so:${PORTSDIR}/graphics/png
105		105
106	.include <bsd.port.options.mk>	106	.include <bsd.port.pre.mk>
107		107
		108	.if ${ARCH} == amd64
		109	# --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64.
		110	CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib
		111	PLIST_SUB+= WINE32="@comment " WINE64=""
		112
		113	.if ${COMPILER_TYPE} == clang
		114	CPPFLAGS+= -D__builtin_ms_va_list=__builtin_va_list \
		115	-D__builtin_ms_va_start=__builtin_va_start \
		116	-D__builtin_ms_va_end=__builtin_va_end \
		117	-D__builtin_ms_va_copy=__builtin_va_copy
		118	.endif
		119
		120	post-patch:
		121	${REINPLACE_CMD} 's\|/wine\|/wine64\|g' ${WRKSRC}/tools/wineapploader.in
		122
		123	.else
		124	PLIST_SUB+= WINE32="" WINE64="@comment "
		125	.endif
		126
108	.if ${PORT_OPTIONS:MCOMPHOLIO}	127	.if ${PORT_OPTIONS:MCOMPHOLIO}
109	MASTER_SITES+= https://github.com/compholio/wine-compholio-daily/archive/:cho	128	MASTER_SITES+= https://github.com/compholio/wine-compholio-daily/archive/:cho
110	COMP_DIST= v${DISTVERSION}.tar.gz	129	COMP_DIST= v${DISTVERSION}.tar.gz
Lines 135-138 Link Here
135	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg	154	${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg
136	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump	155	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump
137		156
138	.include <bsd.port.mk>	157	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-configure (+70 lines)
		1	commit 1625bb8e07d1dee8f0b6c98466e0185c7c7431be
		2	Author: David Naylor <naylor.b.david@gmail.com>
		3	Date: Tue Jan 20 21:55:03 2015 +0200
		4
		5	configure: explicitly set host_cpu for 'amd64'.
		6
		7	In the case of host starting with 'amd64', the host_cpu variable will not be
		8	set to the correct CPU value of 'x86_64'. Set it explicitly to the correct
		9	value.
		10
		11	diff --git a/configure b/configure
		12	index bc2f434..62b2ca3 100755
		13	--- configure
		14	+++ configure
		15	@@ -4912,6 +4912,7 @@ $as_echo "no" >&6; }
		16	fi
		17	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
		18	fi
		19	+ host_cpu="x86_64"
		20	TARGETFLAGS="-m64"
		21
		22	fi
		23	diff --git a/configure.ac b/configure.ac
		24	index db26333..9579245 100644
		25	--- configure.ac
		26	+++ configure.ac
		27	@@ -165,6 +165,7 @@ case $host in
		28	[AC_MSG_RESULT([no])
		29	AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])])
		30	fi
		31	+ host_cpu="x86_64"
		32	AC_SUBST(TARGETFLAGS,"-m64")
		33	fi
		34	;;
		35
		36	commit 0d268d62ad93ca1d1cf1c2fead43e2143b5529b3
		37	Author: David Naylor <naylor.b.david@gmail.com>
		38	Date: Tue Jan 20 17:54:38 2015 +0200
		39
		40	configure: recognise host starting in 'amd64'.
		41
		42	FreeBSD uses amd64 to identify a CPU architecture based on AMD's 64-bit
		43	instruction set.
		44
		45	diff --git a/configure b/configure
		46	index 0431209..bc2f434 100755
		47	--- configure
		48	+++ configure
		49	@@ -4852,7 +4852,7 @@ case $host in
		50	fi
		51	with_fontconfig=${with_fontconfig:-no}
		52	;;
		53	- x86_64*)
		54	+ x86_64\|amd64)
		55	if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
		56	then
		57	CC="$CC -m32"
		58	diff --git a/configure.ac b/configure.ac
		59	index a931730..db26333 100644
		60	--- configure.ac
		61	+++ configure.ac
		62	@@ -143,7 +143,7 @@ case $host in
		63	fi
		64	with_fontconfig=${with_fontconfig:-no}
65	;;
66	- x86_64*)
67	+ x86_64\|amd64)
68	if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
69	then
70	CC="$CC -m32"

Line 0 Link Here

(-)files/patch-dlls_kernel32_Makefile.in (+24 lines)
	1	commit 595a3ccfe8aa02ccc287f9a4b23a3f177ae220b9
	2	Author: David Naylor <naylor.b.david@gmail.com>
	3	Date: Mon Feb 2 22:10:55 2015 +0200
	4
	5	kernel32: force 4096 byte page alignment.
	6
	7	FreeBSD prefers to use a 0x200000 (super) page alignment however this causes
	8	the image base to be displaced from the requested 0x7b800000. Forcing a
	9	smaller page size ensures FreeBSD can place the image startin at 0x7b800000.
	10
	11	diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in
	12	index c09771d..a006c2c 100644
	13	--- dlls/kernel32/Makefile.in
	14	+++ dlls/kernel32/Makefile.in
	15	@@ -3,7 +3,8 @@ MODULE = kernel32.dll
	16	IMPORTLIB = kernel32
	17	IMPORTS = winecrt0 ntdll
	18	EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS)
	19	-EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000
	20	+EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 \
	21	+ -Wl,-z,max-page-size=0x1000
	22
	23	C_SRCS = \
	24	actctx.c \

Lines 4-10 Link Here

(-)pkg-plist (-150 / +171 lines)
4	bin/regedit	4	bin/regedit
5	bin/regsvr32	5	bin/regsvr32
6	bin/widl	6	bin/widl
7	bin/wine	7	%%WINE32%%bin/wine
		8	%%WINE64%%bin/wine64
8	bin/wineboot	9	bin/wineboot
9	bin/winebuild	10	bin/winebuild
10	bin/winecfg	11	bin/winecfg
Lines 156-162 Link Here
156	include/wine/windows/ctfutb.idl	157	include/wine/windows/ctfutb.idl
157	include/wine/windows/ctxtcall.h	158	include/wine/windows/ctxtcall.h
158	include/wine/windows/ctxtcall.idl	159	include/wine/windows/ctxtcall.idl
		160	%%COMPHOLIO%%include/wine/windows/cuda.h
159	include/wine/windows/custcntl.h	161	include/wine/windows/custcntl.h
		162	%%COMPHOLIO%%include/wine/windows/cuviddec.h
160	include/wine/windows/cvconst.h	163	include/wine/windows/cvconst.h
161	include/wine/windows/d2d1.h	164	include/wine/windows/d2d1.h
162	include/wine/windows/d2d1.idl	165	include/wine/windows/d2d1.idl
Lines 292-297 Link Here
292	include/wine/windows/dxgi1_2.idl	295	include/wine/windows/dxgi1_2.idl
293	include/wine/windows/dxgiformat.h	296	include/wine/windows/dxgiformat.h
294	include/wine/windows/dxgitype.h	297	include/wine/windows/dxgitype.h
		298	%%COMPHOLIO%%include/wine/windows/dxva.h
295	include/wine/windows/dxva2api.h	299	include/wine/windows/dxva2api.h
296	include/wine/windows/dxva2api.idl	300	include/wine/windows/dxva2api.idl
297	include/wine/windows/dyngraph.idl	301	include/wine/windows/dyngraph.idl
Lines 416-422 Link Here
416	include/wine/windows/mediaobj.idl	420	include/wine/windows/mediaobj.idl
417	include/wine/windows/metahost.h	421	include/wine/windows/metahost.h
418	include/wine/windows/metahost.idl	422	include/wine/windows/metahost.idl
419	%%COMPHOLIO%%include/wine/windows/mferror.h	423	include/wine/windows/mferror.h
420	include/wine/windows/midles.h	424	include/wine/windows/midles.h
421	include/wine/windows/mimeinfo.h	425	include/wine/windows/mimeinfo.h
422	include/wine/windows/mimeinfo.idl	426	include/wine/windows/mimeinfo.idl
Lines 501-506 Link Here
501	include/wine/windows/ntsecapi.h	505	include/wine/windows/ntsecapi.h
502	include/wine/windows/ntsecpkg.h	506	include/wine/windows/ntsecpkg.h
503	include/wine/windows/ntstatus.h	507	include/wine/windows/ntstatus.h