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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4894aad04cc5
branches:  trunk
changeset: 312660:4894aad04cc5
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Sep 10 00:06:06 2018 +0000

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

diffstat:

 x11/xlockmore-lite/Makefile |  4 +++-
 x11/xlockmore/Makefile      |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 04e905fe6a1a -r 4894aad04cc5 x11/xlockmore-lite/Makefile
--- a/x11/xlockmore-lite/Makefile       Sun Sep 09 21:52:07 2018 +0000
+++ b/x11/xlockmore-lite/Makefile       Mon Sep 10 00:06:06 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/03/07 11:57:47 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2018/09/10 00:06:06 maya Exp $
 
 .include "../../x11/xlockmore/Makefile.common"
 
@@ -6,6 +6,8 @@
 PKGREVISION=   1
 COMMENT=       "lite" version of xlockmore
 
+CONFLICTS+=    xlockmore-[0-9]*
+
 CONFIGURE_ARGS+=       --without-xpm
 CONFIGURE_ARGS+=       --without-gltt
 CONFIGURE_ARGS+=       --without-ttf
diff -r 04e905fe6a1a -r 4894aad04cc5 x11/xlockmore/Makefile
--- a/x11/xlockmore/Makefile    Sun Sep 09 21:52:07 2018 +0000
+++ b/x11/xlockmore/Makefile    Mon Sep 10 00:06:06 2018 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.133 2018/04/17 22:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.134 2018/09/10 00:06:07 maya Exp $
 
 PKGREVISION= 14
 .include "Makefile.common"
 
 COMMENT=       Like the XLock session-locker/screensaver, but with more
 
+CONFLICTS+=    xlockmore-lite-[0-9]*
+
 CONFIGURE_ARGS+=       --with-opengl
 CONFIGURE_ARGS+=       --with-mesa
 CONFIGURE_ARGS+=       --without-ttf