diff options
| author | Alexander Vereeken <Alexander88207@protonmail.com> | 2021-11-19 06:53:49 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2021-11-19 06:55:03 +0000 |
| commit | 056135a38ed91f3eff4fcd9578962fbd01d3a34b (patch) | |
| tree | 1218b34db4e5985d1fece4c248db7e4fa3de9864 /emulators/wine | |
| parent | sysutils/py-pkginfo: Update to 1.8.0 (diff) | |
emulators/i386-wine: Remove port.
This port and its pre-built binaries have not been updated lately and
emulators/wine is now providing i386 support on amd64, so remove the
i386-wine port.
Adjust CONFLICTS_INSTALL on related ports and simplify (and update both
user and developer documentation in emulators/wine).
PR: 259589
Differential Revision: https://reviews.freebsd.org/D32322
Diffstat (limited to 'emulators/wine')
| -rw-r--r-- | emulators/wine/Makefile | 22 | ||||
| -rw-r--r-- | emulators/wine/pkg-descr | 4 |
2 files changed, 7 insertions, 19 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 67e34d30302f..76c4f41c308a 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -27,7 +27,7 @@ USE_SDL= sdl2 CPE_VENDOR= winehq -CONFLICTS_INSTALL= wine-devel-[0-9]* i386-wine-[0-9]* +CONFLICTS_INSTALL= wine-devel-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose \ @@ -120,22 +120,16 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libvulkan.so:graphics/vulkan-loader \ libvkd3d.so:graphics/vkd3d -# Include this only if it has not been already included by the -# i386-wine slave port. -.ifndef WINE_SLAVE_BUILD .include <bsd.port.pre.mk> -.endif .if ${ARCH} == amd64 # Wine is composed of three parts: -# - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386) -# - wine64 (aka this part of this port) is the 64-bit component and runs 64-bit programs -# (on FreeBSD/amd64) -# - wow64 (a subset of emulators/i386-wine-devel) is a part of the 64-bit component that runs -# 32-bit programs (on FreeBSD/amd64) -# We also currently have: -# - "wine32" (aka emulators/i386-wine-devel) is the 32-bit component and runs 32-bit programs -# (on FreeBSD/amd64). This will be superseded by wow64. +# - wine (aka this port on FreeBSD/i386) is the 32-bit component +# and runs 32-bit programs. +# - wine64 (aka this part of this port on FreeBSD/amd64) is the +# 64-bit component and runs 64-bit programs. +# - wow64 (aka this port built on FreeBSD/i386) is a part of the +# 64-bit component [wine64] that runs 32-bit programs on FreeBSD/amd64. # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64. CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib @@ -174,6 +168,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump -.ifndef WINE_SLAVE_BUILD .include <bsd.port.post.mk> -.endif diff --git a/emulators/wine/pkg-descr b/emulators/wine/pkg-descr index ae9a3dfc4506..9ce4f4c2d871 100644 --- a/emulators/wine/pkg-descr +++ b/emulators/wine/pkg-descr @@ -7,10 +7,6 @@ a similar look and feel to other applications on your desktop. Many applications already work, more or less, including versions of Microsoft Office and many games. -Use this port for 32-bit Windows binaries in an i386 environment or -64-bit Windows binaries in an amd64 environment; use emulators/i386-wine -for 32-bit Windows binaries in an amd64 environment. - If you receive a message of "Did you reconfigure your kernel with "options USER_LDT"?" add the line machdep.max_ldt_segment="2048" |