diff --git a/emulators/i386-wine-devel/Makefile b/emulators/i386-wine-devel/Makefile index a3a2225a03bc..11df0601940f 100644 --- a/emulators/i386-wine-devel/Makefile +++ b/emulators/i386-wine-devel/Makefile @@ -1,37 +1,37 @@ # Created by: David Naylor (dbn@FreeBSD.org) # Special bootstrapper to allow: # - i386 specific port to be slave to ${PORTSDIR}/emulators/wine-devel # - 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-devel's PORTREVISION when cross building -PORTREVISION?= 2 +PORTREVISION?= 0 PKGNAMEPREFIX= i386- PKGNAMESUFFIX= -devel CATEGORIES= emulators -MAINTAINER= ports@FreeBSD.org +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]* i386-wine-[0-9]* PKGINSTALL= ${.CURDIR}/files/pkg-install PKGDEINSTALL= ${PKGINSTALL} distinfo-update: ${RM} ${.CURDIR}/distinfo~ .for osrel in 11 12 13 14 ${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~ .endfor ${SED} -e '2,$${' -e '/^TIMESTAMP/d' -e '}' distinfo~ > ${.CURDIR}/distinfo ${RM} ${.CURDIR}/distinfo~ .include diff --git a/emulators/i386-wine-devel/Makefile.amd64 b/emulators/i386-wine-devel/Makefile.amd64 index c589de4d8514..19298416a148 100644 --- a/emulators/i386-wine-devel/Makefile.amd64 +++ b/emulators/i386-wine-devel/Makefile.amd64 @@ -1,51 +1,51 @@ # Created by: David Naylor -DISTVERSION= 5.8 +DISTVERSION= 6.5 PORTEPOCH= 1 -MASTER_SITES= https://homura.magzu.net/winebuilds/${DIST_SUBDIR}/ +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 .for osrel in 11 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} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400006)) +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400013)) IGNORE= binaries compiled for FreeBSD 11.4+, 12.2+, 13.0+ and 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-devel>0:emulators/wine-gecko-devel MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel 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-devel/distinfo b/emulators/i386-wine-devel/distinfo index 917847c9ebeb..57f0153491f1 100644 --- a/emulators/i386-wine-devel/distinfo +++ b/emulators/i386-wine-devel/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1616536758 -SHA256 (FreeBSD:11:amd64/i386-wine-devel-5.8_2,1.txz) = b36333be0762b7ab8d05526b6b1781c08d9652b99146e2c2f05c7263885f6edb -SIZE (FreeBSD:11:amd64/i386-wine-devel-5.8_2,1.txz) = 93422228 -SHA256 (FreeBSD:12:amd64/i386-wine-devel-5.8_2,1.txz) = 0a4c40d8ad24e1e4bdfc1477e43c27d6e631bdc51e8f417b0f94cb45d393e681 -SIZE (FreeBSD:12:amd64/i386-wine-devel-5.8_2,1.txz) = 93785272 -SHA256 (FreeBSD:13:amd64/i386-wine-devel-5.8_2,1.txz) = 2c27d304a5466de41805c07675fe1d72baa76ef32ca5a2397ba211b1add092c8 -SIZE (FreeBSD:13:amd64/i386-wine-devel-5.8_2,1.txz) = 94229460 -SHA256 (FreeBSD:14:amd64/i386-wine-devel-5.8_2,1.txz) = db0935f0e7358fd2e95a5c351989c14046bb193dbba5f88d9d928edef79f2094 -SIZE (FreeBSD:14:amd64/i386-wine-devel-5.8_2,1.txz) = 94243852 +TIMESTAMP = 1620510508 +SHA256 (FreeBSD:11:amd64/i386-wine-devel-6.5,1.txz) = 7c5ce32e2fe68c0867e923eade8be67346f19a44a176ed178ab90eebd7c75684 +SIZE (FreeBSD:11:amd64/i386-wine-devel-6.5,1.txz) = 98407920 +SHA256 (FreeBSD:12:amd64/i386-wine-devel-6.5,1.txz) = 1acd08deba5b5681072b97d310cbc63163140243797987daafe49f8be017c841 +SIZE (FreeBSD:12:amd64/i386-wine-devel-6.5,1.txz) = 98771592 +SHA256 (FreeBSD:13:amd64/i386-wine-devel-6.5,1.txz) = c6460822fcf86b20086802ac1825876fb18c13f483b68b06411466647dd4b44a +SIZE (FreeBSD:13:amd64/i386-wine-devel-6.5,1.txz) = 99270652 +SHA256 (FreeBSD:14:amd64/i386-wine-devel-6.5,1.txz) = c44ab12d86983452ced6a49f4a986a28498747b23f5486de233068f559b97f93 +SIZE (FreeBSD:14:amd64/i386-wine-devel-6.5,1.txz) = 99248284 diff --git a/emulators/i386-wine-devel/files/binbounce b/emulators/i386-wine-devel/files/binbounce index 9a63984b1d8c..41aea0673d3f 100644 --- a/emulators/i386-wine-devel/files/binbounce +++ b/emulators/i386-wine-devel/files/binbounce @@ -1,23 +1,26 @@ #!/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-devel/files/pkg-message.in b/emulators/i386-wine-devel/files/pkg-message.in index 16c17b8a828d..236c9bffc511 100644 --- a/emulators/i386-wine-devel/files/pkg-message.in +++ b/emulators/i386-wine-devel/files/pkg-message.in @@ -1,15 +1,26 @@ [ { type: install message: <