[pkgsrc/trunk]: pkgsrc/security/ssh2 Enable modular X.org support, PR pkg/36760.

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/80cc2a1bcce1
branches:  trunk
changeset: 532002:80cc2a1bcce1
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Aug 09 20:15:38 2007 +0000

description:
Enable modular X.org support, PR pkg/36760.

diffstat:

 security/ssh2/Makefile   |   5 ++---
 security/ssh2/options.mk |  10 ++++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r a3a0af55c21e -r 80cc2a1bcce1 security/ssh2/Makefile
--- a/security/ssh2/Makefile    Thu Aug 09 20:13:17 2007 +0000
+++ b/security/ssh2/Makefile    Thu Aug 09 20:15:38 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/06/08 15:24:58 heinz Exp $
+# $NetBSD: Makefile,v 1.21 2007/08/09 20:15:38 tnn Exp $
 
 DISTNAME=      ssh-3.2.9.1
 PKGNAME=       ${DISTNAME:C/ssh-/ssh2-/}
@@ -27,10 +27,9 @@
 FILESDIR=              ${.CURDIR}/../../security/ssh2/files
 PLIST_SRC=             ${.CURDIR}/../../security/ssh2/PLIST
 
+.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-.include "../../mk/bsd.prefs.mk"
-
 LICENSE=               ssh-communications-security-license
 RESTRICTED=            Reciprocal grant required for derivative works.  Non-comercial use restrictions on some systems.
 NO_BIN_ON_FTP=         ${RESTRICTED}
diff -r a3a0af55c21e -r 80cc2a1bcce1 security/ssh2/options.mk
--- a/security/ssh2/options.mk  Thu Aug 09 20:13:17 2007 +0000
+++ b/security/ssh2/options.mk  Thu Aug 09 20:15:38 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/02/04 00:33:17 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2007/08/09 20:15:38 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ssh2
 PKG_SUPPORTED_OPTIONS= x11
@@ -9,7 +9,13 @@
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=       --with-x
 PLIST_SUBST+=          X11_SUPPORT=
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=    build
+.include "../../x11/libXt/buildlink3.mk"
+.if ${X11_TYPE} == "modular"
+DEPENDS+=              xauth>=1.0.2:../../x11/xauth
+CONFIGURE_ENV+=                ac_cv_path_XAUTH_PATH=${PREFIX:Q}/bin/xauth
+.endif
 .else
 CONFIGURE_ARGS+=       --without-x
 PLIST_SUBST+=          X11_SUPPORT='@comment '