CVS commit: pkgsrc/x11

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Nov 24 21:43:40 UTC 2019

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

Log Message:
modular-xorg-server*: Remove libXxf86misc inclusion

It is not actually used. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/modular-xorg-server/Makefile.common
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/modular-xorg-xephyr/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/modular-xorg-xquartz/Makefile
cvs rdiff -u -r1.1 -r1.2 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.120 pkgsrc/x11/modular-xorg-server/Makefile:1.121
--- pkgsrc/x11/modular-xorg-server/Makefile:1.120       Thu Aug 22 19:52:29 2019
+++ pkgsrc/x11/modular-xorg-server/Makefile     Sun Nov 24 21:43:39 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.120 2019/08/22 19:52:29 nia Exp $
+# $NetBSD: Makefile,v 1.121 2019/11/24 21:43:39 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Modular X11 server from modular X.org

Index: pkgsrc/x11/modular-xorg-server/Makefile.common
diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.29 pkgsrc/x11/modular-xorg-server/Makefile.common:1.30
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.29 Fri Nov 15 09:18:17 2019
+++ pkgsrc/x11/modular-xorg-server/Makefile.common      Sun Nov 24 21:43:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2019/11/15 09:18:17 wiz Exp $
+# $NetBSD: Makefile.common,v 1.30 2019/11/24 21:43:39 wiz Exp $
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 # used by x11/modular-xorg-xwayland/Makefile
@@ -138,7 +138,6 @@ BUILDLINK_API_DEPENDS.libXext+=     libXext>
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXfont2/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXxf86misc/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"

Index: pkgsrc/x11/modular-xorg-xephyr/Makefile
diff -u pkgsrc/x11/modular-xorg-xephyr/Makefile:1.15 pkgsrc/x11/modular-xorg-xephyr/Makefile:1.16
--- pkgsrc/x11/modular-xorg-xephyr/Makefile:1.15        Thu Aug 22 19:52:29 2019
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile     Sun Nov 24 21:43:39 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2019/08/22 19:52:29 nia Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/24 21:43:39 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-xorg-xephyr-${XORG_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 
 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.9 pkgsrc/x11/modular-xorg-xquartz/Makefile:1.10
--- pkgsrc/x11/modular-xorg-xquartz/Makefile:1.9        Fri Nov 15 09:18:17 2019
+++ pkgsrc/x11/modular-xorg-xquartz/Makefile    Sun Nov 24 21:43:40 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2019/11/15 09:18:17 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/24 21:43:40 wiz Exp $
 
 DISTNAME=      xorg-server-1.17.2
 PKGNAME=       ${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  https://www.x.org/releases/individual/xserver/
 EXTRACT_SUFX=  .tar.bz2
@@ -103,7 +103,6 @@ MESSAGE_SUBST+=             PREFIX=${PREFIX}
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXfont/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXxf86misc/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"

Index: pkgsrc/x11/modular-xorg-xwayland/Makefile
diff -u pkgsrc/x11/modular-xorg-xwayland/Makefile:1.1 pkgsrc/x11/modular-xorg-xwayland/Makefile:1.2
--- pkgsrc/x11/modular-xorg-xwayland/Makefile:1.1       Thu Aug 22 19:52:29 2019
+++ pkgsrc/x11/modular-xorg-xwayland/Makefile   Sun Nov 24 21:43:40 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2019/08/22 19:52:29 nia Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/24 21:43:40 wiz Exp $
 
 DISTNAME=      xorg-server-${XORG_VERSION}
 PKGNAME=       modular-xorg-xwayland-${XORG_VERSION}
+PKGREVISION=   1
 
 DISTINFO_FILE=         ${.CURDIR}/../../x11/modular-xorg-server/distinfo
 PATCHDIR=              ${.CURDIR}/../../x11/modular-xorg-server/patches