[pkgsrc/pkgsrc-2018Q2]: pkgsrc/x11 Pullup ticket #5827 - requested by maya

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/17e2ce990860
branches:  pkgsrc-2018Q2
changeset: 313980:17e2ce990860
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Wed Sep 12 17:42:08 2018 +0000

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

diffstat:

 x11/xlockmore-lite/Makefile   |  4 +++-
 x11/xlockmore/Makefile        |  4 +++-
 x11/xlockmore/Makefile.common |  4 +---
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r ee0a0dfb1cde -r 17e2ce990860 x11/xlockmore-lite/Makefile
--- a/x11/xlockmore-lite/Makefile       Wed Sep 12 05:16:43 2018 +0000
+++ b/x11/xlockmore-lite/Makefile       Wed Sep 12 17:42:08 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/03/07 11:57:47 wiz Exp $
+# $NetBSD: Makefile,v 1.22.4.1 2018/09/12 17:42:08 bsiegert Exp $
 
 .include "../../x11/xlockmore/Makefile.common"
 
@@ -6,6 +6,8 @@
 PKGREVISION=   1
 COMMENT=       "lite" version of xlockmore
 
+CONFLICTS+=    xlockmore-[0-9]*
+
 CONFIGURE_ARGS+=       --without-xpm
 CONFIGURE_ARGS+=       --without-gltt
 CONFIGURE_ARGS+=       --without-ttf
diff -r ee0a0dfb1cde -r 17e2ce990860 x11/xlockmore/Makefile
--- a/x11/xlockmore/Makefile    Wed Sep 12 05:16:43 2018 +0000
+++ b/x11/xlockmore/Makefile    Wed Sep 12 17:42:08 2018 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.133 2018/04/17 22:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.133.2.1 2018/09/12 17:42:09 bsiegert 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
diff -r ee0a0dfb1cde -r 17e2ce990860 x11/xlockmore/Makefile.common
--- a/x11/xlockmore/Makefile.common     Wed Sep 12 05:16:43 2018 +0000
+++ b/x11/xlockmore/Makefile.common     Wed Sep 12 17:42:08 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.78 2018/03/07 11:57:47 wiz Exp $
+# $NetBSD: Makefile.common,v 1.78.4.1 2018/09/12 17:42:09 bsiegert Exp $
 #
 # used by x11/xlockmore/Makefile
 # used by x11/xlockmore-lite/Makefile
@@ -11,8 +11,6 @@
 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