Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 May 2017 21:20:30 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
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
Message-ID:  <201705182120.v4ILKUNw034864@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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