summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Feldman <green@FreeBSD.org>1999-11-15 06:18:46 +0000
committerBrian Feldman <green@FreeBSD.org>1999-11-15 06:18:46 +0000
commitdb6ff5ab61a8436971a86ef81271282b77f86454 (patch)
treecaf95b412957f771c241d74cb4b23366d57345f7
parentMake the WRKSRC logic smarter. (diff)
Enable TCP wrapper support (conditionalized to turn off if tcpd.h is
nonexistant). Also, add the Makefile hooks for AFS, Kerberos, and S/Key.
Notes
Notes: svn path=/head/; revision=23135
-rw-r--r--security/openssh/Makefile11
-rw-r--r--security/openssh/files/patch-ab8
2 files changed, 14 insertions, 5 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 34c6e1065c66..b3cef210d607 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -30,7 +30,16 @@ CRYPTOLIBS+= -lRSAglue -lrsaref
# Here, MANDIR is concetenated to DESTDIR which all forms the man install dir...
MAKE_ENV= DESTDIR=${PREFIX} MANDIR=/man/man CRYPTOLIBS="${CRYPTOLIBS}"
.if !exists(/usr/include/tcpd.h)
-MAKE_ENV+= TCP_WRAPPERS=NO
+MAKE_ENV+= TCP_WRAPPERS=no
+.endif
+.if defined(AFS) && ${AFS} == YES
+MAKE_ENV+= AFS=yes
+.endif
+.if defined(KERBEROS) && ${KERBEROS} == YES
+MAKE_ENV+= KERBEROS=yes
+.endif
+.if defined(SKEY) && ${SKEY} == YES
+MAKE_ENV+= SKEY=yes
.endif
STAMPFILE= ${DISTDIR}/${PKGNAME}/.stamp
WRKSRC= ${WRKDIR}/ssh
diff --git a/security/openssh/files/patch-ab b/security/openssh/files/patch-ab
index a2a1f00e365b..a65c47f7601c 100644
--- a/security/openssh/files/patch-ab
+++ b/security/openssh/files/patch-ab
@@ -10,10 +10,10 @@
-LDADD+= -L${.CURDIR}/../lib/${__objdir} -lssh
-DPADD+= ${.CURDIR}/../lib/${__objdir}/libssh.a
-.else
-+AFS?= NO
-+KERBEROS?= NO
-+SKEY?= NO
-+TCP_WRAPPERS?= YES
++AFS?= no
++KERBEROS?= no
++SKEY?= no
++TCP_WRAPPERS?= yes
LDADD+= -L${.CURDIR}/../lib -lssh
DPADD+= ${.CURDIR}/../lib/libssh.a
-.endif