Make some various cleanups. Note that I did not add RESTRICTED since this is

in no way cryptographically encumbered code.  The fact that it's
redistributed by me from freefall is completely coincidental.

Submitted by:	obrien, Christian Weisgerber <naddy@unix-ag.uni-kl.de>

5 files changed, 48 insertions, 26 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index b3084bb6f31e..1b6179bc83b3 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -12,10 +12,8 @@ MASTER_SITES=	http://www.FreeBSD.org/~green/
 
 MAINTAINER=	green@FreeBSD.org
 
-BUILD_DEPENDS=	openssl:${PORTSDIR}/security/openssl
 LIB_DEPENDS=	crypto.1:${PORTSDIR}/security/openssl
 
-CFLAGS+=	-I${PREFIX}/include
 # Here, MANDIR is concetenated to DESTDIR which all forms the man install dir...
 MAKE_ENV=	DESTDIR=${PREFIX} MANDIR=/man/man
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
@@ -26,6 +24,6 @@ MAKE_ENV+=	CRYPTOLIBS="-L${PREFIX}/lib -lcrypto"
 WRKSRC=		${WRKDIR}/ssh
 
 pre-install:
-	@cd ${WRKSRC} && make DESTDIR=${PREFIX} distribution
+	@cd ${WRKSRC} && ${MAKE} DESTDIR=${PREFIX} distribution
 
 .include <bsd.port.mk>
diff --git a/security/openssh/files/patch-ab b/security/openssh/files/patch-ab
index b84a51e75e49..a2a1f00e365b 100644
--- a/security/openssh/files/patch-ab
+++ b/security/openssh/files/patch-ab
@@ -1,8 +1,8 @@
-diff -ru /home/green/ssh/Makefile.inc ./Makefile.inc
---- /home/green/ssh/Makefile.inc	Tue Oct 26 03:31:00 1999
-+++ ./Makefile.inc	Mon Nov  8 00:12:19 1999
+--- Makefile.inc.orig	Tue Oct 26 03:31:00 1999
++++ Makefile.inc	Tue Nov  9 06:45:18 1999
 @@ -1,11 +1,8 @@
- CFLAGS+=	-I${.CURDIR}/..
+-CFLAGS+=	-I${.CURDIR}/..
++CFLAGS+=	-I${.CURDIR}/.. -I${PREFIX}/include
  
 -.include <bsd.obj.mk>
 -
diff --git a/security/openssh/files/patch-ap b/security/openssh/files/patch-ap
index 69044b65701d..db9c3f7d8a0a 100644
--- a/security/openssh/files/patch-ap
+++ b/security/openssh/files/patch-ap
@@ -1,10 +1,18 @@
-diff -ru /home/green/ssh/ssh/Makefile ./ssh/Makefile
---- /home/green/ssh/ssh/Makefile	Tue Oct 26 03:31:00 1999
-+++ ./ssh/Makefile	Mon Nov  8 00:13:55 1999
-@@ -10,14 +10,15 @@
- BINMODE?=4555
- .endif
+--- ssh/Makefile.orig	Tue Oct 26 03:31:00 1999
++++ ssh/Makefile	Tue Nov  9 06:56:24 1999
+@@ -2,22 +2,17 @@
  
+ PROG=	ssh
+ BINOWN=	root
++BINMODE=4555
+ 
+-.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \
+-	${MACHINE_ARCH} == "hppa")
+-BINMODE=0000
+-.else
+-BINMODE?=4555
+-.endif
+-
 -BINDIR=	/usr/bin
 -MAN=	ssh.1
 +BINDIR=	/bin
@@ -19,7 +27,7 @@ diff -ru /home/green/ssh/ssh/Makefile ./ssh/Makefile
  
  .if (${KERBEROS} == "yes")
  CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
-@@ -32,5 +33,5 @@
+@@ -32,5 +27,5 @@
  
  .include <bsd.prog.mk>
  
diff --git a/security/openssh/files/patch-ar b/security/openssh/files/patch-ar
index c5607283870c..0fca0fb71c85 100644
--- a/security/openssh/files/patch-ar
+++ b/security/openssh/files/patch-ar
@@ -1,10 +1,18 @@
-diff -ru /home/green/ssh/ssh-agent/Makefile ./ssh-agent/Makefile
---- /home/green/ssh/ssh-agent/Makefile	Thu Oct 28 03:32:00 1999
-+++ ./ssh-agent/Makefile	Mon Nov  8 00:13:41 1999
-@@ -10,12 +10,12 @@
- BINMODE?=555
- .endif
+--- ssh-agent/Makefile.orig	Thu Oct 28 03:32:00 1999
++++ ssh-agent/Makefile	Tue Nov  9 06:41:50 1999
+@@ -2,20 +2,14 @@
  
+ PROG=	ssh-agent
+ BINOWN=	root
++BINMODE=555
+ 
+-.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \
+-	${MACHINE_ARCH} == "hppa")
+-BINMODE=0000
+-.else
+-BINMODE?=555
+-.endif
+-
 -BINDIR=	/usr/bin
 -MAN=	ssh-agent.1
 +BINDIR=	/bin
diff --git a/security/openssh/files/patch-at b/security/openssh/files/patch-at
index cfb1fe69fbc9..861e84136ae6 100644
--- a/security/openssh/files/patch-at
+++ b/security/openssh/files/patch-at
@@ -1,10 +1,18 @@
-diff -ru /home/green/ssh/ssh-keygen/Makefile ./ssh-keygen/Makefile
---- /home/green/ssh/ssh-keygen/Makefile	Thu Oct 28 03:32:00 1999
-+++ ./ssh-keygen/Makefile	Mon Nov  8 00:13:47 1999
-@@ -10,12 +10,12 @@
- BINMODE?=555
- .endif
+--- ssh-keygen/Makefile.orig	Thu Oct 28 03:32:00 1999
++++ ssh-keygen/Makefile	Tue Nov  9 06:42:34 1999
+@@ -2,20 +2,14 @@
  
+ PROG=	ssh-keygen
+ BINOWN=	root
++BINMODE=555
+ 
+-.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \
+-	${MACHINE_ARCH} == "hppa")
+-BINMODE=0000
+-.else
+-BINMODE?=555
+-.endif
+-
 -BINDIR=	/usr/bin
 -MAN=	ssh-keygen.1
 +BINDIR=	/bin