From owner-svn-ports-head@freebsd.org Thu Sep 8 17:02:13 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FCEBBD108A; Thu, 8 Sep 2016 17:02:13 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 40FFCC88; Thu, 8 Sep 2016 17:02:13 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u88H2CA7032605; Thu, 8 Sep 2016 17:02:12 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u88H2CMc032604; Thu, 8 Sep 2016 17:02:12 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201609081702.u88H2CMc032604@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 8 Sep 2016 17:02:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421566 - head/net/foreman-proxy 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.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Sep 2016 17:02:13 -0000 Author: amdmi3 Date: Thu Sep 8 17:02:12 2016 New Revision: 421566 URL: https://svnweb.freebsd.org/changeset/ports/421566 Log: - Fix dependency on sysutils/puppet which was split into sysutils/puppet{37,38,4} ports - Provide option to choose actual puppet version PR: 207326 Submitted by: Karli.Sjoberg@slu.se Approved by: maintainer timeout (ruby, 6 months) Modified: head/net/foreman-proxy/Makefile Modified: head/net/foreman-proxy/Makefile ============================================================================== --- head/net/foreman-proxy/Makefile Thu Sep 8 16:13:55 2016 (r421565) +++ head/net/foreman-proxy/Makefile Thu Sep 8 17:02:12 2016 (r421566) @@ -3,6 +3,7 @@ PORTNAME= foreman-proxy PORTVERSION= 1.10.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.theforeman.org/foreman-proxy/ @@ -10,6 +11,7 @@ MAINTAINER= ruby@FreeBSD.org COMMENT= Foreman Proxy Agent LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \ rubygem-json>=1.8.1:devel/rubygem-json \ @@ -17,9 +19,12 @@ RUN_DEPENDS= rubygem-bundler_ext>=0.4:sy rubygem-sinatra>=1.4.3:www/rubygem-sinatra \ ${LOCALBASE}/bin/wget:ftp/wget -OPTIONS_DEFINE= BMC PUPPET +OPTIONS_DEFINE= BMC +OPTIONS_RADIO= PUPPET +OPTIONS_RADIO_PUPPET= PUPPET3 PUPPET4 BMC_DESC= Depend on rubyipmi for BMC support -PUPPET_DESC= Depend on Puppet +PUPPET3_DESC= Depend on Puppet 3.8 +PUPPET4_DESC= Depend on Puppet 4 USES= tar:bzip2 USE_RUBY= yes @@ -44,7 +49,9 @@ SUB_LIST= RUBY="${RUBY}" \ PLIST_SUB= ${SUB_LIST} MKDIR="${MKDIR}" BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi -PUPPET_RUN_DEPENDS= puppet:sysutils/puppet \ +PUPPET3_RUN_DEPENDS= puppet:sysutils/puppet38 \ + rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas +PUPPET4_RUN_DEPENDS= puppet:sysutils/puppet4 \ rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas post-patch: