diff options
| author | wiz <wiz> | 2004-04-25 23:36:52 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2004-04-25 23:36:52 +0000 |
| commit | 3225fcc760e233970e206751823dcc095146aaef (patch) | |
| tree | ca54903630587e0da3a73b2d69de35aef8bd3d47 /security | |
| parent | 7c9230145bc33a576dd6b79384c94b1d9152137d (diff) | |
| download | pkgsrc-3225fcc760e233970e206751823dcc095146aaef.tar.gz | |
Convert to bl3; update comments in Makefile.intree.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/Makefile | 14 | ||||
| -rw-r--r-- | security/openssh/Makefile.intree | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 0f9d500170d..1e5a5bf1a97 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -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 @@ MANDIR= man 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 @@ CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER} # 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 @@ CONFIGURE_ENV+= LD=${CC:Q} # (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 @@ post-install: # ${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 --git a/security/openssh/Makefile.intree b/security/openssh/Makefile.intree index baa58d07bf1..6f467c88f78 100644 --- a/security/openssh/Makefile.intree +++ b/security/openssh/Makefile.intree @@ -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 @@ PKG_SYSCONFSUBDIR:= ssh .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" |