Convert to use bsd.options.mk with the following options:

	hpn-patch kerberos PAM (only Linux)

The hpn-patch option uses the patch available in:
http://www.psc.edu/networking/projects/hpn-ssh/ to enable high performance
connections.

Also use VARBASE intead of hardcoding /var.

Bump PKGREVISION.

3 files changed, 56 insertions, 21 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index c8773850982..1217dc9711f 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.144 2004/10/24 02:52:15 grant Exp $
+# $NetBSD: Makefile,v 1.145 2004/11/25 19:25:28 xtraeme Exp $
 
 DISTNAME=		openssh-3.9p1
 PKGNAME=		openssh-3.9.1
-PKGREVISION=		2
+PKGREVISION=		3
 SVR4_PKGNAME=		ossh
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
@@ -29,9 +29,8 @@ CRYPTO=			yes
 
 # retain the following line, for IPv6-ready pkgsrc webpage
 BUILD_DEFS+=		USE_INET6
-BUILD_DEFS+=		KERBEROS
 
-.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 INSTALL_TARGET=		install-nokeys
 PLIST_SRC=		# empty
@@ -40,7 +39,7 @@ MESSAGE_SRC=		${.CURDIR}/MESSAGE
 PKG_USERS=		${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\\ privsep:${OPENSSH_CHROOT}:${NOLOGIN}
 PKG_GROUPS=             ${OPENSSH_GROUP}:${OPENSSH_GID}
 
-SSH_PID_DIR=		/var/run	# default directory for PID files
+SSH_PID_DIR=		${VARBASE}/run	# default directory for PID files
 
 PKG_SYSCONFSUBDIR=	ssh
 MANDIR=			man
@@ -59,15 +58,6 @@ CONFIGURE_ARGS+=	--with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers}
 CONFIGURE_ARGS+=	--with-privsep-path=${OPENSSH_CHROOT}
 CONFIGURE_ARGS+=	--with-privsep-user=${OPENSSH_USER}
 
-# XXX: PAM authentication causes memory faults, and haven't tracked down
-# XXX: why yet.  For the moment, disable PAM authentication for non-Linux.
-.if defined(USE_PAM) && ${OPSYS} == "Linux"
-.include "../../security/PAM/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pam
-PLIST_SRC+=		${.CURDIR}/PLIST.pam
-MESSAGE_SRC+=		${.CURDIR}/MESSAGE.pam
-.endif
-
 # the openssh configure script finds and uses ${LD} if defined and
 # defaults to ${CC} if not. we override LD here, since running the
 # linker directly results in undefined symbols for obvious reasons.
@@ -86,11 +76,6 @@ CONFIGURE_ARGS+=	--with-skey=${BUILDLINK_PREFIX.skey}
 CONFIGURE_ARGS+=	--without-skey
 .endif
 
-.if defined(KERBEROS)
-.  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-kerberos5=${KRB5BASE}
-.endif
-
 .if (${OPSYS} == "NetBSD") && exists(/usr/include/utmpx.h)
 # if we have utmpx et al do not try to use login()
 CONFIGURE_ARGS+=	--disable-libutil
@@ -163,7 +148,7 @@ post-install:
 	cd ${WRKSRC}; for file in ${CONFS} ${SUPPS}; do			\
 		${INSTALL_DATA} $${file}.out ${EGDIR}/$${file};		\
 	done
-.if defined(USE_PAM) && ${OPSYS} == "Linux"
+.if !empty(PKG_OPTIONS:MPAM) && ${OPSYS} == "Linux"
 	${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.generic ${EGDIR}/sshd.pam
 .endif
 
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 76bcb8e0b45..2ba87dde802 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.36 2004/11/04 12:46:33 markd Exp $
+$NetBSD: distinfo,v 1.37 2004/11/25 19:25:28 xtraeme Exp $
 
 SHA1 (openssh-3.9p1.tar.gz) = 80b19d83a9d4717f5c38b2d950501e1471f60afc
 Size (openssh-3.9p1.tar.gz) = 854027 bytes
+SHA1 (openssh-3.9p1-hpn.diff) = 1821c590b9b5effa3750ebf0166fe3f22d00faad
+Size (openssh-3.9p1-hpn.diff) = 8387 bytes
 SHA1 (patch-aa) = 5d0b1cf5cf92e0d314e6458b225074a73f35f857
 SHA1 (patch-ab) = 662440f96d38e43b0c8de7bef260f82d8b7ab737
 SHA1 (patch-ac) = 3ad72f42b066ef1f48e276bccd438da2d6fde980
diff --git a/security/openssh/options.mk b/security/openssh/options.mk
new file mode 100644
index 00000000000..6b0bf53b12f
--- /dev/null
+++ b/security/openssh/options.mk
@@ -0,0 +1,48 @@
+# $NetBSD: options.mk,v 1.1 2004/11/25 19:25:28 xtraeme Exp $
+#
+# XXX Support for the following variables will be removed after the
+# XXX pkgsrc-2004Q4 branch is released:
+# XXX
+# XXX USE_KERBEROS
+# XXX USE_PĀM
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(OPSYS:MLinux)
+.  if defined(USE_PAM) && !empty(USE_PAM:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	PAM
+.  endif
+.endif
+
+.if defined(USE_KERBEROS) && !empty(USE_KERBEROS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=	kerberos
+.endif
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.openssh
+PKG_SUPPORTED_OPTIONS=	kerberos hpn-patch
+
+.if !empty(OPSYS:MLinux)
+PKG_SUPPORTED_OPTIONS+= PAM
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=        --with-kerberos5=${KRB5BASE}
+.endif
+
+.if !empty(PKG_OPTIONS:Mhpn-patch)
+PATCHFILES=		openssh-3.9p1-hpn.diff
+PATCH_SITES=		http://www.psc.edu/networking/projects/hpn-ssh/
+PATCH_DIST_STRIP=	-p1
+.endif
+
+.if !empty(PKG_OPTIONS:MPAM)
+# XXX: PAM authentication causes memory faults, and haven't tracked down
+# XXX: why yet.  For the moment, disable PAM authentication for non-Linux.
+.include "../../security/PAM/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pam
+PLIST_SRC+=		${.CURDIR}/PLIST.pam
+MESSAGE_SRC+=		${.CURDIR}/MESSAGE.pam
+.endif