pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/security/openssh Teach about recent NetBSD versions.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5c8c134553f
branches:  trunk
changeset: 474297:c5c8c134553f
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Apr 27 12:15:48 2004 +0000

description:
Teach about recent NetBSD versions.

Finish buildlink3 changes.

Obscure LOCALBASE path so that base system compilers dont match the
prefix otherwise compiler.mk then wants to build the pkgsrc gcc
package. (ick)

diffstat:

 security/openssh/Makefile.intree |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 2ce1989aabf3 -r c5c8c134553f security/openssh/Makefile.intree
--- a/security/openssh/Makefile.intree  Tue Apr 27 12:12:17 2004 +0000
+++ b/security/openssh/Makefile.intree  Tue Apr 27 12:15:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.intree,v 1.8 2004/04/25 23:36:52 wiz Exp $
+# $NetBSD: Makefile.intree,v 1.9 2004/04/27 12:15:48 markd Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -10,7 +10,7 @@
 PKG_SYSCONFSUBDIR:=            # empty
 .    endif
 .  endfor
-.  for PATTERN in 1.6*
+.  for PATTERN in 1.6* 2.0*
 .    if ${OS_VERSION:M${PATTERN}}
 _UPDATE_INTREE_OPENSSH=        YES
 PKG_SYSCONFSUBDIR:=            ssh
@@ -24,7 +24,8 @@
 #
 # USE_OPENSSL_VERSION:=        ${OPENSSL_VERSION_095A}
 .include "../../security/openssl/buildlink3.mk"
-.if ${_NEED_OPENSSL} == "YES"
+.include "../../security/openssl/builtin.mk"
+.if !empty(USE_BUILTIN.openssl:M[nN][oO])
 _UPDATE_INTREE_OPENSSH=                NO
 PKG_FAIL_REASON=       "OpenSSL>=0.9.6m in the base distribution is required."
 .endif
@@ -34,7 +35,7 @@
 NO_PKG_REGISTER=       yes
 NO_PACKAGE=            No package registration is done
 MANCOMPRESSED_IF_MANZ= yes
-LOCALBASE:=            /usr
+LOCALBASE:=            /usr/.
 PKG_SYSCONFBASE:=      /etc
 MANDIR:=               share/man
 RCD_SCRIPTS_EGDIR:=    share/examples/openssh



Home | Main Index | Thread Index | Old Index