diff options
| author | tnn <tnn> | 2007-08-09 20:15:38 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2007-08-09 20:15:38 +0000 |
| commit | 1e715ab9a0b96f63b4037fdcc3dbb536d7106cb8 (patch) | |
| tree | 35aadb87520c614bad13a1f974a00ff0771367f5 | |
| parent | 46c5a16b4df271052b2f94c2740dc73da7256618 (diff) | |
| download | pkgsrc-1e715ab9a0b96f63b4037fdcc3dbb536d7106cb8.tar.gz | |
Enable modular X.org support, PR pkg/36760.
| -rw-r--r-- | security/ssh2/Makefile | 5 | ||||
| -rw-r--r-- | security/ssh2/options.mk | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile index 865f5574e2d..618ccc7cc5c 100644 --- a/security/ssh2/Makefile +++ b/security/ssh2/Makefile @@ -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,9 +27,8 @@ PATCHDIR= ${.CURDIR}/../../security/ssh2/patches FILESDIR= ${.CURDIR}/../../security/ssh2/files PLIST_SRC= ${.CURDIR}/../../security/ssh2/PLIST -.include "options.mk" - .include "../../mk/bsd.prefs.mk" +.include "options.mk" LICENSE= ssh-communications-security-license RESTRICTED= Reciprocal grant required for derivative works. Non-comercial use restrictions on some systems. diff --git a/security/ssh2/options.mk b/security/ssh2/options.mk index 34360c59435..22f3547eac7 100644 --- a/security/ssh2/options.mk +++ b/security/ssh2/options.mk @@ -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 @@ PKG_SUGGESTED_OPTIONS= x11 .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 ' |