Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Oct 2020 19:53:49 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r550871 - head/emulators/wine
Message-ID:  <202010011953.091JrnQC056026@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Thu Oct  1 19:53:49 2020
New Revision: 550871
URL: https://svnweb.freebsd.org/changeset/ports/550871

Log:
  Backport revision r550190 from emulators/wine-devel:
  
    No longer hack tools/wineapploader.in to account for wine64 vs wine.
  
    Since upstream commit
  https://source.winehq.org/git/wine.git/commitdiff/57f9c33c08782399d6729bc58b
  68d73812560638
    this hasn't been necessary any longer and it did actually break things
    afterwards by replacing wine64 with wine6464.
  
  PR:		249868
  Submitted by:	Alex S <iwtcex@gmail.com>

Modified:
  head/emulators/wine/Makefile

Modified: head/emulators/wine/Makefile
==============================================================================
--- head/emulators/wine/Makefile	Thu Oct  1 19:50:02 2020	(r550870)
+++ head/emulators/wine/Makefile	Thu Oct  1 19:53:49 2020	(r550871)
@@ -3,6 +3,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	5.0.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -142,10 +143,9 @@ X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 CONFIGURE_ARGS+=	--enable-win64 --libdir=${PREFIX}/lib
 PLIST_SUB+=		WINE32="@comment " WINE64=""
 
-# Wine assumes a WoW64 package is available, however WoW64 is not yet
-# available on FreeBSD. Also fix the desktop file.
+# Wine assumes a WoW64 package is available, which is not the case on
+# FreeBSD yet.
 post-patch:
-	${REINPLACE_CMD} 's|/wine|/wine64|g' ${WRKSRC}/tools/wineapploader.in
 	${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop
 
 .else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010011953.091JrnQC056026>