From owner-svn-ports-all@FreeBSD.ORG Wed Oct 29 07:56:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C8B301CF; Wed, 29 Oct 2014 07:56:54 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AF17CF7C; Wed, 29 Oct 2014 07:56:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9T7usQ0080668; Wed, 29 Oct 2014 07:56:54 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9T7us2I080666; Wed, 29 Oct 2014 07:56:54 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201410290756.s9T7us2I080666@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 29 Oct 2014 07:56:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371665 - in head/net-mgmt: monitoring-plugins 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 07:56:54 -0000 Author: mat Date: Wed Oct 29 07:56:53 2014 New Revision: 371665 URL: https://svnweb.freebsd.org/changeset/ports/371665 QAT: https://qat.redports.org/buildarchive/r371665/ Log: Add an option to build with ssh from security/openssh-portable instead of base ssh. PR: 193754 Submitted by: chrysalis chrysalisnet org Sponsored by: Absolight Modified: head/net-mgmt/monitoring-plugins/Makefile head/net-mgmt/nagios-plugins/Makefile Modified: head/net-mgmt/monitoring-plugins/Makefile ============================================================================== --- head/net-mgmt/monitoring-plugins/Makefile Wed Oct 29 07:43:00 2014 (r371664) +++ head/net-mgmt/monitoring-plugins/Makefile Wed Oct 29 07:56:53 2014 (r371665) @@ -3,7 +3,7 @@ PORTNAME= monitoring-plugins PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} @@ -17,8 +17,8 @@ CONFLICTS_INSTALL= nagios-plugins-* USES= charsetfix gmake perl5 libtool USE_SUBMAKE= yes - -OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS +WITH=SSH_PORTABLE +OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS SSH_PORTABLE OPTIONS_SINGLE= DNS OPTIONS_SINGLE_DNS= DNS_BASE DNS_BINDTOOLS DNS_BIND99 DNS_BIND910 OPTIONS_DEFAULT=IPV6 EXTRAOPTS DNS_BASE @@ -34,6 +34,7 @@ LDAP_DESC= OpenLDAP support (check_ldap) JAIL_DESC= Compilation within jail(8) (see help) DBI_DESC= Check database using DBI EXTRAOPTS_DESC= Parsing of plugins ini config files for extra options +SSH_PORTABLE_DESC= Build check_ssh with ports openssh (instead of base) DNS_DESC= Configuration of check_dig and check_dns (see help) @@ -121,6 +122,10 @@ DNS_BIND910_BUILD_DEPENDS= ${LOCALBASE}/ DNS_BIND910_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ --with-nslookup-command=${LOCALBASE}/bin/nslookup +SSH_PORTABLE_BUILD_DEPENDS= ${LOCALBASE}/bin/ssh:${PORTSDIR}/security/openssh-portable +SSH_PORTABLE_RUN_DEPENDS:= ${SSH_PORTABLE_BUILD_DEPENDS} +SSH_PORTABLE_CONFIGURE_ON= --with-ssh-command=${LOCALBASE}/bin/ssh + .include .if ${OSVERSION} > 1000055 && ${PORT_OPTIONS:MDNS_BASE} @@ -135,7 +140,7 @@ CONFIGURE_ARGS+= --with-dig-command=/usr PLIST_SUB+= CHECK_DNS="" .endif -.if !exists(/usr/bin/ssh) +.if !exists(/usr/bin/ssh) && empty(PORT_OPTIONS:MSSH_PORTABLE) PLIST_SUB+= SSH="@comment " .else PLIST_SUB+= SSH="" Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Wed Oct 29 07:43:00 2014 (r371664) +++ head/net-mgmt/nagios-plugins/Makefile Wed Oct 29 07:56:53 2014 (r371665) @@ -3,7 +3,7 @@ PORTNAME= nagios-plugins PORTVERSION= 2.0.3 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ @@ -19,8 +19,8 @@ CONFLICTS_INSTALL= monitoring-plugins-* USES= charsetfix gmake perl5 libtool USE_SUBMAKE= yes - -OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS +WITH=SSH_PORTABLE +OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS SSH_PORTABLE OPTIONS_SINGLE= DNS OPTIONS_SINGLE_DNS= DNS_BASE DNS_BINDTOOLS DNS_BIND99 DNS_BIND910 OPTIONS_DEFAULT=IPV6 EXTRAOPTS DNS_BASE @@ -36,6 +36,7 @@ LDAP_DESC= OpenLDAP support (check_ldap) JAIL_DESC= Compilation within jail(8) (see help) DBI_DESC= Check database using DBI EXTRAOPTS_DESC= Parsing of plugins ini config files for extra options +SSH_PORTABLE_DESC= Build check_ssh with ports openssh (instead of base) DNS_DESC= Configuration of check_dig and check_dns (see help) @@ -127,6 +128,10 @@ DNS_BIND910_BUILD_DEPENDS= ${LOCALBASE}/ DNS_BIND910_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ --with-nslookup-command=${LOCALBASE}/bin/nslookup +SSH_PORTABLE_BUILD_DEPENDS= ${LOCALBASE}/bin/ssh:${PORTSDIR}/security/openssh-portable +SSH_PORTABLE_RUN_DEPENDS:= ${SSH_PORTABLE_BUILD_DEPENDS} +SSH_PORTABLE_CONFIGURE_ON= --with-ssh-command=${LOCALBASE}/bin/ssh + .include .if ${OSVERSION} > 1000055 && ${PORT_OPTIONS:MDNS_BASE} @@ -141,7 +146,7 @@ CONFIGURE_ARGS+= --with-dig-command=/usr PLIST_SUB+= CHECK_DNS="" .endif -.if !exists(/usr/bin/ssh) +.if !exists(/usr/bin/ssh) && empty(PORT_OPTIONS:MSSH_PORTABLE) PLIST_SUB+= SSH="@comment " .else PLIST_SUB+= SSH=""