aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/ssh/Makefile11
-rw-r--r--security/ssh2/Makefile11
2 files changed, 6 insertions, 16 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index e81f93518e84..c16456e0d895 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 Jul 1995
# Whom: torstenb@FreeBSD.ORG
#
-# $Id: Makefile,v 1.64 1998/09/17 10:53:31 asami Exp $
+# $Id: Makefile,v 1.65 1998/09/26 04:42:09 dima Exp $
#
# Maximal ssh package requires YES values for
# USE_PERL, USE_TCPWRAP
@@ -18,7 +18,7 @@ MAINTAINER= torstenb@FreeBSD.ORG
# You can set USA_RESIDENT appropriately in /etc/make.conf if this bugs you..
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-DISTFILES= ${DISTNAME}.tar.gz rsaref2.tar.gz
+DISTFILES= ${DISTNAME}.tar.gz
MASTER_SITES= \
ftp://ftp.funet.fi/pub/unix/security/login/ssh/ \
ftp://nic.funet.fi/pub/crypt/mirrors/ftp.dsi.unimi.it/applied-crypto/ \
@@ -56,6 +56,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --with-etcdir=${PREFIX}/etc
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
CONFIGURE_ARGS+= --with-rsaref
+LIB_DEPENDS+= rsaref.2:${PORTSDIR}/security/rsaref
.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
@@ -97,12 +98,6 @@ fetch-depends:
@false
.endif
-post-extract:
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
- @mv ${WRKDIR}/rsaref2 ${WRKSRC}/rsaref2
- @(cd ${WRKSRC} && patch -s -p < ${FILESDIR}/rsa64.diff)
-.endif
-
post-install:
@if [ ! -f ${PREFIX}/etc/ssh_host_key ]; then \
echo "Generating a secret host key..."; \
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index e81f93518e84..c16456e0d895 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -3,7 +3,7 @@
# Date created: 30 Jul 1995
# Whom: torstenb@FreeBSD.ORG
#
-# $Id: Makefile,v 1.64 1998/09/17 10:53:31 asami Exp $
+# $Id: Makefile,v 1.65 1998/09/26 04:42:09 dima Exp $
#
# Maximal ssh package requires YES values for
# USE_PERL, USE_TCPWRAP
@@ -18,7 +18,7 @@ MAINTAINER= torstenb@FreeBSD.ORG
# You can set USA_RESIDENT appropriately in /etc/make.conf if this bugs you..
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-DISTFILES= ${DISTNAME}.tar.gz rsaref2.tar.gz
+DISTFILES= ${DISTNAME}.tar.gz
MASTER_SITES= \
ftp://ftp.funet.fi/pub/unix/security/login/ssh/ \
ftp://nic.funet.fi/pub/crypt/mirrors/ftp.dsi.unimi.it/applied-crypto/ \
@@ -56,6 +56,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --with-etcdir=${PREFIX}/etc
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
CONFIGURE_ARGS+= --with-rsaref
+LIB_DEPENDS+= rsaref.2:${PORTSDIR}/security/rsaref
.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
@@ -97,12 +98,6 @@ fetch-depends:
@false
.endif
-post-extract:
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
- @mv ${WRKDIR}/rsaref2 ${WRKSRC}/rsaref2
- @(cd ${WRKSRC} && patch -s -p < ${FILESDIR}/rsa64.diff)
-.endif
-
post-install:
@if [ ! -f ${PREFIX}/etc/ssh_host_key ]; then \
echo "Generating a secret host key..."; \