[pkgsrc/trunk]: pkgsrc/x11/xlockmore xlockmore{, -lite}: drop CONFLICTS.

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53068bc5ee56
branches:  trunk
changeset: 385032:53068bc5ee56
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Sep 09 20:05:19 2018 +0000

description:
xlockmore{,-lite}: drop CONFLICTS.

This file is used by both xlockmore-lite and xlockmore, and results in
the package being considered conflicting with itself.

Reported by he in PR pkg/53586

diffstat:

 x11/xlockmore/Makefile.common |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (18 lines):

diff -r b17ef63a006b -r 53068bc5ee56 x11/xlockmore/Makefile.common
--- a/x11/xlockmore/Makefile.common     Sun Sep 09 17:48:08 2018 +0000
+++ b/x11/xlockmore/Makefile.common     Sun Sep 09 20:05:19 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.78 2018/03/07 11:57:47 wiz Exp $
+# $NetBSD: Makefile.common,v 1.79 2018/09/09 20:05:19 maya Exp $
 #
 # used by x11/xlockmore/Makefile
 # used by x11/xlockmore-lite/Makefile
@@ -11,8 +11,6 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://sillycycle.com/xlockmore.html
 
-CONFLICTS+=    xlockmore-[0-9]* xlockmore-lite-[0-9]*
-
 DISTINFO_FILE?=                ${.CURDIR}/../xlockmore/distinfo
 PATCHDIR?=             ${.CURDIR}/../xlockmore/patches
 PLIST_SRC?=            ${.CURDIR}/../xlockmore/PLIST