Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.

5 files changed, 61 insertions, 41 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index d6950dc30bb..f5f560088f8 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2001/06/18 19:54:14 tron Exp $
+# $NetBSD: Makefile,v 1.53 2001/06/28 23:12:16 jlam Exp $
 
 DISTNAME=		openssh-2.9p2
 CATEGORIES=		security
@@ -13,38 +13,12 @@ HOMEPAGE=		http://www.openssh.com/
 COMMENT=		Open Source Secure shell client and server (remote login program)
 
 CONFLICTS=		sftp-*
+CONFLICTS+=		ssh-[0-9]* ssh6-[0-9]*
 
 BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 CRYPTO=			yes
 
-# Check for a usable installed version of OpenSSL.  Version must be greater
-# than 0.9.5a.  If a usable version isn't present, then use the pkgsrc
-# OpenSSL package.
-#
-.if exists(/usr/include/openssl/rsa.h)
-OPENSSLV_H=		/usr/include/openssl/opensslv.h
-OPENSSL_VERSION!=	awk '/.*OPENSSL_VERSION_NUMBER.*/ { print $$3 }' \
-				${OPENSSLV_H}
-OPENSSL_VERSION_095a=	0x0090581fL
-OPENSSL_VERSION_096=	0x0090600fL
-OPENSSL_VERSION_096a=	0x0090601fL
-.if (${OPENSSL_VERSION} != ${OPENSSL_VERSION_095a}) && \
-    (${OPENSSL_VERSION} != ${OPENSSL_VERSION_096}) && \
-    (${OPENSSL_VERSION} != ${OPENSSL_VERSION_096a})
-DEPENDS+=		openssl-0.9.6:../../security/openssl
-SSLBASE=		${LOCALBASE}
-.else
-SSLBASE=		/usr
-.endif
-.else
-DEPENDS+=		openssl-0.9.6:../../security/openssl
-SSLBASE=		${LOCALBASE}
-.endif
-
-CONFLICTS=		ssh-[0-9]* ssh6-[0-9]*
-
 # retain the following line, for IPv6-ready pkgsrc webpage 
 BUILD_DEFS+=		USE_INET6
 BUILD_DEFS+=		SSH_CONF_DIR
@@ -64,18 +38,21 @@ SSH_CONF_DIR?=		/etc
 
 MESSAGE_SUBST+=		SSH_CONF_DIR=${SSH_CONF_DIR}
 
+USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${SSH_CONF_DIR}
-CONFIGURE_ARGS+=	--with-ssl-dir=${SSLBASE}
+CONFIGURE_ARGS+=	--with-ssl-dir=${BUILDLINK_DIR}
 
 # The ssh-askpass program is in ${X11BASE}/bin or ${X11PREFIX}/bin depending
 # on if it's part of the X11 distribution, or if it's installed from pkgsrc
-# (security/ssh-askpass).
+# (security/ssh-askpass).  The configure process will lie about the compiled
+# location of the ssh-askpass program.  In reality, it uses what we give it
+# below.
 #
 .if exists(${X11BASE}/bin/ssh-askpass)
-MAKE_ENV+=		ASKPASS_LOCATION=${X11BASE}/bin
+MAKE_ENV+=		ASKPASS_PROGRAM=${X11BASE}/bin/ssh-askpass
 .else
-MAKE_ENV+=		ASKPASS_LOCATION=${X11PREFIX}/bin
+MAKE_ENV+=		ASKPASS_PROGRAM=${X11PREFIX}/bin/ssh-askpass
 .endif
 
 CHECK_FILES=	bin/slogin man/man1/slogin.1 \
@@ -83,14 +60,9 @@ CHECK_FILES=	bin/slogin man/man1/slogin.1 \
 PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 
 .if (${OPSYS} == SunOS)
-DEPENDS+=		zlib-*:../../devel/zlib
-
 INSTALL_FILE=		${WRKDIR}/INSTALL.SunOS
 .endif
 
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
-
 post-build:
 	for FILE in \
 		${PKGDIR}/DEINSTALL	\
