summaryrefslogtreecommitdiff
path: root/security/openssh
diff options
context:
space:
mode:
authorBrian Feldman <green@FreeBSD.org>1999-11-28 21:40:58 +0000
committerBrian Feldman <green@FreeBSD.org>1999-11-28 21:40:58 +0000
commitcc029c1647a38c29eaa8f7d0e1b01d3959a1913a (patch)
treecc49dc7253c350de323d3748ce0187014f342ac6 /security/openssh
parentUpdate to version 1.28 (diff)
Change CFLAGS to get modified in Makefile.inc, fixing the
problem several people have reported with make.conf setting ${CFLAGS}. Partially submitted by: Jos Backus <Jos.Backus@nl.origin-it.com>
Notes
Notes: svn path=/head/; revision=23476
Diffstat (limited to 'security/openssh')
-rw-r--r--security/openssh/Makefile1
-rw-r--r--security/openssh/files/patch-ab9
2 files changed, 6 insertions, 4 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 2900b46c85e5..e21f2032fdd7 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -22,7 +22,6 @@ RESTRICTED= "Links with cryptographic code."
CAT?= /bin/cat
DISTFILES!= ${CAT} ${FILESDIR}/distfiles
-CFLAGS+= -DHAVE_OPENPTY -I${PREFIX}/include
CVS_CMD?= cvs -z3
CVS_DATE= Tue Nov 23 18:52:21 EST 1999
SED?= /usr/bin/sed
diff --git a/security/openssh/files/patch-ab b/security/openssh/files/patch-ab
index 277f63f225b6..e9be90b4c08c 100644
--- a/security/openssh/files/patch-ab
+++ b/security/openssh/files/patch-ab
@@ -1,6 +1,6 @@
--- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/Makefile.inc Mon Oct 25 16:27:26 1999
-+++ ./Makefile.inc Tue Nov 23 19:19:33 1999
-@@ -2,10 +2,9 @@
++++ Makefile.inc Sun Nov 28 16:29:13 1999
+@@ -2,10 +2,13 @@
.include <bsd.obj.mk>
@@ -12,6 +12,9 @@
+KERBEROS?= no
+SKEY?= no
+TCP_WRAPPERS?= yes
++.if !defined(MAKEFILE_INC_FIRST_PASS)
++MAKEFILE_INC_FIRST_PASS= 0
++CFLAGS+= -DHAVE_OPENPTY -I${PREFIX}/include
LDADD+= -L${.CURDIR}/../lib -lssh
DPADD+= ${.CURDIR}/../lib/libssh.a
--.endif
+ .endif