Mon Jun 23 14:19:54 2008 UTC ()
configure startx to point to correct pkgsrc-provided xinit.


(reed)
diff -r1.10 -r1.11 pkgsrc/x11/xinit/Makefile
cvs diff -r1.10 -r1.11 pkgsrc/x11/xinit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xinit/Makefile 2008/06/21 18:25:14 1.10
+++ pkgsrc/x11/xinit/Makefile 2008/06/23 14:19:54 1.11
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile,v 1.10 2008/06/21 18:25:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2008/06/23 14:19:54 reed Exp $
2# 2#
3 3
4DISTNAME= xinit-1.1.0 4DISTNAME= xinit-1.1.0
 5PKGREVISION= 1
5CATEGORIES= x11 6CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=app/} 7MASTER_SITES= ${MASTER_SITE_XORG:=app/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= X init program 12COMMENT= X init program
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
 17CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit
16USE_TOOLS+= pkg-config xauth:run 18USE_TOOLS+= pkg-config xauth:run
17 19
18.include "../../mk/compiler.mk" 20.include "../../mk/compiler.mk"
19.if !empty(PKGSRC_COMPILER:Mhp) 21.if !empty(PKGSRC_COMPILER:Mhp)
20CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" 22CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -"
21.endif 23.endif
22 24
23.include "../../x11/libX11/buildlink3.mk" 25.include "../../x11/libX11/buildlink3.mk"
24 26
25.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"