svn commit: r336629 - head/net-mgmt/nagios-plugins

[Dmitry Sivachenko]

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