Fri Oct 23 10:58:28 2015 UTC ()
Mark xephyr as not for Darwin for now.

Should be possible to support but the Darwin xorg-server build assumes
it is going to build xquartz and nothing else.


(tnn)
diff -r1.34 -r1.35 pkgsrc/meta-pkgs/modular-xorg-apps/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/modular-xorg-xephyr/Makefile
cvs diff -r1.34 -r1.35 pkgsrc/meta-pkgs/modular-xorg-apps/Makefile (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/modular-xorg-apps/Makefile 2015/07/05 15:08:03 1.34
+++ pkgsrc/meta-pkgs/modular-xorg-apps/Makefile 2015/10/23 10:58:28 1.35
@@ -1,42 +1,46 @@ @@ -1,42 +1,46 @@
1# $NetBSD: Makefile,v 1.34 2015/07/05 15:08:03 khorben Exp $ 1# $NetBSD: Makefile,v 1.35 2015/10/23 10:58:28 tnn Exp $
2 2
3DISTNAME= # empty 3DISTNAME= # empty
4PKGNAME= modular-xorg-apps-1.14.1.7 4PKGNAME= modular-xorg-apps-1.14.1.7
5CATEGORIES= meta-pkgs x11 5CATEGORIES= meta-pkgs x11
6MASTER_SITES= ${MASTER_SITE_XORG:=app/} 6MASTER_SITES= ${MASTER_SITE_XORG:=app/}
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Modular Xorg application meta-package 11COMMENT= Modular Xorg application meta-package
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14META_PACKAGE= yes 14META_PACKAGE= yes
15 15
 16.include "../../mk/bsd.prefs.mk"
 17
16DEPENDS+= xbiff-[0-9]*:../../mail/xbiff 18DEPENDS+= xbiff-[0-9]*:../../mail/xbiff
17DEPENDS+= twm-[0-9]*:../../wm/twm 19DEPENDS+= twm-[0-9]*:../../wm/twm
18DEPENDS+= appres-[0-9]*:../../x11/appres 20DEPENDS+= appres-[0-9]*:../../x11/appres
19DEPENDS+= bdftopcf-[0-9]*:../../fonts/bdftopcf 21DEPENDS+= bdftopcf-[0-9]*:../../fonts/bdftopcf
20DEPENDS+= beforelight-[0-9]*:../../x11/beforelight 22DEPENDS+= beforelight-[0-9]*:../../x11/beforelight
21DEPENDS+= bitmap-[0-9]*:../../x11/bitmap 23DEPENDS+= bitmap-[0-9]*:../../x11/bitmap
22DEPENDS+= editres-[0-9]*:../../x11/editres 24DEPENDS+= editres-[0-9]*:../../x11/editres
23DEPENDS+= font-util-[0-9]*:../../fonts/font-util 25DEPENDS+= font-util-[0-9]*:../../fonts/font-util
24DEPENDS+= iceauth-[0-9]*:../../x11/iceauth 26DEPENDS+= iceauth-[0-9]*:../../x11/iceauth
25DEPENDS+= ico-[0-9]*:../../x11/ico 27DEPENDS+= ico-[0-9]*:../../x11/ico
26DEPENDS+= listres-[0-9]*:../../x11/listres 28DEPENDS+= listres-[0-9]*:../../x11/listres
27DEPENDS+= luit-[0-9]*:../../x11/luit 29DEPENDS+= luit-[0-9]*:../../x11/luit
28DEPENDS+= mkcomposecache-[0-9]*:../../x11/mkcomposecache 30DEPENDS+= mkcomposecache-[0-9]*:../../x11/mkcomposecache
 31.if ${OPSYS} != "Darwin"
29DEPENDS+= modular-xorg-xephyr-[0-9]*:../../x11/modular-xorg-xephyr 32DEPENDS+= modular-xorg-xephyr-[0-9]*:../../x11/modular-xorg-xephyr
 33.endif
30DEPENDS+= oclock-[0-9]*:../../time/oclock 34DEPENDS+= oclock-[0-9]*:../../time/oclock
31DEPENDS+= lbxproxy-[0-9]*:../../x11/lbxproxy 35DEPENDS+= lbxproxy-[0-9]*:../../x11/lbxproxy
32DEPENDS+= proxymngr-[0-9]*:../../x11/proxymngr 36DEPENDS+= proxymngr-[0-9]*:../../x11/proxymngr
33DEPENDS+= rstart-[0-9]*:../../x11/rstart 37DEPENDS+= rstart-[0-9]*:../../x11/rstart
34DEPENDS+= setxkbmap-[0-9]*:../../x11/setxkbmap 38DEPENDS+= setxkbmap-[0-9]*:../../x11/setxkbmap
35DEPENDS+= transset-[0-9]*:../../x11/transset 39DEPENDS+= transset-[0-9]*:../../x11/transset
36DEPENDS+= viewres-[0-9]*:../../x11/viewres 40DEPENDS+= viewres-[0-9]*:../../x11/viewres
37DEPENDS+= x11perf-[0-9]*:../../x11/x11perf 41DEPENDS+= x11perf-[0-9]*:../../x11/x11perf
38DEPENDS+= xauth-[0-9]*:../../x11/xauth 42DEPENDS+= xauth-[0-9]*:../../x11/xauth
39DEPENDS+= xbacklight-[0-9]*:../../x11/xbacklight 43DEPENDS+= xbacklight-[0-9]*:../../x11/xbacklight
40DEPENDS+= xcalc-[0-9]*:../../x11/xcalc 44DEPENDS+= xcalc-[0-9]*:../../x11/xcalc
41DEPENDS+= xclipboard-[0-9]*:../../x11/xclipboard 45DEPENDS+= xclipboard-[0-9]*:../../x11/xclipboard
42DEPENDS+= xclock-[0-9]*:../../time/xclock 46DEPENDS+= xclock-[0-9]*:../../time/xclock
cvs diff -r1.6 -r1.7 pkgsrc/x11/modular-xorg-xephyr/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-xephyr/Makefile 2015/08/23 14:30:42 1.6
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile 2015/10/23 10:58:28 1.7
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile,v 1.6 2015/08/23 14:30:42 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2015/10/23 10:58:28 tnn Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-xorg-xephyr-${XORG_VERSION} 4PKGNAME= modular-xorg-xephyr-${XORG_VERSION}
5PKGREVISION= 2 5PKGREVISION= 2
6 6
7DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo 7DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo
8PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches 8PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches
9 9
10MAINTAINER= khorben@defora.org 10MAINTAINER= khorben@defora.org
11COMMENT= Xephyr server based on kdrive from modular X.org 11COMMENT= Xephyr server based on kdrive from modular X.org
12 12
 13NOT_FOR_PLATFORM+= Darwin-*-*
 14
13.include "../../x11/modular-xorg-server/Makefile.common" 15.include "../../x11/modular-xorg-server/Makefile.common"
14 16
15CONFIGURE_ARGS+= --disable-xorg 17CONFIGURE_ARGS+= --disable-xorg
16CONFIGURE_ARGS+= --disable-xnest 18CONFIGURE_ARGS+= --disable-xnest
17CONFIGURE_ARGS+= --enable-xephyr 19CONFIGURE_ARGS+= --enable-xephyr
18CONFIGURE_ARGS+= --enable-kdrive 20CONFIGURE_ARGS+= --enable-kdrive
19CONFIGURE_ARGS+= --disable-xvfb 21CONFIGURE_ARGS+= --disable-xvfb
20 22
21post-install: 23post-install:
22 ${RM} ${DESTDIR}${PREFIX}/lib/xorg/protocol.txt 24 ${RM} ${DESTDIR}${PREFIX}/lib/xorg/protocol.txt
23 ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xserver.1 25 ${RM} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Xserver.1
24 if [ -f ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml ]; then \ 26 if [ -f ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml ]; then \
25 ${RM} ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml; \ 27 ${RM} ${DESTDIR}${PREFIX}/share/doc/xorg-server/Xserver-DTrace.xml; \