[pkgsrc/trunk]: pkgsrc/security/openssh Noticed that the PAM +DISPLAY message...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7617d65e3f83
branches:  trunk
changeset: 494576:7617d65e3f83
user:      reed <reed%pkgsrc.org@localhost>
date:      Wed May 25 19:37:18 2005 +0000

description:
Noticed that the PAM +DISPLAY message was not displayed
and extra pam file was not included in +CONTENTS.

So moved the include of options.mk to after the PLIST_SRC and
MESSAGE_SRC are defined as empty.
(MESSAGE_SRC is redefined if Interix and if PAM PKG_OPTION was enabled
then this still needs to be fixed.)

diffstat:

 security/openssh/Makefile |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 44a85cf94344 -r 7617d65e3f83 security/openssh/Makefile
--- a/security/openssh/Makefile Wed May 25 19:21:25 2005 +0000
+++ b/security/openssh/Makefile Wed May 25 19:37:18 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.149 2005/04/28 14:11:13 wiz Exp $
+# $NetBSD: Makefile,v 1.150 2005/05/25 19:37:18 reed Exp $
 
 DISTNAME=              openssh-3.9p1
 PKGNAME=               openssh-3.9.1
-PKGREVISION=           5
+PKGREVISION=           6
 SVR4_PKGNAME=          ossh
 CATEGORIES=            security
 MASTER_SITES=          ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
@@ -31,10 +31,11 @@
 # retain the following line, for IPv6-ready pkgsrc webpage
 BUILD_DEFS+=           USE_INET6
 
-.include "options.mk"
+INSTALL_TARGET=                install-nokeys
+MESSAGE_SRC=           ${.CURDIR}/MESSAGE
+PLIST_SRC=             # empty
 
-INSTALL_TARGET=                install-nokeys
-PLIST_SRC=             # empty
+.include "options.mk"
 
 .if ${OPSYS} == "Interix"
 
@@ -49,7 +50,6 @@
 
 .else # not Interix
 
-MESSAGE_SRC=           ${.CURDIR}/MESSAGE
 PKG_USERS=             ${OPENSSH_USER}:${OPENSSH_GROUP}:${OPENSSH_UID}:sshd\\ privsep:${OPENSSH_CHROOT}:${NOLOGIN}
 PKG_GROUPS=             ${OPENSSH_GROUP}:${OPENSSH_GID}