diff options
| author | tnn <tnn@pkgsrc.org> | 2022-07-17 01:39:07 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2022-07-17 01:39:07 +0000 |
| commit | c784742d7932771608fe28d30c0202bdd5d488d9 (patch) | |
| tree | b4e66f33023d7e75b217e31f5cefa8b62e26e87f /x11 | |
| parent | a7da47077b763840aa9de3488d0ea20e8e6dd45b (diff) | |
| download | pkgsrc-c784742d7932771608fe28d30c0202bdd5d488d9.tar.gz | |
g/c invalid CONFLICTS lines between modular-xorg-server and libxcvt
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libxcvt/Makefile | 5 | ||||
| -rw-r--r-- | x11/modular-xorg-server/Makefile | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/x11/libxcvt/Makefile b/x11/libxcvt/Makefile index 2842b895340..400e1dca453 100644 --- a/x11/libxcvt/Makefile +++ b/x11/libxcvt/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2021/10/28 09:56:25 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2022/07/17 01:39:07 tnn Exp $ DISTNAME= libxcvt-0.1.1 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.xz @@ -10,8 +11,6 @@ HOMEPAGE= https://xorg.freedesktop.org/ COMMENT= VESA CVT standard timing modelines generator LICENSE= mit -CONFLICTS+= modular-xorg-server-[0-9]* - PKGCONFIG_OVERRIDE+= output/meson-private/libxcvt.pc PKGCONFIG_OVERRIDE_STAGE= post-configure diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index e28bfd930f8..fed57eaecd4 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.132 2022/04/10 08:53:17 nia Exp $ +# $NetBSD: Makefile,v 1.133 2022/07/17 01:39:07 tnn Exp $ DISTNAME= xorg-server-${XORG_VERSION} PKGNAME= modular-${DISTNAME} @@ -10,8 +10,6 @@ SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} NOT_FOR_PLATFORM= Darwin-*-* -CONFLICTS+= libxcvt-[0-9]* - .include "Makefile.common" CONFIGURE_ARGS+= --enable-xorg |