CVS commit: pkgsrc/x11/xlockmore

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Sep  9 20:05:19 UTC 2018

Modified Files:
        pkgsrc/x11/xlockmore: Makefile.common

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/x11/xlockmore/Makefile.common

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.common
diff -u pkgsrc/x11/xlockmore/Makefile.common:1.78 pkgsrc/x11/xlockmore/Makefile.common:1.79
--- pkgsrc/x11/xlockmore/Makefile.common:1.78   Wed Mar  7 11:57:47 2018
+++ pkgsrc/x11/xlockmore/Makefile.common        Sun Sep  9 20:05:19 2018
@@ -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 @@ EXTRACT_SUFX= .tar.xz
 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