From nobody Fri Nov 19 06:55:51 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 415931893DCD; Fri, 19 Nov 2021 06:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HwS9h1KCVz3pZ5; Fri, 19 Nov 2021 06:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 094E423F16; Fri, 19 Nov 2021 06:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AJ6tpKS023044; Fri, 19 Nov 2021 06:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AJ6tppx023043; Fri, 19 Nov 2021 06:55:51 GMT (envelope-from git) Date: Fri, 19 Nov 2021 06:55:51 GMT Message-Id: <202111190655.1AJ6tppx023043@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 056135a38ed9 - main - emulators/i386-wine: Remove port. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 056135a38ed91f3eff4fcd9578962fbd01d3a34b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=056135a38ed91f3eff4fcd9578962fbd01d3a34b commit 056135a38ed91f3eff4fcd9578962fbd01d3a34b Author: Alexander Vereeken AuthorDate: 2021-11-19 06:53:49 +0000 Commit: Gerald Pfeifer CommitDate: 2021-11-19 06:55:03 +0000 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 --- MOVED | 1 + emulators/Makefile | 1 - emulators/i386-wine/Makefile | 41 - emulators/i386-wine/Makefile.amd64 | 52 - emulators/i386-wine/Makefile.i386 | 88 - emulators/i386-wine/distinfo | 9 - emulators/i386-wine/files/binbounce | 26 - emulators/i386-wine/files/nvidia.sh | 168 -- emulators/i386-wine/files/pkg-install | 47 - emulators/i386-wine/files/pkg-message.in | 33 - emulators/i386-wine/pkg-descr | 15 - emulators/i386-wine/pkg-plist | 3469 ------------------------------ emulators/wine-devel/Makefile | 2 +- emulators/wine/Makefile | 22 +- emulators/wine/pkg-descr | 4 - 15 files changed, 9 insertions(+), 3969 deletions(-) diff --git a/MOVED b/MOVED index d3ab2c5e2fac..52374760f0ba 100644 --- a/MOVED +++ b/MOVED @@ -16599,3 +16599,4 @@ multimedia/celluloid-devel|multimedia/celluloid|2021-11-05|Out of date: use mult devel/zmusic|audio/zmusic|2021-11-10|Category change emulators/i386-wine-devel||2021-11-16|Removed: obsolete, emulators/wine-devel provides i386 support emulators/qemu52|emulators/qemu5|2021-11-16|Has expired +emulators/i386-wine||2021-11-19|Removed: obsolete, emulators/wine provides i386 support diff --git a/emulators/Makefile b/emulators/Makefile index 57589162e84b..ea5b9addf8b8 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -44,7 +44,6 @@ SUBDIR += higan SUBDIR += hugo SUBDIR += hv_kvp_cmd - SUBDIR += i386-wine SUBDIR += ines SUBDIR += javatari SUBDIR += joytran diff --git a/emulators/i386-wine/Makefile b/emulators/i386-wine/Makefile deleted file mode 100644 index 3e233117c868..000000000000 --- a/emulators/i386-wine/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Created by: David Naylor (dbn@FreeBSD.org) - -# 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) - -PORTNAME= wine -# define a dummy DISTVERSION to avoid errors with poudriere bulk -a -# on architectures unsupported by this port -DISTVERSION?= 0 -# define PORTREVISION with ?= to allow it to be overriden by -# wine's PORTREVISION when cross building -PORTREVISION= 0 -PKGNAMEPREFIX= i386- -CATEGORIES= emulators - -MAINTAINER= Alexander88207@protonmail.com -COMMENT= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD - -ONLY_FOR_ARCHS= i386 amd64 - -CONFLICTS_INSTALL= wine-[0-9]* wine-devel-[0-9]* - -USES= cpe -CPE_VENDOR= winehq - -PKGINSTALL= ${.CURDIR}/files/pkg-install -PKGDEINSTALL= ${PKGINSTALL} - -distinfo-update: - ${RM} ${.CURDIR}/distinfo ${.CURDIR}/distinfo~ -.for osrel in 12 13 14 - ${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} - ${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} - ${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~ - ${RM} ${.CURDIR}/distinfo -.endfor - ${SED} -e '2,$${' -e '/^TIMESTAMP/d' -e '}' distinfo~ > ${.CURDIR}/distinfo - ${RM} ${.CURDIR}/distinfo~ - -.include diff --git a/emulators/i386-wine/Makefile.amd64 b/emulators/i386-wine/Makefile.amd64 deleted file mode 100644 index ef26a0c2e029..000000000000 --- a/emulators/i386-wine/Makefile.amd64 +++ /dev/null @@ -1,52 +0,0 @@ -# Created by: David Naylor - -DISTVERSION= 6.0.1 -PORTEPOCH= 1 -MASTER_SITES= http://Alexander88207.de/Homura/Winebuilds/${DIST_SUBDIR}/ -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} -DIST_SUBDIR= FreeBSD:${OSREL:C/\..*//}:amd64 - -LICENSE= LGPL21 LGPL3 -LICENSE_COMB= dual -LICENSE_FILE= ${WRKDIR}/LICENSE - -EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ - --exclude +MTREE_DIRS --exclude share/licenses/'*' \ - --exclude libdata/ldconfig32/${PKGNAMEPREFIX}${PORTNAME} \ - -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' -NO_BUILD= yes -SUB_FILES= pkg-message -USE_LDCONFIG32= ${PREFIX}/lib32 ${PREFIX}/lib32/wine -USES+= desktop-file-utils tar:txz -BUNDLE_LIBS= yes -PKGMESSAGE= ${WRKDIR}/pkg-message -PORTSCOUT= limitw:1,even - -.for osrel in 12 13 14 -.if ${OSREL:C/\..*//} == ${osrel} -PLIST_SUB+= OSREL${osrel}="" -PLIST_SUB+= NOOSREL${osrel}="@comment " -.else -PLIST_SUB+= OSREL${osrel}="@comment " -PLIST_SUB+= NOOSREL${osrel}="" -.endif -.endfor - -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400024)) -IGNORE= binaries compiled for FreeBSD 12.2+, 13.0+ & 14.0+ only -.endif - -OPTIONS_DEFINE= GECKO MONO -GECKO_DESC= Bundle Gecko MSI package for Wine -MONO_DESC= Bundle Mono MSI package for Wine - -GECKO_RUN_DEPENDS= wine-gecko>0:emulators/wine-gecko -MONO_RUN_DEPENDS= wine-mono>0:emulators/wine-mono - -do-extract: - @${RM} -r ${WRKDIR} - @${MKDIR} ${WRKDIR} - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/[^/]*/LICENSE' -s '|/usr/local/share/licenses/[^/]*/||g' - -do-install: - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} diff --git a/emulators/i386-wine/Makefile.i386 b/emulators/i386-wine/Makefile.i386 deleted file mode 100644 index 6efb95bfdfed..000000000000 --- a/emulators/i386-wine/Makefile.i386 +++ /dev/null @@ -1,88 +0,0 @@ -# Created by: David Naylor - -# Use the wine port to do most of the heavy lifting -MASTERDIR= ${.CURDIR}/../wine - -RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri - -ACTUAL-PACKAGE-DEPENDS= ${DO_NADA} -WINELIBDIR= ${PREFIX}/lib32 -CONFIGURE_ARGS+= --bindir=${PREFIX}/bin32 --libdir=${WINELIBDIR} -PLIST_REINPLACE+= winelib -PLIST_REINPLACE_WINELIB= s!lib/!lib32/!g -WINE_SLAVE_BUILD= yes -USE_LDCONFIG32= ${WINELIBDIR} ${WINELIBDIR}/wine -BUNDLE_LIBS= yes - -.if !defined(WINE_CROSS_BUILD) -IGNORE= This port is not for consumption on FreeBSD/i386. To cross-build for FreeBSD/amd64: make -DWINE_CROSS_BUILD -.endif - -# Hook into post-install and do some adapting to make i386 binaries work nicely -# under FreeBSD/amd64 -post-install-script: - # Fix pkg-plist references - ${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST} - # Install bounce script to access the 32-bit executables - ${INSTALL_SCRIPT} ${.CURDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine - for i in `${GREP} ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ - [ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \ - ${ECHO_CMD} bin32/$${i} >> ${TMPPLIST} ; \ - done - # Install libGL - ${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri - ${INSTALL_DATA} ${LOCALBASE}/lib/libGL.so.1 ${STAGEDIR}${PREFIX}/lib32/.libGL/ - ${ECHO_CMD} lib32/.libGL/libGL.so.1 >> ${TMPPLIST} - # Install dri libraries (internal libGL requirements) - for i in ${LOCALBASE}/lib/dri/*.so; do \ - ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri/ ; \ - ${ECHO_CMD} lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ - done - # Find all soft dependencies (via strings(1)) - ${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} ${STAGEDIR}${PREFIX}/lib32/ ; \ - ${ECHO_CMD} lib32/$${i} >> ${TMPPLIST} ; \ - fi ; \ - done - # Find all libraries that are linked too (via ldd(1)) - ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ - ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | \ - 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 [ -z "`${GREP} $${i##*/} ${TMPPLIST}`" ]; then \ - ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ - ${ECHO_CMD} lib32/$${i##*/} >> ${TMPPLIST} ; \ - fi ; \ - done - # Install missing libraries that dont have been caught - ${INSTALL_DATA} ${LOCALBASE}/lib/libGLX_mesa.so.0 ${STAGEDIR}${PREFIX}/lib32 - ${INSTALL_DATA} ${LOCALBASE}/lib/libX11-xcb.so.1 ${STAGEDIR}${PREFIX}/lib32 - ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-dri2.so.0 ${STAGEDIR}${PREFIX}/lib32 - ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-dri3.so.0 ${STAGEDIR}${PREFIX}/lib32 - ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-glx.so.0 ${STAGEDIR}${PREFIX}/lib32 - ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-present.so.0 ${STAGEDIR}${PREFIX}/lib32 - ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-sync.so.1 ${STAGEDIR}${PREFIX}/lib32 - ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-xfixes.so.0 ${STAGEDIR}${PREFIX}/lib32 - ${INSTALL_DATA} ${LOCALBASE}/lib/libXdamage.so.1 ${STAGEDIR}${PREFIX}/lib32 - ${INSTALL_DATA} ${LOCALBASE}/lib/libxshmfence.so.1 ${STAGEDIR}${PREFIX}/lib32 - ${ECHO_CMD} lib32/libGLX_mesa.so.0 >> ${TMPPLIST} - ${ECHO_CMD} lib32/libX11-xcb.so.1 >> ${TMPPLIST} - ${ECHO_CMD} lib32/libxcb-dri2.so.0 >> ${TMPPLIST} - ${ECHO_CMD} lib32/libxcb-dri3.so.0 >> ${TMPPLIST} - ${ECHO_CMD} lib32/libxcb-glx.so.0 >> ${TMPPLIST} - ${ECHO_CMD} lib32/libxcb-present.so.0 >> ${TMPPLIST} - ${ECHO_CMD} lib32/libxcb-sync.so.1 >> ${TMPPLIST} - ${ECHO_CMD} lib32/libxcb-xfixes.so.0 >> ${TMPPLIST} - ${ECHO_CMD} lib32/libXdamage.so.1 >> ${TMPPLIST} - ${ECHO_CMD} lib32/libxshmfence.so.1 >> ${TMPPLIST} - # Install nvidia patching script - ${INSTALL_SCRIPT} ${.CURDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh - ${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} - -.include "${MASTERDIR}/Makefile" diff --git a/emulators/i386-wine/distinfo b/emulators/i386-wine/distinfo deleted file mode 100644 index e4a4ddd3d97d..000000000000 --- a/emulators/i386-wine/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -TIMESTAMP = 1626616290 -SHA256 (FreeBSD:11:amd64/i386-wine-6.0.1,1.txz) = d1bb3d83ad62fbd47f4b3448a7d26e37008822eecee2b1c633cfee815881bc87 -SIZE (FreeBSD:11:amd64/i386-wine-6.0.1,1.txz) = 98339760 -SHA256 (FreeBSD:12:amd64/i386-wine-6.0.1,1.txz) = 745b4f9e82db1a675288beea3da48aa1961b30d2c8ba08f8dd3e9441bbb104fa -SIZE (FreeBSD:12:amd64/i386-wine-6.0.1,1.txz) = 98699908 -SHA256 (FreeBSD:13:amd64/i386-wine-6.0.1,1.txz) = 01633ca6f07a8471792172e7b82a6618d104678e117e4b8194efa428430293e7 -SIZE (FreeBSD:13:amd64/i386-wine-6.0.1,1.txz) = 99157636 -SHA256 (FreeBSD:14:amd64/i386-wine-6.0.1,1.txz) = 25d2e7994e9477bea92f3091d257a0c24dbc4ee824eefe7d6bc4dcc602746565 -SIZE (FreeBSD:14:amd64/i386-wine-6.0.1,1.txz) = 100871384 diff --git a/emulators/i386-wine/files/binbounce b/emulators/i386-wine/files/binbounce deleted file mode 100644 index 41aea0673d3f..000000000000 --- a/emulators/i386-wine/files/binbounce +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# Workaround for https://bugs.winehq.org/show_bug.cgi?id=50257 -export LD_32_BIND_NOW=1 - -TARGET="`realpath $0`" - -LOCALBASE=${TARGET%/*}/.. -BINNAME=${TARGET##*/} - -if [ -z "$__BINBOUNCE_BOOTSTRAP" ] -then - export LIBGL_DRIVERS_PATH=$LOCALBASE/lib32/dri - if [ `uname -p` = i386 ] - then - export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL" - export LD_LIBRARY_PATH_RPATH=y - else - export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL":/usr/lib32 - export LD_32_LIBRARY_PATH_RPATH=y - fi - export PATH="$LOCALBASE/bin32":"$PATH" - export __BINBOUNCE_BOOTSTRAP="1" -fi - -exec "$LOCALBASE/bin32/$BINNAME" "$@" diff --git a/emulators/i386-wine/files/nvidia.sh b/emulators/i386-wine/files/nvidia.sh deleted file mode 100644 index 9d64ee9f8757..000000000000 --- a/emulators/i386-wine/files/nvidia.sh +++ /dev/null @@ -1,168 +0,0 @@ -#!/bin/sh -# Copyright 2010 to 2015 David Naylor -# Copyright 2012 Jan Beich -# Copyright 2020 Lorenzo Salvadore -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY David Naylor ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL David Naylor OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# The views and conclusions contained in the software and documentation are -# those of the authors and should not be interpreted as representing official -# policies, either expressed or implied, of David Naylor. - -set -e - -PORTSDIR=${PORTSDIR:-/usr/ports} -PREFIX=${PREFIX:-/usr/local} -DISTDIR=${DISTDIR:-${PORTSDIR}/distfiles} - -if [ -d $DISTDIR ] -then - cd $DISTDIR - NO_REMOVE_NVIDIA="yes" -else - cd /tmp/ -fi - -terminate() { - - echo "!!! $2 !!!" - echo "Terminating..." - exit $1 - -} - -args=`getopt dn $*` -if [ $? -ne 0 ] -then - echo "Usage: $0 [-n]" - exit 7 -fi -set -- $args -while true -do - case $1 in - -d) - rm -f ${PREFIX}/lib32/libGL.so.1 - rm -f ${PREFIX}/lib32/libGLcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1 - rm -f ${PREFIX}/lib32/libnvidia-glcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1 - rm -rf ${PREFIX}/lib32/.nvidia/ - exit 0 - ;; - -n) - NO_FETCH=yes - ;; - --) - shift - break - ;; - esac - shift -done - -version() { - local ret pkg="$1" - if [ -f "/usr/local/sbin/pkg" ] - then - ret=`pkg query -g '%v' "$pkg" || true` - fi - - # installed manually or failed to register - if [ -z "$ret" ] && [ "$pkg" = "nvidia-driver*" ] - then - ret=`sed -n "s/.*Version: //p" 2> /dev/null \ - $PREFIX/share/doc/NVIDIA_GLX-1.0/README || true` - fi - echo "$ret" -} - -[ `whoami` = root ] \ - || terminate 254 "This script should be run as root" - -echo "===> Patching i386-wine to work with x11/nvidia-driver:" - -if [ -z "${WINE}" ] -then - WINE=`version 'i386-wine*'` -fi -[ -n "$WINE" ] \ - || terminate 255 "Unable to detect i386-wine, please install first" -echo "=> Detected i386-wine: ${WINE}" - -NV=`version 'nvidia-driver*'` -[ -n "$NV" ] \ - || terminate 1 "Unable to detect nvidia-driver, please install first" -echo "=> Detected nvidia-driver: ${NV}" - -NVIDIA=${NV} -NV=`echo ${NV} | cut -f 1 -d _ | cut -f 1 -d ,` - -if [ ! "$(pkg version -t ${NV} 440.59)" == "<" ] -then - terminate 0 "nvidia-driver 440.59+ already includes 32-bit drivers: nothing to do" -fi - -if [ ! -f NVIDIA-FreeBSD-x86-${NV}.tar.gz ] || !(tar -tf NVIDIA-FreeBSD-x86-${NV}.tar.gz > /dev/null 2>&1) -then - [ -n "$NO_FETCH" ] \ - && terminate 8 "NVIDIA-FreeBSD-x86-${NV}.tar.gz unavailable" - echo "=> Downloading NVIDIA-FreeBSD-x86-${NV}.tar.gz from https://download.nvidia.com..." - rm -f NVIDIA-FreeBSD-x86-${NV}.tar.gz - fetch -aRr https://download.nvidia.com/XFree86/FreeBSD-x86/${NV}/NVIDIA-FreeBSD-x86-${NV}.tar.gz \ - || terminate 2 "Failed to download NVIDIA-FreeBSD-x86-${NV}.tar.gz" - echo "=> Downloaded NVIDIA-FreeBSD-x86-${NV}.tar.gz" - echo "Please check the following information against /usr/ports/x11/nvidia-driver/distinfo" - sha256 NVIDIA-FreeBSD-x86-${NV}.tar.gz - echo "SIZE (NVIDIA-FreeBSD-x86-${NV}.tar.gz) = `stat -f "%z" NVIDIA-FreeBSD-x86-${NV}.tar.gz`" -fi - -echo "=> Extracting NVIDIA-FreeBSD-x86-${NV}.tar.gz to $PREFIX/lib32..." -EXTRACT_LIST="libGL.so.1" -case $NV in - 195*|173*|96*|71*) - EXTRACT_LIST="$EXTRACT_LIST libGLcore.so.1 libnvidia-tls.so.1" - ;; - *) - EXTRACT_LIST="$EXTRACT_LIST libnvidia-glcore.so.1 libnvidia-tls.so.1" - ;; -esac - -EXTRACT_ARGS="--no-same-owner --no-same-permissions --strip-components 2 -C $PREFIX/lib32" -for i in $EXTRACT_LIST -do - EXTRACT_ARGS="$EXTRACT_ARGS --include NVIDIA-FreeBSD-x86-${NV}/obj/$i" -done -umask 0333 -tar $EXTRACT_ARGS -xvf NVIDIA-FreeBSD-x86-${NV}.tar.gz \ - || terminate 3 "Failed to extract NVIDIA-FreeBSD-x86-${NV}.tar.gz" -mkdir -m 0755 -p ${PREFIX}/lib32/.nvidia \ - || terminate 9 "Failed to create .nvidia shadow directory" -mv ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/.nvidia/ \ - || terminate 10 "Failed to move libGL.so.1 to .nvidia/ shadow directory" -ln -s .nvidia/libGL.so.1 ${PREFIX}/lib32/libGL.so.1 \ - || terminate 11 "Failed to link to .nvidia/libGL.so.1 in the shadow directory" - -echo "=> Cleaning up..." -[ -n "$NO_REMOVE_NVIDIA" ] || rm -vf NVIDIA-FreeBSD-x86-${NV}.tar.gz \ - || terminate 6 "Failed to remove files" - -echo "===> i386-wine-${WINE} successfully patched for nvidia-driver-${NVIDIA}" diff --git a/emulators/i386-wine/files/pkg-install b/emulators/i386-wine/files/pkg-install deleted file mode 100644 index 2fbe34b087d6..000000000000 --- a/emulators/i386-wine/files/pkg-install +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -export PREFIX=${PKG_PREFIX:-/usr/local} -export WINE=$1 - -LIBGLDIR=.libGL - -case "$2" in - DEINSTALL) - sh ${PREFIX}/share/wine/patch-nvidia.sh -d - rm -r ${PREFIX}/lib32/dri - ;; - POST-INSTALL) - mkdir -p ${PREFIX}/lib32/dri - for dri in $(cd ${PREFIX}/lib32/${LIBGLDIR}/dri/; echo *.so) - do - ln -s ../${LIBGLDIR}/dri/${dri} ${PREFIX}/lib32/dri/${dri} - done - sh ${PREFIX}/share/wine/patch-nvidia.sh -n > /dev/null 2>&1 - case $? in - 0) - cat << _EOF -$1 has been patched for use with nvidia graphics driver. If -the version of the installed nvidia graphics driver changes execute (as root): -_EOF - ;; - 1) - cat << _EOF -This system does not appear to use a nvidia graphics driver. If this changes -and then every time the driver's version changes execute (as root) -_EOF - ;; - *) - cat << _EOF -A NVIDIA GRAPHICS DRIVER HAS BEEN DETECTED ON THIS SYSTEM AND THE AUTOMATED -PATCHING HAS FAILED, execute (as root) -_EOF - ;; - esac - cat << _EOF - sh ${PREFIX}/share/wine/patch-nvidia.sh -to get 2D/3D acceleration to work with the nvidia driver. Without this wine -will crash when a program requires 2D/3D graphics acceleration. - -_EOF - ;; -esac diff --git a/emulators/i386-wine/files/pkg-message.in b/emulators/i386-wine/files/pkg-message.in deleted file mode 100644 index c6fb44de8327..000000000000 --- a/emulators/i386-wine/files/pkg-message.in +++ /dev/null @@ -1,33 +0,0 @@ -[ -{ type: install - message: < - -If you have any issues [or even need help to run an application] dont fear to create an issue or ask him via E-Mail, in forums or Discord. - -Have Fun! ---- -EOM -} -] diff --git a/emulators/i386-wine/pkg-descr b/emulators/i386-wine/pkg-descr deleted file mode 100644 index 5883d6fc3074..000000000000 --- a/emulators/i386-wine/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Wine is a Microsoft Windows compatibility layer (or program loader) -capable of running Windows applications on i386 and compatible CPUs. -Windows programs running in Wine act as native programs would, running -without the performance or memory usage penalties of an emulator, with -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. - -If you receive a message of "Did you reconfigure your kernel with -"options USER_LDT"?" add the line - machdep.max_ldt_segment="2048" -to /boot/loader.conf and reboot. - -WWW: https://www.winehq.org diff --git a/emulators/i386-wine/pkg-plist b/emulators/i386-wine/pkg-plist deleted file mode 100644 index 370366b6576c..000000000000 --- a/emulators/i386-wine/pkg-plist +++ /dev/null @@ -1,3469 +0,0 @@ -bin/function_grep.pl -bin/msidb -bin/msiexec -bin/notepad -bin/regedit -bin/regsvr32 -bin/widl -bin/wine -bin/wineboot -bin/winebuild -bin/winecfg -bin/wineconsole -bin/winecpp -bin/winedbg -bin/winedump -bin/winefile -bin/wineg++ -bin/winegcc -bin/winemaker -bin/winemine -bin/winepath -bin/wineserver -bin/wmc -bin/wrc -bin32/function_grep.pl -bin32/msidb -bin32/msiexec -bin32/notepad -bin32/regedit -bin32/regsvr32 -bin32/widl -bin32/wine -bin32/wineboot -bin32/winebuild -bin32/winecfg -bin32/wineconsole -bin32/winecpp -bin32/winedbg -bin32/winedump -bin32/winefile -bin32/wineg++ -bin32/winegcc -bin32/winemaker -bin32/winemine -bin32/winepath -bin32/wineserver -bin32/wmc -bin32/wrc -include/wine/debug.h -include/wine/exception.h -include/wine/itss.h -include/wine/itss.idl -include/wine/msvcrt/assert.h -include/wine/msvcrt/complex.h -include/wine/msvcrt/conio.h -include/wine/msvcrt/corecrt.h -include/wine/msvcrt/corecrt_io.h -include/wine/msvcrt/corecrt_startup.h -include/wine/msvcrt/corecrt_stdio_config.h -include/wine/msvcrt/corecrt_wctype.h -include/wine/msvcrt/corecrt_wdirect.h -include/wine/msvcrt/corecrt_wio.h -include/wine/msvcrt/corecrt_wprocess.h -include/wine/msvcrt/corecrt_wstdio.h -include/wine/msvcrt/corecrt_wstdlib.h -include/wine/msvcrt/corecrt_wstring.h -include/wine/msvcrt/corecrt_wtime.h -include/wine/msvcrt/crtdbg.h -include/wine/msvcrt/crtdefs.h -include/wine/msvcrt/ctype.h -include/wine/msvcrt/direct.h -include/wine/msvcrt/dirent.h -include/wine/msvcrt/dos.h -include/wine/msvcrt/eh.h -include/wine/msvcrt/errno.h -include/wine/msvcrt/fcntl.h -include/wine/msvcrt/fenv.h -include/wine/msvcrt/float.h -include/wine/msvcrt/fpieee.h -include/wine/msvcrt/intrin.h -include/wine/msvcrt/inttypes.h -include/wine/msvcrt/io.h -include/wine/msvcrt/limits.h -include/wine/msvcrt/locale.h -include/wine/msvcrt/malloc.h -include/wine/msvcrt/math.h -include/wine/msvcrt/mbctype.h -include/wine/msvcrt/mbstring.h -include/wine/msvcrt/memory.h -include/wine/msvcrt/process.h -include/wine/msvcrt/search.h -include/wine/msvcrt/setjmp.h -include/wine/msvcrt/share.h -include/wine/msvcrt/signal.h -include/wine/msvcrt/stdbool.h -include/wine/msvcrt/stddef.h -include/wine/msvcrt/stdint.h -include/wine/msvcrt/stdio.h -include/wine/msvcrt/stdlib.h -include/wine/msvcrt/string.h -include/wine/msvcrt/sys/locking.h -include/wine/msvcrt/sys/stat.h -include/wine/msvcrt/sys/timeb.h -include/wine/msvcrt/sys/types.h -include/wine/msvcrt/sys/unistd.h -include/wine/msvcrt/sys/utime.h -include/wine/msvcrt/time.h -include/wine/msvcrt/uchar.h -include/wine/msvcrt/unistd.h -include/wine/msvcrt/wchar.h -include/wine/msvcrt/wctype.h -include/wine/svcctl.h -include/wine/svcctl.idl -include/wine/windows/accctrl.h -include/wine/windows/access.idl -include/wine/windows/aclapi.h -include/wine/windows/aclui.h -include/wine/windows/activation.h -include/wine/windows/activation.idl -include/wine/windows/activaut.h -include/wine/windows/activaut.idl -include/wine/windows/activdbg.h -include/wine/windows/activdbg.idl -include/wine/windows/activscp.h -include/wine/windows/activscp.idl -include/wine/windows/adserr.h -include/wine/windows/adshlp.h -include/wine/windows/advpub.h -include/wine/windows/af_irda.h -include/wine/windows/amaudio.h -include/wine/windows/amsi.h -include/wine/windows/amsi.idl -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/appmodel.h -include/wine/windows/asferr.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/atlcom.h -include/wine/windows/atliface.h -include/wine/windows/atliface.idl -include/wine/windows/atlthunk.h -include/wine/windows/atlwin.h -include/wine/windows/audevcod.h -include/wine/windows/audioclient.h -include/wine/windows/audioclient.idl -include/wine/windows/audiopolicy.h -include/wine/windows/audiopolicy.idl -include/wine/windows/audiosessiontypes.h -include/wine/windows/austream.h -include/wine/windows/austream.idl -include/wine/windows/authz.h -include/wine/windows/aviriff.h -include/wine/windows/avrt.h -include/wine/windows/axcore.idl -include/wine/windows/axextend.idl -include/wine/windows/axextendenums.h -include/wine/windows/basetsd.h -include/wine/windows/basetyps.h -include/wine/windows/bcrypt.h -include/wine/windows/bdaiface.h -include/wine/windows/bdaiface.idl -include/wine/windows/bdaiface_enums.h -include/wine/windows/bdatypes.h -include/wine/windows/binres.idl -include/wine/windows/bits.h -include/wine/windows/bits.idl -include/wine/windows/bits1_5.h -include/wine/windows/bits1_5.idl -include/wine/windows/bits2_0.h -include/wine/windows/bits2_0.idl -include/wine/windows/bits2_5.h -include/wine/windows/bits2_5.idl -include/wine/windows/bits3_0.h -include/wine/windows/bits3_0.idl -include/wine/windows/bits5_0.h -include/wine/windows/bits5_0.idl -include/wine/windows/bitsmsg.h -include/wine/windows/bluetoothapis.h -include/wine/windows/bthsdpdef.h -include/wine/windows/cderr.h -include/wine/windows/cdosys.h -include/wine/windows/cdosys.idl -include/wine/windows/cfg.h -include/wine/windows/cfgmgr32.h -include/wine/windows/cguid.h -include/wine/windows/chprst.idl -include/wine/windows/cierror.h -include/wine/windows/clusapi.h -include/wine/windows/cmdbas.idl -include/wine/windows/cmdpre.idl -include/wine/windows/cmdprp.idl -include/wine/windows/cmdstrm.idl -include/wine/windows/cmdtxt.idl -include/wine/windows/cmnquery.h -include/wine/windows/cmnquery.idl -include/wine/windows/codecapi.h -include/wine/windows/colinf.idl -include/wine/windows/colordlg.h -include/wine/windows/comcat.h -include/wine/windows/comcat.idl -include/wine/windows/commctrl.h -include/wine/windows/commctrl.rh -include/wine/windows/commdlg.h -include/wine/windows/commoncontrols.h -include/wine/windows/commoncontrols.idl -include/wine/windows/compobj.h -include/wine/windows/comsvcs.h -include/wine/windows/comsvcs.idl -include/wine/windows/consoleapi.h -include/wine/windows/control.h -include/wine/windows/control.idl -include/wine/windows/cor.h -include/wine/windows/cor.idl -include/wine/windows/cordebug.h -include/wine/windows/cordebug.idl -include/wine/windows/corerror.h -include/wine/windows/corhdr.h -include/wine/windows/cpl.h -include/wine/windows/crtrow.idl -include/wine/windows/cryptdlg.h -include/wine/windows/cryptuiapi.h -include/wine/windows/ctfutb.h -include/wine/windows/ctfutb.idl -include/wine/windows/ctxtcall.h -include/wine/windows/ctxtcall.idl -include/wine/windows/custcntl.h -include/wine/windows/cvconst.h -include/wine/windows/cvttyp.idl -include/wine/windows/d2d1.h -include/wine/windows/d2d1.idl -include/wine/windows/d2d1_1.h -include/wine/windows/d2d1_1.idl -include/wine/windows/d2d1_2.h -include/wine/windows/d2d1_2.idl -include/wine/windows/d2dbasetypes.h -include/wine/windows/d2derr.h -include/wine/windows/d3d.h -include/wine/windows/d3d10.h -include/wine/windows/d3d10.idl -include/wine/windows/d3d10_1.h -include/wine/windows/d3d10_1.idl -include/wine/windows/d3d10_1shader.h -include/wine/windows/d3d10effect.h -include/wine/windows/d3d10misc.h -include/wine/windows/d3d10sdklayers.h -include/wine/windows/d3d10sdklayers.idl -include/wine/windows/d3d10shader.h -include/wine/windows/d3d11.h -include/wine/windows/d3d11.idl -include/wine/windows/d3d11_1.h -include/wine/windows/d3d11_1.idl -include/wine/windows/d3d11_2.h -include/wine/windows/d3d11_2.idl -include/wine/windows/d3d11_3.h -include/wine/windows/d3d11_3.idl -include/wine/windows/d3d11_4.h -include/wine/windows/d3d11_4.idl -include/wine/windows/d3d11on12.h -include/wine/windows/d3d11on12.idl -include/wine/windows/d3d11sdklayers.h -include/wine/windows/d3d11sdklayers.idl -include/wine/windows/d3d11shader.h -include/wine/windows/d3d12.h -include/wine/windows/d3d12.idl -include/wine/windows/d3d12sdklayers.h -include/wine/windows/d3d12sdklayers.idl -include/wine/windows/d3d12shader.h -include/wine/windows/d3d12shader.idl -include/wine/windows/d3d8.h -include/wine/windows/d3d8caps.h -include/wine/windows/d3d8types.h -include/wine/windows/d3d9.h -include/wine/windows/d3d9caps.h -include/wine/windows/d3d9types.h -include/wine/windows/d3dcaps.h -include/wine/windows/d3dcommon.h -include/wine/windows/d3dcommon.idl -include/wine/windows/d3dcompiler.h -include/wine/windows/d3dhal.h -include/wine/windows/d3dkmdt.h -include/wine/windows/d3drm.h -include/wine/windows/d3drmdef.h -include/wine/windows/d3drmobj.h -include/wine/windows/d3drmwin.h -include/wine/windows/d3dtypes.h -include/wine/windows/d3dukmdt.h -include/wine/windows/d3dvec.inl -include/wine/windows/d3dx10.h -include/wine/windows/d3dx10async.h -include/wine/windows/d3dx10core.h -include/wine/windows/d3dx10core.idl -include/wine/windows/d3dx10math.h -include/wine/windows/d3dx10tex.h -include/wine/windows/d3dx11.h -include/wine/windows/d3dx11async.h -include/wine/windows/d3dx11core.h -include/wine/windows/d3dx11core.idl -include/wine/windows/d3dx11tex.h -include/wine/windows/d3dx9.h -include/wine/windows/d3dx9anim.h -include/wine/windows/d3dx9core.h -include/wine/windows/d3dx9effect.h -include/wine/windows/d3dx9math.h -include/wine/windows/d3dx9math.inl -include/wine/windows/d3dx9mesh.h -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 -include/wine/windows/dbgeng.h -include/wine/windows/dbghelp.h -include/wine/windows/dbinit.idl -include/wine/windows/dbprop.idl -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/dcommon.idl -include/wine/windows/dde.h -include/wine/windows/dde.rh -include/wine/windows/ddeml.h -include/wine/windows/ddk/compstui.h -include/wine/windows/ddk/csq.h -include/wine/windows/ddk/d3dkmthk.h -include/wine/windows/ddk/fltkernel.h -include/wine/windows/ddk/hidclass.h -include/wine/windows/ddk/hidpi.h -include/wine/windows/ddk/hidport.h -include/wine/windows/ddk/hidsdi.h -include/wine/windows/ddk/hidtypes.h -include/wine/windows/ddk/imm.h -include/wine/windows/ddk/mountmgr.h -include/wine/windows/ddk/ndis.h -include/wine/windows/ddk/ntddcdvd.h -include/wine/windows/ddk/ntddk.h -include/wine/windows/ddk/ntddser.h -include/wine/windows/ddk/ntddtape.h -include/wine/windows/ddk/ntifs.h -include/wine/windows/ddk/usb.h -include/wine/windows/ddk/usb100.h -include/wine/windows/ddk/usb200.h -include/wine/windows/ddk/usbdlib.h -include/wine/windows/ddk/usbioctl.h -include/wine/windows/ddk/usbiodef.h -include/wine/windows/ddk/wdm.h -include/wine/windows/ddk/winddiui.h -include/wine/windows/ddk/winsplp.h -include/wine/windows/ddk/wsk.h -include/wine/windows/ddraw.h -include/wine/windows/ddrawgdi.h -include/wine/windows/ddrawi.h -include/wine/windows/ddstream.h -include/wine/windows/ddstream.idl -include/wine/windows/delayloadhandler.h -include/wine/windows/devenum.idl -include/wine/windows/devguid.h -include/wine/windows/devicetopology.h -include/wine/windows/devicetopology.idl -include/wine/windows/devpkey.h -include/wine/windows/devpropdef.h -include/wine/windows/dhcpcsdk.h -include/wine/windows/dhtmldid.h -include/wine/windows/dhtmled.h -include/wine/windows/dhtmled.idl -include/wine/windows/difxapi.h -include/wine/windows/digitalv.h -include/wine/windows/dimm.h -include/wine/windows/dimm.idl -include/wine/windows/dinput.h -include/wine/windows/dinputd.h -include/wine/windows/directmanipulation.h -include/wine/windows/directmanipulation.idl -include/wine/windows/dispdib.h -include/wine/windows/dispex.h -include/wine/windows/dispex.idl *** 3158 LINES SKIPPED ***