From owner-svn-ports-head@freebsd.org  Sun Mar  7 08:19:48 2021
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 353FC55DF9A;
 Sun,  7 Mar 2021 08:19:48 +0000 (UTC)
 (envelope-from gerald@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 4DtZC8103jz4WF6;
 Sun,  7 Mar 2021 08:19:48 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14D8C12B74;
 Sun,  7 Mar 2021 08:19:48 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1278JlCs024673;
 Sun, 7 Mar 2021 08:19:47 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1278JlvA024672;
 Sun, 7 Mar 2021 08:19:47 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <202103070819.1278JlvA024672@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gerald set sender to
 gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sun, 7 Mar 2021 08:19:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r567553 - head/emulators/wine
X-SVN-Group: ports-head
X-SVN-Commit-Author: gerald
X-SVN-Commit-Paths: head/emulators/wine
X-SVN-Commit-Revision: 567553
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Mar 2021 08:19:48 -0000

Author: gerald
Date: Sun Mar  7 08:19:47 2021
New Revision: 567553
URL: https://svnweb.freebsd.org/changeset/ports/567553

Log:
  Remove conflicts with wine-staging-[0-9]* and i386-wine-staging-[0-9]*
  which have not existed for years.

Modified:
  head/emulators/wine/Makefile

Modified: head/emulators/wine/Makefile
==============================================================================
--- head/emulators/wine/Makefile	Sun Mar  7 07:23:43 2021	(r567552)
+++ head/emulators/wine/Makefile	Sun Mar  7 08:19:47 2021	(r567553)
@@ -25,8 +25,8 @@ LIB_DEPENDS=	libFAudio.so:audio/faudio \
 USES=		bison desktop-file-utils gmake localbase pkgconfig shebangfix tar:xz
 USE_GCC=	yes
 
-CONFLICTS_INSTALL=	wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \
-			i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
+CONFLICTS_INSTALL=	wine-devel-[0-9]* \
+			i386-wine-[0-9]* i386-wine-devel-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--verbose \