diff options
| author | dinoex <dinoex@FreeBSD.org> | 2002-06-01 04:51:48 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2002-06-01 04:51:48 +0800 |
| commit | bd0c33d94bd969f3f27232ffad927d099288315b (patch) | |
| tree | 5c696ef47eb3b08b2775f8da3695a2017d82662e /security/openssh-portable | |
| parent | 5470bfc1e767870d1ced3e3977063109436376a5 (diff) | |
| download | freebsd-ports-gnome-bd0c33d94bd969f3f27232ffad927d099288315b.tar.gz freebsd-ports-gnome-bd0c33d94bd969f3f27232ffad927d099288315b.tar.zst freebsd-ports-gnome-bd0c33d94bd969f3f27232ffad927d099288315b.zip | |
- get rid of duplicate code in Makefiles.
- Fix USE_OPENSSL_PORT and USE_OPENSSL_BASE
- drop obsolete/broken USE_OPENSSL
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 16 | ||||
| -rw-r--r-- | security/openssh-portable/distinfo | 3 |
2 files changed, 5 insertions, 14 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 3de6bdb4a6de..2472e0981884 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -6,6 +6,7 @@ # PORTNAME= openssh +PORTREVISION= 1 PORTVERSION= 3.2.3p1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ @@ -20,7 +21,6 @@ MLINKS= ssh.1 slogin.1 MAN8= sftp-server.8 sshd.8 CRYPTOLIBS= -L${OPENSSLLIB} -lcrypto -USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} --with-md5-passwords CLEAN= etc/ssh_config etc/sshd_config etc/moduli \ @@ -37,6 +37,7 @@ CONFIGURE_ARGS+= --with-tcp-wrappers .endif .if defined(OPENSSH_OVERWRITE_BASE) +USE_OPELSSL_BASE= yes PKGNAMESUFFIX= -overwrite-base PREFIX= /usr MANPREFIX= ${PREFIX}/share @@ -78,16 +79,7 @@ post-install: .include <bsd.port.pre.mk> -.if ${OSVERSION} < 430000 || exists(${LOCALBASE}/lib/libcrypto.so.3) -OPENSSLBASE= ${LOCALBASE} -OPENSSLDIR= ${OPENSSLBASE}/openssl -LIB_DEPENDS+= crypto.3:${PORTSDIR}/security/openssl -OPENSSLLIB= ${OPENSSLBASE}/lib -OPENSSLINC= ${OPENSSLBASE}/include -MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \ - OPENSSLBASE=${OPENSSLBASE} OPENSSLDIR=${OPENSSLDIR} -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -.endif - +.include <${PORTSDIR}/security/openssl/Makefile.ssl> +CONFIGURE_ARGS+= --with-ssl-dir=${OPENSSLBASE} .include <bsd.port.post.mk> diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index 0767cb06a250..8433204f3ca4 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -1,3 +1,2 @@ MD5 (openssh-3.2.3p1.tar.gz) = f153ccdb5a91fa06ec78d0c6313f4d77 -MD5 (openssh-3.1p1-gssapi-20020325.diff) = a5002539db6b838190ad92bc627f6b5e -MD5 (openssh-mit-krb5-20020326.diff) = 2f83bf4f0185f20672c68856aee643c8 +MD5 (openssh-3.2.3p1-gssapi-20020527.diff) = 27f170956f607b951ffda48da588b00a |