diff options
| author | demon <demon@FreeBSD.org> | 2013-12-16 20:06:28 +0800 |
|---|---|---|
| committer | demon <demon@FreeBSD.org> | 2013-12-16 20:06:28 +0800 |
| commit | d8f57bdee21e7ae9233d706109c1afba528a4260 (patch) | |
| tree | dda038b5543e11d8f9a60a9ca8eecbb236dfba01 /net-mgmt | |
| parent | 3806c7ac6bb8164c339be3791542f803c870d3fd (diff) | |
| download | freebsd-ports-gnome-d8f57bdee21e7ae9233d706109c1afba528a4260.tar.gz freebsd-ports-gnome-d8f57bdee21e7ae9233d706109c1afba528a4260.tar.zst freebsd-ports-gnome-d8f57bdee21e7ae9233d706109c1afba528a4260.zip | |
Fix PLIST for users with world built WITHOUT_OPENSSH.
PR: 184736
Submitted by: wallman
(he proposed different solution)
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/nagios-plugins/Makefile | 10 | ||||
| -rw-r--r-- | net-mgmt/nagios-plugins/pkg-plist | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile index c17a646e1166..60c7690df30c 100644 --- a/net-mgmt/nagios-plugins/Makefile +++ b/net-mgmt/nagios-plugins/Makefile @@ -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: diff --git a/net-mgmt/nagios-plugins/pkg-plist b/net-mgmt/nagios-plugins/pkg-plist index a16611407bf1..9ed3fb8ddc7f 100644 --- a/net-mgmt/nagios-plugins/pkg-plist +++ b/net-mgmt/nagios-plugins/pkg-plist @@ -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 |