[pkgsrc/trunk]: pkgsrc/security/openssh Convert to bl3; update comments in Ma...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2d0fe8b8d995
branches:  trunk
changeset: 474150:2d0fe8b8d995
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Apr 25 23:36:52 2004 +0000

description:
Convert to bl3; update comments in Makefile.intree.

diffstat:

 security/openssh/Makefile        |  14 +++++++-------
 security/openssh/Makefile.intree |   8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (75 lines):

diff -r db8b76c3db46 -r 2d0fe8b8d995 security/openssh/Makefile
--- a/security/openssh/Makefile Sun Apr 25 23:34:07 2004 +0000
+++ b/security/openssh/Makefile Sun Apr 25 23:36:52 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2004/04/23 22:07:58 reed Exp $
+# $NetBSD: Makefile,v 1.126 2004/04/25 23:36:52 wiz Exp $
 
 DISTNAME=              openssh-3.8p1
 PKGNAME=               openssh-3.8.1
@@ -46,7 +46,7 @@
 
 PLIST_SUBST+=          MANDIR=${MANDIR}
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_PKGINSTALL=                yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-mantype=man
@@ -62,7 +62,7 @@
 # XXX: why yet.  For the moment, disable PAM authentication.
 #
 #.if defined(USE_PAM)
-#.include "../../security/PAM/buildlink2.mk"
+#.include "../../security/PAM/buildlink3.mk"
 #CONFIGURE_ARGS+=      --with-pam
 #PLIST_SRC+=           ${.CURDIR}/PLIST.pam
 #MESSAGE_SRC+=         ${.CURDIR}/MESSAGE.pam
@@ -78,7 +78,7 @@
 # (4: sslen) to skeychallenge instead of 3, so disable s/key support.
 #
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
-.  include "../../security/skey/buildlink2.mk"
+.  include "../../security/skey/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-skey=${BUILDLINK_PREFIX.skey}
 .elif ${OPSYS} == "NetBSD"
 #CONFIGURE_ARGS+=      --with-skey=/usr
@@ -153,8 +153,8 @@
 #      ${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.freebsd ${EGDIR}/sshd.pam
 #.endif
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../security/tcp_wrappers/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r db8b76c3db46 -r 2d0fe8b8d995 security/openssh/Makefile.intree
--- a/security/openssh/Makefile.intree  Sun Apr 25 23:34:07 2004 +0000
+++ b/security/openssh/Makefile.intree  Sun Apr 25 23:36:52 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.intree,v 1.7 2002/12/07 02:39:03 schmonz Exp $
+# $NetBSD: Makefile.intree,v 1.8 2004/04/25 23:36:52 wiz Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -19,14 +19,14 @@
 .endif
 
 # We would like to require an in-tree OpenSSL that is at least 0.9.5a, but the
-# openssl buildlink2.mk forces at least 0.9.6f, which makes
+# openssl buildlink3.mk forces at least 0.9.6m, which makes
 # UPDATE_INTREE_OPENSSH useless for anything before 1.6*
 #
 # USE_OPENSSL_VERSION:=        ${OPENSSL_VERSION_095A}
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 .if ${_NEED_OPENSSL} == "YES"
 _UPDATE_INTREE_OPENSSH=                NO
-PKG_FAIL_REASON=       "OpenSSL>=0.9.6f in the base distribution is required."
+PKG_FAIL_REASON=       "OpenSSL>=0.9.6m in the base distribution is required."
 .endif
 
 .if ${_UPDATE_INTREE_OPENSSH} == "YES"