diff options
| -rw-r--r-- | security/openssh/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh/files/patch-ab | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 025fb7566ffc..e30e97f81e8e 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -38,7 +38,7 @@ MAKE_ENV= DESTDIR=${PREFIX} MANDIR=/man/man CRYPTOLIBS="${CRYPTOLIBS}" .if ${OSVERSION} < 400014 MAKE_ENV+= COMPAT_GETADDRINFO=yes .else -MAKE_ENV+= USE_INET6=yes +MAKE_ENV+= INET6FLAGS=-DINET6 .endif .if !exists(/usr/include/tcpd.h) MAKE_ENV+= TCP_WRAPPERS=no diff --git a/security/openssh/files/patch-ab b/security/openssh/files/patch-ab index e2da3f1e9758..6154746a3d81 100644 --- a/security/openssh/files/patch-ab +++ b/security/openssh/files/patch-ab @@ -1,6 +1,6 @@ ---- Makefile.inc.orig Fri Jan 14 08:35:05 2000 -+++ Makefile.inc Fri Jan 14 08:40:03 2000 -@@ -2,10 +2,17 @@ +--- Makefile.inc.orig Wed Feb 9 01:00:11 2000 ++++ Makefile.inc Wed Feb 9 01:08:09 2000 +@@ -2,10 +2,14 @@ .include <bsd.obj.mk> @@ -15,10 +15,7 @@ +TCP_WRAPPERS?= yes +.if !defined(MAKEFILE_INC_FIRST_PASS) +MAKEFILE_INC_FIRST_PASS= 0 -+CFLAGS+= -I${PREFIX}/include -+.if defined(USE_INET6) -+CFLAGS+= -DINET6 -+.endif ++CFLAGS+= -I${PREFIX}/include ${INET6FLAGS} LDADD+= -L${.CURDIR}/../lib -lssh DPADD+= ${.CURDIR}/../lib/libssh.a .endif |