diff options
| author | Brian Feldman <green@FreeBSD.org> | 2000-02-12 23:55:48 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2000-02-12 23:55:48 +0000 |
| commit | df4e9a1d72f3c7b8a2f8d760dcef0b64f8fef98b (patch) | |
| tree | fd0a641e6d6dc0725b3b93cb8bdef2cd6ff54d40 | |
| parent | - Remove redundant MANCOMPRESSED line (diff) | |
Clean things up by using the new knob for OpenSSL usage.
Submitted by: kris
Notes
Notes:
svn path=/head/; revision=25722
| -rw-r--r-- | security/openssh/Makefile | 12 | ||||
| -rw-r--r-- | security/openssh/files/patch-ab | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 331f98a309a8..7459c66b3453 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://internat.FreeBSD.org/pub/Crypto/OpenSSH/ MAINTAINER= green@FreeBSD.org -LIB_DEPENDS= crypto.1:${PORTSDIR}/security/openssl +USE_OPENSSL= RSA .include <bsd.port.pre.mk> CAT?= /bin/cat @@ -29,13 +29,9 @@ SED?= /usr/bin/sed CVS_DATE_!= ${ECHO} -n "${CVS_DATE}" | ${SED} 's/[ \t:]/_/g' CVS_SITES= anoncvs@anoncvs1.ca.openbsd.org:/cvs \ :pserver:anoncvs@anoncvs1.usa.openbsd.org:/cvs -CRYPTOLIBS= -L${PREFIX}/lib -lcrypto -.ifdef USA_RESIDENT -.if ${USA_RESIDENT} == YES -CRYPTOLIBS+= -lRSAglue -lrsaref -.endif -.else -.error "USA_RESIDENT must be set to 'YES' or 'NO' correctly!" +CRYPTOLIBS= -L${OPENSSLLIB} -lcrypto +.if defined(OPENSSL_RSAREF) +CRYPTOLIBS+= -lRSAglue -L${LOCALBASE}/lib -lrsaref .endif # Here, MANDIR is concetenated to DESTDIR which all forms the man install dir... MAKE_ENV= DESTDIR=${PREFIX} MANDIR=/man/man CRYPTOLIBS="${CRYPTOLIBS}" diff --git a/security/openssh/files/patch-ab b/security/openssh/files/patch-ab index 6154746a3d81..d5f8ab95fa69 100644 --- a/security/openssh/files/patch-ab +++ b/security/openssh/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.inc.orig Wed Feb 9 01:00:11 2000 -+++ Makefile.inc Wed Feb 9 01:08:09 2000 +--- Makefile.inc.orig Fri Feb 11 23:56:29 2000 ++++ Makefile.inc Fri Feb 11 23:57:56 2000 @@ -2,10 +2,14 @@ .include <bsd.obj.mk> @@ -15,7 +15,7 @@ +TCP_WRAPPERS?= yes +.if !defined(MAKEFILE_INC_FIRST_PASS) +MAKEFILE_INC_FIRST_PASS= 0 -+CFLAGS+= -I${PREFIX}/include ${INET6FLAGS} ++CFLAGS+= -I${OPENSSLINC} ${INET6FLAGS} LDADD+= -L${.CURDIR}/../lib -lssh DPADD+= ${.CURDIR}/../lib/libssh.a .endif |