diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-10-13 14:16:40 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-10-13 14:16:40 +0000 |
| commit | 21dacc250191ba6fdb420664dc1fa44e4f1d8517 (patch) | |
| tree | 89cf727711c88b4b9bfd9e2f086f43a4fa1ce003 /security | |
| parent | fix build on 5-latest (diff) | |
- fix build with kerberos5 from base and missing libdes
- get rid of autoconf dependency
Notes
Notes:
svn path=/head/; revision=91049
Diffstat (limited to 'security')
| -rw-r--r-- | security/hpn-ssh/Makefile | 22 | ||||
| -rw-r--r-- | security/openssh-portable/Makefile | 22 |
2 files changed, 12 insertions, 32 deletions
diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile index 1737076305b3..5dd81a234f67 100644 --- a/security/hpn-ssh/Makefile +++ b/security/hpn-ssh/Makefile @@ -24,6 +24,7 @@ CONFLICTS?= openssh-3.* ssh-1.* ssh2-3.* USE_OPENSSL= yes CRYPTOLIBS= -L${OPENSSLLIB} -lcrypto GNU_CONFIGURE= yes +USE_REINPLACE= yes USE_PERL5_BUILD= yes CONFIGURE_ARGS+= --prefix=${PREFIX} --with-md5-passwords PRECIOUS= ssh_config sshd_config \ @@ -76,29 +77,18 @@ EXTRA_PATCHES+= ${FILESDIR}/batch.patch .if defined(KRB5_HOME) && exists(${KRB5_HOME}) PKGNAMESUFFIX= -gssapi CONFLICTS+= openssh-portable-* -BUILD_DEPENDS+= autoreconf:${PORTSDIR}/devel/autoconf -# USE_AUTOCONF_VER= 252 # broken CONFIGURE_ARGS+= --with-kerberos5=${KRB5_HOME} -AUTORECONF= autoreconf - -post-patch: - @${ECHO_MSG} Applying extra patch for GSS-API key-exchange... - @${PATCH} ${PATCH_DIST_ARGS:S/-p0/-p1/} \ - < ${DISTDIR}/${GSSAPI_PATCH} - -pre-configure: - @${ECHO_MSG} !!!! Warning this option uses autoreconf !!! - (cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOCONF_ENV} ${AUTORECONF} \ - ${AUTOCONF_ARGS}) .else +CONFLICTS+= openssh-gssapi-* .if exists(/usr/include/krb5.h) CONFIGURE_ARGS+= --with-kerberos5 -EXTRA_PATCHES+= ${FILESDIR}/gss-serv.c.patch +EXTRA_PATCHES+= ${FILESDIR}/gss-serv.c.patch .endif -.else -CONFLICTS+= openssh-gssapi-* .endif +post-patch: + @${REINPLACE_CMD} -e 's|-ldes||g' ${WRKSRC}/configure + post-configure: ${SED} -e 's:__PREFIX__:${PREFIX}:g' \ ${FILESDIR}/sshd.sh > ${WRKSRC}/sshd.sh diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 1737076305b3..5dd81a234f67 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -24,6 +24,7 @@ CONFLICTS?= openssh-3.* ssh-1.* ssh2-3.* USE_OPENSSL= yes CRYPTOLIBS= -L${OPENSSLLIB} -lcrypto GNU_CONFIGURE= yes +USE_REINPLACE= yes USE_PERL5_BUILD= yes CONFIGURE_ARGS+= --prefix=${PREFIX} --with-md5-passwords PRECIOUS= ssh_config sshd_config \ @@ -76,29 +77,18 @@ EXTRA_PATCHES+= ${FILESDIR}/batch.patch .if defined(KRB5_HOME) && exists(${KRB5_HOME}) PKGNAMESUFFIX= -gssapi CONFLICTS+= openssh-portable-* -BUILD_DEPENDS+= autoreconf:${PORTSDIR}/devel/autoconf -# USE_AUTOCONF_VER= 252 # broken CONFIGURE_ARGS+= --with-kerberos5=${KRB5_HOME} -AUTORECONF= autoreconf - -post-patch: - @${ECHO_MSG} Applying extra patch for GSS-API key-exchange... - @${PATCH} ${PATCH_DIST_ARGS:S/-p0/-p1/} \ - < ${DISTDIR}/${GSSAPI_PATCH} - -pre-configure: - @${ECHO_MSG} !!!! Warning this option uses autoreconf !!! - (cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOCONF_ENV} ${AUTORECONF} \ - ${AUTOCONF_ARGS}) .else +CONFLICTS+= openssh-gssapi-* .if exists(/usr/include/krb5.h) CONFIGURE_ARGS+= --with-kerberos5 -EXTRA_PATCHES+= ${FILESDIR}/gss-serv.c.patch +EXTRA_PATCHES+= ${FILESDIR}/gss-serv.c.patch .endif -.else -CONFLICTS+= openssh-gssapi-* .endif +post-patch: + @${REINPLACE_CMD} -e 's|-ldes||g' ${WRKSRC}/configure + post-configure: ${SED} -e 's:__PREFIX__:${PREFIX}:g' \ ${FILESDIR}/sshd.sh > ${WRKSRC}/sshd.sh |