diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2018-09-12 17:42:08 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2018-09-12 17:42:08 +0000 |
| commit | 832af02b79cbd03669706a5c08783770244b1b85 (patch) | |
| tree | 078493927e35c470c4c0797f10b663e06fd0149f | |
| parent | 175cf4da39ded48f304372323398846477934301 (diff) | |
| download | pkgsrc-832af02b79cbd03669706a5c08783770244b1b85.tar.gz | |
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.
| -rw-r--r-- | x11/xlockmore-lite/Makefile | 4 | ||||
| -rw-r--r-- | x11/xlockmore/Makefile | 4 | ||||
| -rw-r--r-- | x11/xlockmore/Makefile.common | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile index 2a918d27965..645089e2584 100644 --- a/x11/xlockmore-lite/Makefile +++ b/x11/xlockmore-lite/Makefile @@ -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 diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 5b9fb854da0..0d87205268a 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -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 --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index afed9c4a48c..bbe367fa96b 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -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 |