Thu Feb 23 06:20:07 2017 UTC ()
Don't pick up pkgsrc openssl if it happens to be installed.
Also, since native openssl may or may not include openssl(1),
switch to x11/mcookie for cookie generation instead.
Bump rev.


(tnn)
diff -r1.22 -r1.23 pkgsrc/x11/xinit/Makefile
cvs diff -r1.22 -r1.23 pkgsrc/x11/xinit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xinit/Makefile 2015/10/01 12:32:22 1.22
+++ pkgsrc/x11/xinit/Makefile 2017/02/23 06:20:07 1.23
@@ -1,25 +1,29 @@ @@ -1,25 +1,29 @@
1# $NetBSD: Makefile,v 1.22 2015/10/01 12:32:22 tnn Exp $ 1# $NetBSD: Makefile,v 1.23 2017/02/23 06:20:07 tnn Exp $
2 2
3DISTNAME= xinit-1.3.4 3DISTNAME= xinit-1.3.4
 4PKGREVISION= 1
4CATEGORIES= x11 5CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=app/} 6MASTER_SITES= ${MASTER_SITE_XORG:=app/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= X init program 11COMMENT= X init program
11LICENSE= mit 12LICENSE= mit
12 13
 14DEPENDS+= mcookie-[0-9]*:../../x11/mcookie
 15
13GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
14CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit 17CONFIGURE_ARGS+= --with-xinit=${PREFIX}/bin/xinit
15USE_TOOLS+= pkg-config xauth:run gmake # nb: gmake is needed on Darwin 18USE_TOOLS+= pkg-config xauth:run gmake # nb: gmake is needed on Darwin
16 19
17TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 20TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
18CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 21CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 22CONFIGURE_ENV+= ac_cv_path_MCOOKIE="${PREFIX}/bin/mcookie"
19 23
20INSTALL_MAKE_FLAGS+= xinitrcdir=${PREFIX}/share/examples/xinit 24INSTALL_MAKE_FLAGS+= xinitrcdir=${PREFIX}/share/examples/xinit
21CONF_FILES= ${PREFIX}/share/examples/xinit/xinitrc ${PREFIX}/etc/X11/xinit/xinitrc 25CONF_FILES= ${PREFIX}/share/examples/xinit/xinitrc ${PREFIX}/etc/X11/xinit/xinitrc
22MAKE_DIRS= ${PREFIX}/etc/X11/xinit 26MAKE_DIRS= ${PREFIX}/etc/X11/xinit
23 27
24.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"