CVS commit: pkgsrc/x11

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Sep 10 00:06:07 UTC 2018

Modified Files:
        pkgsrc/x11/xlockmore: Makefile
        pkgsrc/x11/xlockmore-lite: Makefile

Log Message:
xlockmore{,-lite}: restore CONFLICTS.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/x11/xlockmore/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/xlockmore-lite/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xlockmore/Makefile
diff -u pkgsrc/x11/xlockmore/Makefile:1.133 pkgsrc/x11/xlockmore/Makefile:1.134
--- pkgsrc/x11/xlockmore/Makefile:1.133 Tue Apr 17 22:29:53 2018
+++ pkgsrc/x11/xlockmore/Makefile       Mon Sep 10 00:06:07 2018
@@ -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

Index: pkgsrc/x11/xlockmore-lite/Makefile
diff -u pkgsrc/x11/xlockmore-lite/Makefile:1.22 pkgsrc/x11/xlockmore-lite/Makefile:1.23
--- pkgsrc/x11/xlockmore-lite/Makefile:1.22     Wed Mar  7 11:57:47 2018
+++ pkgsrc/x11/xlockmore-lite/Makefile  Mon Sep 10 00:06:06 2018
@@ -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 @@ PKGNAME=        ${DISTNAME:S/-/-lite-/}
 PKGREVISION=   1
 COMMENT=       "lite" version of xlockmore
 
+CONFLICTS+=    xlockmore-[0-9]*
+
 CONFIGURE_ARGS+=       --without-xpm
 CONFIGURE_ARGS+=       --without-gltt
 CONFIGURE_ARGS+=       --without-ttf