PR/53586 CVS commit: [pkgsrc-2018Q2] pkgsrc/x11

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

The following reply was made to PR pkg/53586; it has been noted by GNATS.

From: "Benny Siegert" <bsiegert%netbsd.org@localhost>
To: gnats-bugs%gnats.NetBSD.org@localhost
Cc: 
Subject: PR/53586 CVS commit: [pkgsrc-2018Q2] pkgsrc/x11
Date: Wed, 12 Sep 2018 17:42:09 +0000

 Module Name:	pkgsrc
 Committed By:	bsiegert
 Date:		Wed Sep 12 17:42:09 UTC 2018
 
 Modified Files:
 	pkgsrc/x11/xlockmore [pkgsrc-2018Q2]: Makefile Makefile.common
 	pkgsrc/x11/xlockmore-lite [pkgsrc-2018Q2]: Makefile
 
 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.
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.133 -r1.133.2.1 pkgsrc/x11/xlockmore/Makefile
 cvs rdiff -u -r1.78 -r1.78.4.1 pkgsrc/x11/xlockmore/Makefile.common
 cvs rdiff -u -r1.22 -r1.22.4.1 pkgsrc/x11/xlockmore-lite/Makefile
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.