From owner-svn-ports-all@freebsd.org  Thu May 18 21:20:32 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08C77D73F87;
 Thu, 18 May 2017 21:20:32 +0000 (UTC)
 (envelope-from pawel@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 mx1.freebsd.org (Postfix) with ESMTPS id CD4731F69;
 Thu, 18 May 2017 21:20:31 +0000 (UTC)
 (envelope-from pawel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4ILKUn8034867;
 Thu, 18 May 2017 21:20:30 GMT (envelope-from pawel@FreeBSD.org)
Received: (from pawel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4ILKUNw034864;
 Thu, 18 May 2017 21:20:30 GMT (envelope-from pawel@FreeBSD.org)
Message-Id: <201705182120.v4ILKUNw034864@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pawel set sender to
 pawel@FreeBSD.org using -f
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Thu, 18 May 2017 21:20:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r441201 - in head/x11-wm: awesome awesome3
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 May 2017 21:20:32 -0000

Author: pawel
Date: Thu May 18 21:20:30 2017
New Revision: 441201
URL: https://svnweb.freebsd.org/changeset/ports/441201

Log:
  Fix CONFLICTS_INSTALL variables to contain packages names instead of
  ports origins. While origins work fine this is against what Porter's
  Handbook advises.
  
  PR:		219389
  Submitted by:	myself
  Approved by:	garga (maintainer)

Modified:
  head/x11-wm/awesome/Makefile
  head/x11-wm/awesome3/Makefile

Modified: head/x11-wm/awesome/Makefile
==============================================================================
--- head/x11-wm/awesome/Makefile	Thu May 18 21:19:31 2017	(r441200)
+++ head/x11-wm/awesome/Makefile	Thu May 18 21:20:30 2017	(r441201)
@@ -30,7 +30,7 @@ LIB_DEPENDS=	libcairo.so:graphics/cairo 
 		libxcb-xrm.so:x11/xcb-util-xrm \
 		libxkbcommon.so:x11/libxkbcommon
 
-CONFLICTS_INSTALL=	x11-wm/awesome3
+CONFLICTS_INSTALL=	awesome3-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	awesomewm

Modified: head/x11-wm/awesome3/Makefile
==============================================================================
--- head/x11-wm/awesome3/Makefile	Thu May 18 21:19:31 2017	(r441200)
+++ head/x11-wm/awesome3/Makefile	Thu May 18 21:20:30 2017	(r441201)
@@ -34,7 +34,7 @@ LIB_DEPENDS=	libcairo.so:graphics/cairo 
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libImlib2.so:graphics/imlib2
 
-CONFLICTS_INSTALL=	x11-wm/awesome
+CONFLICTS_INSTALL=	awesome-[0-9]*
 
 DEPRECATED=	Awesome WM 3.x is deprecated use 4.x instead
 EXPIRATION_DATE=2017-10-10