CVS commit: pkgsrc/x11/xinit

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Feb 23 06:20:07 UTC 2017

Modified Files:
        pkgsrc/x11/xinit: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/xinit/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/xinit/Makefile
diff -u pkgsrc/x11/xinit/Makefile:1.22 pkgsrc/x11/xinit/Makefile:1.23
--- pkgsrc/x11/xinit/Makefile:1.22      Thu Oct  1 12:32:22 2015
+++ pkgsrc/x11/xinit/Makefile   Thu Feb 23 06:20:07 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2015/10/01 12:32:22 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2017/02/23 06:20:07 tnn Exp $
 
 DISTNAME=              xinit-1.3.4
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=          .tar.bz2
@@ -10,12 +11,15 @@ HOMEPAGE=           http://xorg.freedesktop.org/
 COMMENT=               X init program
 LICENSE=               mit
 
+DEPENDS+=              mcookie-[0-9]*:../../x11/mcookie
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-xinit=${PREFIX}/bin/xinit
 USE_TOOLS+=            pkg-config xauth:run gmake # nb: gmake is needed on Darwin
 
 TOOL_DEPENDS+=         tradcpp-[0-9]*:../../devel/tradcpp
 CONFIGURE_ENV+=                ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
+CONFIGURE_ENV+=                ac_cv_path_MCOOKIE="${PREFIX}/bin/mcookie"
 
 INSTALL_MAKE_FLAGS+=   xinitrcdir=${PREFIX}/share/examples/xinit
 CONF_FILES=            ${PREFIX}/share/examples/xinit/xinitrc ${PREFIX}/etc/X11/xinit/xinitrc