diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 84db467ec7c8386066718011f8d47775d5608811 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /security/ssh2 | |
| parent | 7082f8c2044621c8641f3c82a2da95c2d442048c (diff) | |
| download | pkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'security/ssh2')
| -rw-r--r-- | security/ssh2/PLIST | 6 | ||||
| -rw-r--r-- | security/ssh2/options.mk | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/security/ssh2/PLIST b/security/ssh2/PLIST index 3907e921708..aca5c85ab13 100644 --- a/security/ssh2/PLIST +++ b/security/ssh2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:05 reed Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:12 jlam Exp $ bin/scp bin/scp2 bin/sftp @@ -10,8 +10,8 @@ bin/ssh-add bin/ssh-add2 bin/ssh-agent bin/ssh-agent2 -${X11_SUPPORT}bin/ssh-askpass -${X11_SUPPORT}bin/ssh-askpass2 +${PLIST.x11}bin/ssh-askpass +${PLIST.x11}bin/ssh-askpass2 bin/ssh-dummy-shell bin/ssh-keygen bin/ssh-keygen2 diff --git a/security/ssh2/options.mk b/security/ssh2/options.mk index eeb0c8e7d76..85111a30286 100644 --- a/security/ssh2/options.mk +++ b/security/ssh2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2007/08/09 20:28:10 tnn Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:12 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ssh2 PKG_SUPPORTED_OPTIONS= x11 @@ -6,9 +6,11 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" +PLIST_VARS+= x11 + .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --with-x -PLIST_SUBST+= X11_SUPPORT= +PLIST.x11= yes .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" BUILDLINK_DEPMETHOD.libXt?= build @@ -19,5 +21,4 @@ CONFIGURE_ENV+= ac_cv_path_XAUTH_PATH=${PREFIX:Q}/bin/xauth .endif .else CONFIGURE_ARGS+= --without-x -PLIST_SUBST+= X11_SUPPORT='@comment ' .endif |