Log Message:
Pullup ticket #5827 - requested by maya
x11/xlockmore, x11/xlockmore-lite: build fix

Revisions pulled up:
- x11/xlockmore-lite/Makefile                                   1.23
- x11/xlockmore/Makefile                                        1.134
- x11/xlockmore/Makefile.common                                 1.79

---
   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

---
   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.