diff options
| author | tnn <tnn> | 2017-02-23 06:20:07 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2017-02-23 06:20:07 +0000 |
| commit | 8958f927581df05529b2b3466ed7dfe21ad94dc2 (patch) | |
| tree | fde69ed446afa7b7206dfa7dd97b84c7c983d06e /x11 | |
| parent | dfc6bcfca9b263b870456c5552fdb53b8bde20f7 (diff) | |
| download | pkgsrc-8958f927581df05529b2b3466ed7dfe21ad94dc2.tar.gz | |
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.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xinit/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index 8765f4c1abd..daab7f37ece 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -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 |