pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/seahorse Fix build problem on ssh-less enviro...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a68380121a3d
branches:  trunk
changeset: 532411:a68380121a3d
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Aug 18 11:10:08 2007 +0000

description:
Fix build problem on ssh-less environment, reported in PR 36793.
Let to depend on ssh package.

diffstat:

 security/seahorse/Makefile |  16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 0e2602dfb628 -r a68380121a3d security/seahorse/Makefile
--- a/security/seahorse/Makefile        Sat Aug 18 11:01:28 2007 +0000
+++ b/security/seahorse/Makefile        Sat Aug 18 11:10:08 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2007/08/18 07:28:48 obache Exp $
+# $NetBSD: Makefile,v 1.64 2007/08/18 11:10:08 obache Exp $
 
 DISTNAME=      seahorse-1.0.1
 PKGREVISION=   1
@@ -12,6 +12,17 @@
 
 DEPENDS+=              gnupg>=1.2.1:../../security/gnupg
 
+.if exists(/usr/bin/ssh) && exists(/usr/bin/ssh-add) && exists(/usr/bin/ssh-keygen)
+SSH_PATH=/usr/bin/ssh
+SSH_ADD_PATH=/usr/bin/ssh-add
+SSH_KEYGEN_PATH=/usr/bin/ssh-keygen
+.else
+DEPENDS+=              {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh
+SSH_PATH=${PREFIX}/bin/ssh
+SSH_ADD_PATH=${PREFIX}/bin/ssh-add
+SSH_KEYGEN_PATH=${PREFIX}/ssh-keygen
+.endif
+
 GNU_CONFIGURE=         yes
 USE_DIRS+=             gnome2-1.5
 USE_TOOLS+=            gmake intltool msgfmt pkg-config
@@ -20,6 +31,9 @@
 
 CONFIGURE_ARGS+=       --disable-gedit
 CONFIGURE_ARGS+=       --disable-nautilus
+CONFIGURE_ENV+=                SSH_PATH=${SSH_PATH:Q}
+CONFIGURE_ENV+=                SSH_ADD_PATH=${SSH_ADD_PATH:Q}
+CONFIGURE_ENV+=                SSH_KEYGEN_PATH=${SSH_KEYGEN_PATH:Q}
 
 PKGCONFIG_OVERRIDE+=   libcryptui/cryptui.pc.in
 GCONF2_SCHEMAS=        seahorse.schemas



Home | Main Index | Thread Index | Old Index