From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 16 12:06:29 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 46BC7E19;
 Mon, 16 Dec 2013 12:06:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 32F87196A;
 Mon, 16 Dec 2013 12:06:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGC6Txt018731;
 Mon, 16 Dec 2013 12:06:29 GMT (envelope-from demon@svn.freebsd.org)
Received: (from demon@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGC6SAK018728;
 Mon, 16 Dec 2013 12:06:28 GMT (envelope-from demon@svn.freebsd.org)
Message-Id: <201312161206.rBGC6SAK018728@svn.freebsd.org>
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Mon, 16 Dec 2013 12:06:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336629 - head/net-mgmt/nagios-plugins
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Dec 2013 12:06:29 -0000

Author: demon
Date: Mon Dec 16 12:06:28 2013
New Revision: 336629
URL: http://svnweb.freebsd.org/changeset/ports/336629

Log:
  Fix PLIST for users with world built WITHOUT_OPENSSH.
  
  PR:		184736
  Submitted by:	wallman
  (he proposed different solution)

Modified:
  head/net-mgmt/nagios-plugins/Makefile
  head/net-mgmt/nagios-plugins/pkg-plist

Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile	Mon Dec 16 12:03:47 2013	(r336628)
+++ head/net-mgmt/nagios-plugins/Makefile	Mon Dec 16 12:06:28 2013	(r336629)
@@ -149,6 +149,10 @@ CONFIGURE_ARGS+=	--without-dbi
 PLIST_SUB+=	SUB_DBI="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MEXTRAOPTS}
+CONFIGURE_ARGS+=	--enable-extra-opts
+.endif
+
 .if ${OSVERSION} > 1000055
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-dig-to-drill.diff
 CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill
@@ -157,8 +161,10 @@ PLIST_SUB+=	SUB_DNS="@comment "
 PLIST_SUB+=	SUB_DNS=""
 .endif
 
-.if ${PORT_OPTIONS:MEXTRAOPTS}
-CONFIGURE_ARGS+=	--enable-extra-opts
+.if !exists(/usr/bin/ssh)
+PLIST_SUB+=	SUB_SSH="@comment "
+.else
+PLIST_SUB+=	SUB_SSH=""
 .endif
 
 post-patch:

Modified: head/net-mgmt/nagios-plugins/pkg-plist
==============================================================================
--- head/net-mgmt/nagios-plugins/pkg-plist	Mon Dec 16 12:03:47 2013	(r336628)
+++ head/net-mgmt/nagios-plugins/pkg-plist	Mon Dec 16 12:06:28 2013	(r336629)
@@ -1,6 +1,6 @@
 libexec/nagios/check_apt
 libexec/nagios/check_breeze
-libexec/nagios/check_by_ssh
+%%SUB_SSH%%libexec/nagios/check_by_ssh
 libexec/nagios/check_clamd
 libexec/nagios/check_cluster
 %%SUB_DBI%%libexec/nagios/check_dbi