@@ -120,4 +92,6 @@ post-install:
 	  fi; \
 	done
 
+.include "../../devel/zlib/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 1172a4b0305..8b73fd0f0c6 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/06/18 09:56:27 itojun Exp $
+$NetBSD: distinfo,v 1.5 2001/06/28 23:12:16 jlam Exp $
 
 SHA1 (openssh-2.9p2.tar.gz) = add432005b43f71ccf964bb77b37291273dd4ceb
 Size (openssh-2.9p2.tar.gz) = 662590 bytes
-SHA1 (patch-ah) = e0d6462760888270849a18834f03a0adf6b1bccb
+SHA1 (patch-aa) = 78816aa12ddc091bd6d4d82235af0e59d25afac6
+SHA1 (patch-ab) = 236d325113b2808d1fd9c8087cc0149eb382bbbf
+SHA1 (patch-ah) = da09e163310c21b8f5b37d89d4f44bfec9707e67
diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa
new file mode 100644
index 00000000000..0a53585fe96
--- /dev/null
+++ b/security/openssh/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.15 2001/06/28 23:12:16 jlam Exp $
+
+--- configure.orig	Sun Jun 17 00:09:50 2001
++++ configure
+@@ -1796,7 +1796,7 @@
+ 
+ 	;;
+ *-*-netbsd*)
+-	need_dash_r=1
++	#need_dash_r=1		# buildlink.mk
+ 	;;
+ *-*-freebsd*)
+ 	check_for_libcrypt_later=1
+@@ -1828,7 +1828,7 @@
+ *-*-solaris*)
+ 	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ 	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" 
+-	need_dash_r=1
++	#need_dash_r=1		# buildlink.mk
+ 	cat >> confdefs.h <<\EOF
+ #define PAM_SUN_CODEBASE 1
+ EOF
diff --git a/security/openssh/patches/patch-ab b/security/openssh/patches/patch-ab
new file mode 100644
index 00000000000..3a574c8bac5
--- /dev/null
+++ b/security/openssh/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.3 2001/06/28 23:12:16 jlam Exp $
+
+--- configure.in.orig	Mon May 28 13:21:44 2001
++++ configure.in
+@@ -131,7 +131,7 @@
+         )
+ 	;;
+ *-*-netbsd*)
+-	need_dash_r=1
++	#need_dash_r=1		# buildlink.mk
+ 	;;
+ *-*-freebsd*)
+ 	check_for_libcrypt_later=1
+@@ -151,7 +151,7 @@
+ *-*-solaris*)
+ 	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ 	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" 
+-	need_dash_r=1
++	#need_dash_r=1		# buildlink.mk
+ 	AC_DEFINE(PAM_SUN_CODEBASE)
+ 	AC_DEFINE(LOGIN_NEEDS_UTMPX)
+ 	AC_DEFINE(LOGIN_NEEDS_TERM)
diff --git a/security/openssh/patches/patch-ah b/security/openssh/patches/patch-ah
index 46ee206e1d0..4b4cb470510 100644
--- a/security/openssh/patches/patch-ah
+++ b/security/openssh/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.11 2001/05/14 16:32:33 itojun Exp $
+$NetBSD: patch-ah,v 1.12 2001/06/28 23:12:16 jlam Exp $
 
 --- Makefile.in.orig	Fri Apr 27 09:31:08 2001
 +++ Makefile.in	Tue May 15 01:25:53 2001
@@ -15,7 +15,7 @@ $NetBSD: patch-ah,v 1.11 2001/05/14 16:32:33 itojun Exp $
  VPATH=@srcdir@
  SSH_PROGRAM=@bindir@/ssh
 -ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
-+ASKPASS_PROGRAM=/usr/X11R6/bin/ssh-askpass
++#ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
  SFTP_SERVER=$(libexecdir)/sftp-server
  
  PATHS= -DETCDIR=\"$(sysconfdir)\" \