Received: by mail.netbsd.org (Postfix, from userid 605) id 712CC84F57; Wed, 12 Sep 2018 17:42:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 31CBD84F52 for ; Wed, 12 Sep 2018 17:42:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id rv1Hl1rttRIb for ; Wed, 12 Sep 2018 17:42:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6111284F54 for ; Wed, 12 Sep 2018 17:42:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 59E55FBF8; Wed, 12 Sep 2018 17:42:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1536774129162490" MIME-Version: 1.0 Date: Wed, 12 Sep 2018 17:42:09 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2018Q2] pkgsrc/x11 To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20180912174209.59E55FBF8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1536774129162490 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1536774129162490 Content-Disposition: inline Content-Length: 2182 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xlockmore/Makefile diff -u pkgsrc/x11/xlockmore/Makefile:1.133 pkgsrc/x11/xlockmore/Makefile:1.133.2.1 --- pkgsrc/x11/xlockmore/Makefile:1.133 Tue Apr 17 22:29:53 2018 +++ pkgsrc/x11/xlockmore/Makefile Wed Sep 12 17:42:09 2018 @@ -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 Index: pkgsrc/x11/xlockmore/Makefile.common diff -u pkgsrc/x11/xlockmore/Makefile.common:1.78 pkgsrc/x11/xlockmore/Makefile.common:1.78.4.1 --- pkgsrc/x11/xlockmore/Makefile.common:1.78 Wed Mar 7 11:57:47 2018 +++ pkgsrc/x11/xlockmore/Makefile.common Wed Sep 12 17:42:09 2018 @@ -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 @@ EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org 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 Index: pkgsrc/x11/xlockmore-lite/Makefile diff -u pkgsrc/x11/xlockmore-lite/Makefile:1.22 pkgsrc/x11/xlockmore-lite/Makefile:1.22.4.1 --- pkgsrc/x11/xlockmore-lite/Makefile:1.22 Wed Mar 7 11:57:47 2018 +++ pkgsrc/x11/xlockmore-lite/Makefile Wed Sep 12 17:42:08 2018 @@ -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 @@ PKGNAME= ${DISTNAME:S/-/-lite-/} PKGREVISION= 1 COMMENT= "lite" version of xlockmore +CONFLICTS+= xlockmore-[0-9]* + CONFIGURE_ARGS+= --without-xpm CONFIGURE_ARGS+= --without-gltt CONFIGURE_ARGS+= --without-ttf --_----------=_1536774129162490--