diff options
| author | jlam <jlam> | 2002-08-28 04:00:55 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-28 04:00:55 +0000 |
| commit | f1deea0a2a7246259bbea8531b38703c34f15851 (patch) | |
| tree | fe0341ce51457839289ee10fc93dcdd2be4fcbff /security | |
| parent | 58dea3add0d67b93dba2e0dd11fd3d4a6ccc5a85 (diff) | |
| download | pkgsrc-f1deea0a2a7246259bbea8531b38703c34f15851.tar.gz | |
It's 0.9.6f, not 0.9.5f, and move things around so that IGNORE is set to
the proper message.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile.intree | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/security/openssh/Makefile.intree b/security/openssh/Makefile.intree index b4a9b30a1f1..1ac3e7ac80a 100644 --- a/security/openssh/Makefile.intree +++ b/security/openssh/Makefile.intree @@ -1,17 +1,7 @@ -# $NetBSD: Makefile.intree,v 1.4 2002/08/20 17:13:38 abs Exp $ +# $NetBSD: Makefile.intree,v 1.5 2002/08/28 04:00:55 jlam Exp $ .include "../../mk/bsd.prefs.mk" -# We would like to require an in-tree OpenSSL that is at least 0.9.5a, but the -# openssl buildlink.mk forces at least 0.9.5f, which makes -# UPDATE_INTREE_OPENSSH useless for anything before 1.6x -# -# USE_OPENSSL_VERSION:= ${OPENSSL_VERSION_095A} -.include "../../security/openssl/buildlink.mk" -.if ${_NEED_OPENSSL} == "YES" -IGNORE= "OpenSSL>=0.9.5f in the base distribution is required." -.endif - _UPDATE_INTREE_OPENSSH?= NO .if ${OPSYS} == "NetBSD" . for PATTERN in 1.5 1.5.* @@ -28,6 +18,17 @@ PKG_SYSCONFSUBDIR:= ssh . endfor .endif +# We would like to require an in-tree OpenSSL that is at least 0.9.5a, but the +# openssl buildlink.mk forces at least 0.9.6f, which makes +# UPDATE_INTREE_OPENSSH useless for anything before 1.6* +# +# USE_OPENSSL_VERSION:= ${OPENSSL_VERSION_095A} +.include "../../security/openssl/buildlink2.mk" +.if ${_NEED_OPENSSL} == "YES" +_UPDATE_INTREE_OPENSSH= NO +IGNORE= "OpenSSL>=0.9.6f in the base distribution is required." +.endif + .if ${_UPDATE_INTREE_OPENSSH} == "YES" NO_MTREE= yes NO_PKG_REGISTER= yes @@ -38,7 +39,7 @@ PKG_SYSCONFBASE:= /etc MANDIR:= share/man RCD_SCRIPTS_EGDIR:= share/examples/openssh .else -IGNORE= "Unable to update in-tree OpenSSH for ${OPSYS}-${OS_VERSION}." +IGNORE?= "Unable to update in-tree OpenSSH for ${OPSYS}-${OS_VERSION}." .endif real-tarball: |