CVS commit: pkgsrc/x11

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Nov 25 22:32:52 UTC 2019

Modified Files:
        pkgsrc/x11/modular-xorg-server: Makefile
        pkgsrc/x11/modular-xorg-xephyr: Makefile
        pkgsrc/x11/modular-xorg-xquartz: Makefile
        pkgsrc/x11/modular-xorg-xwayland: Makefile

Log Message:
modular-xorg-*: remove libxkbui bl3.mk

Unused for years (was only used by removed xorgcfg).

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/modular-xorg-xephyr/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/modular-xorg-xquartz/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/modular-xorg-xwayland/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.121 pkgsrc/x11/modular-xorg-server/Makefile:1.122
--- pkgsrc/x11/modular-xorg-server/Makefile:1.121       Sun Nov 24 21:43:39 2019
+++ pkgsrc/x11/modular-xorg-server/Makefile     Mon Nov 25 22:32:52 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.121 2019/11/24 21:43:39 wiz Exp $
+# $NetBSD: Makefile,v 1.122 2019/11/25 22:32:52 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   3
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Modular X11 server from modular X.org

Index: pkgsrc/x11/modular-xorg-xephyr/Makefile
diff -u pkgsrc/x11/modular-xorg-xephyr/Makefile:1.16 pkgsrc/x11/modular-xorg-xephyr/Makefile:1.17
--- pkgsrc/x11/modular-xorg-xephyr/Makefile:1.16        Sun Nov 24 21:43:39 2019
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile     Mon Nov 25 22:32:52 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2019/11/24 21:43:39 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/25 22:32:52 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-xorg-xephyr-${XORG_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 
 DISTINFO_FILE=         ${.CURDIR}/../../x11/modular-xorg-server/distinfo
 PATCHDIR=              ${.CURDIR}/../../x11/modular-xorg-server/patches

Index: pkgsrc/x11/modular-xorg-xquartz/Makefile
diff -u pkgsrc/x11/modular-xorg-xquartz/Makefile:1.10 pkgsrc/x11/modular-xorg-xquartz/Makefile:1.11
--- pkgsrc/x11/modular-xorg-xquartz/Makefile:1.10       Sun Nov 24 21:43:40 2019
+++ pkgsrc/x11/modular-xorg-xquartz/Makefile    Mon Nov 25 22:32:52 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2019/11/24 21:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/25 22:32:52 wiz Exp $
 
 DISTNAME=      xorg-server-1.17.2
 PKGNAME=       ${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11
 MASTER_SITES=  https://www.x.org/releases/individual/xserver/
 EXTRACT_SUFX=  .tar.bz2
@@ -106,7 +106,6 @@ MESSAGE_SUBST+=             PREFIX=${PREFIX}
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/libxkbui/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"

Index: pkgsrc/x11/modular-xorg-xwayland/Makefile
diff -u pkgsrc/x11/modular-xorg-xwayland/Makefile:1.2 pkgsrc/x11/modular-xorg-xwayland/Makefile:1.3
--- pkgsrc/x11/modular-xorg-xwayland/Makefile:1.2       Sun Nov 24 21:43:40 2019
+++ pkgsrc/x11/modular-xorg-xwayland/Makefile   Mon Nov 25 22:32:52 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2019/11/24 21:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/25 22:32:52 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-xorg-xwayland-${XORG_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 
 DISTINFO_FILE=         ${.CURDIR}/../../x11/modular-xorg-server/distinfo
 PATCHDIR=              ${.CURDIR}/../../x11/modular-xorg-server/patches