Thu Oct 1 12:32:22 2015 UTC ()
fix build on Darwin with X11_TYPE=modular


(tnn)
diff -r1.21 -r1.22 pkgsrc/x11/xinit/Makefile
diff -r0 -r1.1 pkgsrc/x11/xinit/PLIST.Darwin
cvs diff -r1.21 -r1.22 pkgsrc/x11/xinit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xinit/Makefile 2014/09/11 21:35:24 1.21
+++ pkgsrc/x11/xinit/Makefile 2015/10/01 12:32:22 1.22
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.21 2014/09/11 21:35:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.22 2015/10/01 12:32:22 tnn Exp $
2 2
3DISTNAME= xinit-1.3.4 3DISTNAME= xinit-1.3.4
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=app/} 5MASTER_SITES= ${MASTER_SITE_XORG:=app/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://xorg.freedesktop.org/ 9HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= X init program 10COMMENT= X init program
11LICENSE= mit 11LICENSE= mit
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit 14CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit
15USE_TOOLS+= pkg-config xauth:run 15USE_TOOLS+= pkg-config xauth:run gmake # nb: gmake is needed on Darwin
16 16
17TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 17TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
18CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 18CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
19 19
20INSTALL_MAKE_FLAGS+= xinitrcdir=${PREFIX}/share/examples/xinit 20INSTALL_MAKE_FLAGS+= xinitrcdir=${PREFIX}/share/examples/xinit
21CONF_FILES= ${PREFIX}/share/examples/xinit/xinitrc ${PREFIX}/etc/X11/xinit/xinitrc 21CONF_FILES= ${PREFIX}/share/examples/xinit/xinitrc ${PREFIX}/etc/X11/xinit/xinitrc
22MAKE_DIRS= ${PREFIX}/etc/X11/xinit 22MAKE_DIRS= ${PREFIX}/etc/X11/xinit
23 23
24.include "../../x11/libX11/buildlink3.mk" 24.include "../../x11/libX11/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/x11/xinit/Attic/PLIST.Darwin
@comment $NetBSD: PLIST.Darwin,v 1.1 2015/10/01 12:32:22 tnn Exp $
bin/startx
bin/xinit
man/man1/startx.1
man/man1/xinit.1
share/examples/xinit/launchd_startx
share/examples/xinit/privileged_startx
share/examples/xinit/privileged_startx.d/10-tmpdirs
share/examples/xinit/privileged_startx.d/20-font_cache
share/examples/xinit/xinitrc