From 89182bfebfe11509c70649dbdd15484040f39d91 Mon Sep 17 00:00:00 2001 From: pawel Date: Thu, 18 May 2017 21:20:30 +0000 Subject: 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) --- x11-wm/awesome/Makefile | 2 +- x11-wm/awesome3/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 82cccdcb63a4..29680b5044a2 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -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 diff --git a/x11-wm/awesome3/Makefile b/x11-wm/awesome3/Makefile index 6d0f50cc3c4f..4f3063790a3e 100644 --- a/x11-wm/awesome3/Makefile +++ b/x11-wm/awesome3/Makefile @@ -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 -- cgit