Mon Sep 10 00:06:07 2018 UTC ()
xlockmore{,-lite}: restore CONFLICTS.


(maya)
diff -r1.133 -r1.134 pkgsrc/x11/xlockmore/Makefile
diff -r1.22 -r1.23 pkgsrc/x11/xlockmore-lite/Makefile
cvs diff -r1.133 -r1.134 pkgsrc/x11/xlockmore/Makefile (expand / switch to context diff)
--- pkgsrc/x11/xlockmore/Makefile 2018/04/17 22:29:53 1.133
+++ pkgsrc/x11/xlockmore/Makefile 2018/09/10 00:06:07 1.134
@@ -1,9 +1,11 @@
-# $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
cvs diff -r1.22 -r1.23 pkgsrc/x11/xlockmore-lite/Makefile (expand / switch to context diff)
--- pkgsrc/x11/xlockmore-lite/Makefile 2018/03/07 11:57:47 1.22
+++ pkgsrc/x11/xlockmore-lite/Makefile 2018/09/10 00:06:06 1.23
@@ -1,10 +1,12 @@
-# $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"
 
 PKGNAME=	${DISTNAME:S/-/-lite-/}
 PKGREVISION=	1
 COMMENT=	"lite" version of xlockmore
+
+CONFLICTS+=	xlockmore-[0-9]*
 
 CONFIGURE_ARGS+=	--without-xpm
 CONFIGURE_ARGS+=	--without-gltt