From 38845f0013c32cddb1530df0fdcc9517c9127747 Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 25 May 2005 19:37:18 +0000 Subject: 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.) --- security/openssh/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'security') diff --git a/security/openssh/Makefile b/security/openssh/Makefile index aa5c4625257..79e891c61b0 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -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,11 +31,12 @@ CRYPTO= yes # 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 +.include "options.mk" + .if ${OPSYS} == "Interix" # normal MESSAGE does not apply, as privsep is not in use @@ -49,7 +50,6 @@ LIBS+= -lbind -ldb -lcrypt .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} -- cgit v1.2.3