Index: head/net/foreman-proxy/Makefile
===================================================================
--- head/net/foreman-proxy/Makefile	(revision 387876)
+++ head/net/foreman-proxy/Makefile	(revision 387877)
@@ -1,90 +1,89 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	foreman-proxy
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.1
 CATEGORIES=	net
+MASTER_SITES=	http://downloads.theforeman.org/foreman-proxy/
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Foreman Proxy Agent
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	rubygem-bundler_ext>=0.4:${PORTSDIR}/sysutils/rubygem-bundler_ext \
 		rubygem-json>=1.8.1:${PORTSDIR}/devel/rubygem-json \
 		rubygem-rack>=1.4:${PORTSDIR}/www/rubygem-rack \
 		rubygem-sinatra>=1.4.3:${PORTSDIR}/www/rubygem-sinatra \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
 OPTIONS_DEFINE=	BMC PUPPET
 BMC_DESC=	Depend on rubyipmi for BMC support
 PUPPET_DESC=	Depend on Puppet
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	theforeman
-GH_PROJECT=	smart-proxy
+USES=		tar:bzip2
 USE_RUBY=	yes
 USE_RAKE=	yes
 USE_RC_SUBR=	foreman-proxy
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 FOREMAN_PROXY_USER?=	foreman_proxy
 FOREMAN_PROXY_GROUP?=	foreman_proxy
 FOREMAN_PROXY_LOGDIR?=	/var/log/foreman-proxy
 FOREMAN_PROXY_RUNDIR?=	/var/run/foreman-proxy
 
 USERS=		${FOREMAN_PROXY_USER}
 GROUPS=		${FOREMAN_PROXY_GROUP}
 
 SUB_LIST=	RUBY="${RUBY}" \
 		FOREMAN_PROXY_USER="${FOREMAN_PROXY_USER}" \
 		FOREMAN_PROXY_GROUP="${FOREMAN_PROXY_GROUP}" \
 		FOREMAN_PROXY_RUNDIR="${FOREMAN_PROXY_RUNDIR}" \
 		FOREMAN_PROXY_LOGDIR="${FOREMAN_PROXY_LOGDIR}"
 
 PLIST_SUB=	${SUB_LIST} MKDIR="${MKDIR}"
 
 BMC_RUN_DEPENDS=	rubygem-rubyipmi>=0.7:${PORTSDIR}/sysutils/rubygem-rubyipmi
 PUPPET_RUN_DEPENDS=	puppet:${PORTSDIR}/sysutils/puppet \
 			rubygem-ruby-augeas>=0.5:${PORTSDIR}/textproc/rubygem-augeas
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s|/usr/bin/env ruby|${RUBY}|g" \
 		-e "s|/usr/bin/ruby|${RUBY}|g" \
 		-e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%DATADIR%%|${DATADIR}|g" \
 		${WRKSRC}/bin/smart-proxy \
 		${WRKSRC}/extra/migrate_settings.rb \
 		${WRKSRC}/extra/query.rb
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/config/settings.d/*.yml.example \
 		${WRKSRC}/lib/proxy/http_downloads.rb
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d
 	${MKDIR} ${STAGEDIR}${DATADIR}/extra
 	${LN} -s ${PREFIX}/etc/foreman-proxy ${STAGEDIR}${DATADIR}/config
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/smart-proxy \
 		${STAGEDIR}${PREFIX}/sbin/smart-proxy
 .for file in CHANGELOG Contributors Gemfile LICENSE README Rakefile \
 	VERSION bundler.d config.ru lib modules public views
 	${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
 .endfor
 	${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in
 .for script in migrate_settings.rb query.rb
 	${INSTALL_SCRIPT} ${WRKSRC}/extra/${script} \
 		${STAGEDIR}${DATADIR}/extra/${script}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample
 .for cfg in bmc dhcp dns facts puppet puppetca realm templates tftp
 	${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample
 .endfor
 	${MKDIR} -m 0700 ${STAGEDIR}${FOREMAN_PROXY_LOGDIR} \
 		${STAGEDIR}${FOREMAN_PROXY_RUNDIR}
 
 .include <bsd.port.mk>
Index: head/net/foreman-proxy/distinfo
===================================================================
--- head/net/foreman-proxy/distinfo	(revision 387876)
+++ head/net/foreman-proxy/distinfo	(revision 387877)
@@ -1,2 +1,2 @@
-SHA256 (theforeman-smart-proxy-1.7.1_GH0.tar.gz) = c838a90b78c7a1a2631be3d952898d6c7b780f97325771b22e5c243e51825220
-SIZE (theforeman-smart-proxy-1.7.1_GH0.tar.gz) = 113977
+SHA256 (foreman-proxy-1.8.1.tar.bz2) = 1467f17c44e9a12234776a6a7dc9b3ca562563dc8179c2fbe99f2a056fb789f9
+SIZE (foreman-proxy-1.8.1.tar.bz2) = 102078

Property changes on: head/net/foreman-proxy/distinfo
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property
Index: head/net/foreman-proxy/pkg-plist
===================================================================
--- head/net/foreman-proxy/pkg-plist	(revision 387876)
+++ head/net/foreman-proxy/pkg-plist	(revision 387877)
@@ -1,135 +1,137 @@
 sbin/smart-proxy
 @sample etc/foreman-proxy/settings.yml.sample
 @sample etc/foreman-proxy/settings.d/bmc.yml.sample
 @sample etc/foreman-proxy/settings.d/dhcp.yml.sample
 @sample etc/foreman-proxy/settings.d/dns.yml.sample
 @sample etc/foreman-proxy/settings.d/facts.yml.sample
 @sample etc/foreman-proxy/settings.d/puppet.yml.sample
 @sample etc/foreman-proxy/settings.d/puppetca.yml.sample
 @sample etc/foreman-proxy/settings.d/realm.yml.sample
 @sample etc/foreman-proxy/settings.d/templates.yml.sample
 @sample etc/foreman-proxy/settings.d/tftp.yml.sample
 %%DATADIR%%/CHANGELOG
 %%DATADIR%%/Contributors
 %%DATADIR%%/Gemfile
 %%DATADIR%%/Gemfile.in
 %%DATADIR%%/LICENSE
 %%DATADIR%%/README
 %%DATADIR%%/Rakefile
 %%DATADIR%%/VERSION
 %%DATADIR%%/bundler.d/bmc.rb
 %%DATADIR%%/bundler.d/development.rb
 %%DATADIR%%/bundler.d/krb5.rb
 %%DATADIR%%/bundler.d/puppet.rb
 %%DATADIR%%/bundler.d/test.rb
 %%DATADIR%%/config
 %%DATADIR%%/config.ru
 %%DATADIR%%/extra/migrate_settings.rb
 %%DATADIR%%/extra/query.rb
 %%DATADIR%%/lib/bundler_helper.rb
 %%DATADIR%%/lib/checks.rb
 %%DATADIR%%/lib/daemon.rb
 %%DATADIR%%/lib/poodles-fix.rb
+%%DATADIR%%/lib/proxy/file_lock.rb
 %%DATADIR%%/lib/proxy/error.rb
 %%DATADIR%%/lib/proxy/helpers.rb
 %%DATADIR%%/lib/proxy/http_downloads.rb
 %%DATADIR%%/lib/proxy/kerberos.rb
 %%DATADIR%%/lib/proxy/log.rb
 %%DATADIR%%/lib/proxy/plugin.rb
 %%DATADIR%%/lib/proxy/request.rb
 %%DATADIR%%/lib/proxy/settings/global.rb
 %%DATADIR%%/lib/proxy/settings/plugin.rb
 %%DATADIR%%/lib/proxy/settings.rb
 %%DATADIR%%/lib/proxy/util.rb
 %%DATADIR%%/lib/proxy/validations.rb
 %%DATADIR%%/lib/proxy/virsh.rb
 %%DATADIR%%/lib/proxy.rb
 %%DATADIR%%/lib/rack-patch.rb
-%%DATADIR%%/lib/sinatra/ssl_client_verification.rb
-%%DATADIR%%/lib/sinatra/trusted_hosts.rb
+%%DATADIR%%/lib/sinatra/authorization.rb
 %%DATADIR%%/lib/sinatra-patch.rb
 %%DATADIR%%/lib/smart_proxy.rb
 %%DATADIR%%/lib/smart_proxy_for_testing.rb
 %%DATADIR%%/modules/bmc/base.rb
 %%DATADIR%%/modules/bmc/bmc.rb
 %%DATADIR%%/modules/bmc/bmc_api.rb
 %%DATADIR%%/modules/bmc/bmc_plugin.rb
 %%DATADIR%%/modules/bmc/http_config.ru
 %%DATADIR%%/modules/bmc/ipmi.rb
 %%DATADIR%%/modules/bmc/shell.rb
 %%DATADIR%%/modules/dhcp/dhcp_api.rb
 %%DATADIR%%/modules/dhcp/dhcp_plugin.rb
 %%DATADIR%%/modules/dhcp/http_config.ru
 %%DATADIR%%/modules/dhcp/monkey_patch_subnet.rb
 %%DATADIR%%/modules/dhcp/monkey_patches.rb
 %%DATADIR%%/modules/dhcp/providers/server/isc.rb
 %%DATADIR%%/modules/dhcp/providers/server/ms.rb
 %%DATADIR%%/modules/dhcp/providers/server/native_ms.rb
 %%DATADIR%%/modules/dhcp/providers/server/virsh.rb
 %%DATADIR%%/modules/dhcp/record/lease.rb
 %%DATADIR%%/modules/dhcp/record/reservation.rb
 %%DATADIR%%/modules/dhcp/record.rb
 %%DATADIR%%/modules/dhcp/server.rb
 %%DATADIR%%/modules/dhcp/subnet.rb
 %%DATADIR%%/modules/dhcp/dhcp.rb
 %%DATADIR%%/modules/dns/dns.rb
 %%DATADIR%%/modules/dns/dns_api.rb
 %%DATADIR%%/modules/dns/dns_plugin.rb
 %%DATADIR%%/modules/dns/http_config.ru
 %%DATADIR%%/modules/dns/providers/dnscmd.rb
 %%DATADIR%%/modules/dns/providers/nsupdate.rb
 %%DATADIR%%/modules/dns/providers/nsupdate_gss.rb
 %%DATADIR%%/modules/dns/providers/virsh.rb
 %%DATADIR%%/modules/facts/facts.rb
 %%DATADIR%%/modules/facts/facts_api.rb
 %%DATADIR%%/modules/facts/facts_plugin.rb
 %%DATADIR%%/modules/facts/http_config.ru
 %%DATADIR%%/modules/puppet_proxy/api_request.rb
 %%DATADIR%%/modules/puppet_proxy/class_scanner.rb
+%%DATADIR%%/modules/puppet_proxy/class_scanner_base.rb
 %%DATADIR%%/modules/puppet_proxy/class_scanner_eparser.rb
 %%DATADIR%%/modules/puppet_proxy/config_reader.rb
 %%DATADIR%%/modules/puppet_proxy/customrun.rb
 %%DATADIR%%/modules/puppet_proxy/environment.rb
 %%DATADIR%%/modules/puppet_proxy/http_config.ru
 %%DATADIR%%/modules/puppet_proxy/initializer.rb
 %%DATADIR%%/modules/puppet_proxy/mcollective.rb
 %%DATADIR%%/modules/puppet_proxy/puppet.rb
 %%DATADIR%%/modules/puppet_proxy/puppet_api.rb
+%%DATADIR%%/modules/puppet_proxy/puppet_cache.rb
 %%DATADIR%%/modules/puppet_proxy/puppet_class.rb
 %%DATADIR%%/modules/puppet_proxy/puppet_plugin.rb
 %%DATADIR%%/modules/puppet_proxy/puppet_ssh.rb
 %%DATADIR%%/modules/puppet_proxy/puppetrun.rb
 %%DATADIR%%/modules/puppet_proxy/runner.rb
 %%DATADIR%%/modules/puppet_proxy/salt.rb
 %%DATADIR%%/modules/puppetca/http_config.ru
 %%DATADIR%%/modules/puppetca/puppetca.rb
 %%DATADIR%%/modules/puppetca/puppetca_api.rb
 %%DATADIR%%/modules/puppetca/puppetca_main.rb
 %%DATADIR%%/modules/puppetca/puppetca_plugin.rb
 %%DATADIR%%/modules/realm/client.rb
 %%DATADIR%%/modules/realm/freeipa.rb
 %%DATADIR%%/modules/realm/http_config.ru
 %%DATADIR%%/modules/realm/realm.rb
 %%DATADIR%%/modules/realm/realm_api.rb
 %%DATADIR%%/modules/realm/realm_plugin.rb
 %%DATADIR%%/modules/root/http_config.ru
 %%DATADIR%%/modules/root/root.rb
 %%DATADIR%%/modules/root/root_api.rb
 %%DATADIR%%/modules/root/root_plugin.rb
 %%DATADIR%%/modules/templates/handler.rb
 %%DATADIR%%/modules/templates/http_config.ru
 %%DATADIR%%/modules/templates/templates.rb
 %%DATADIR%%/modules/templates/templates_api.rb
 %%DATADIR%%/modules/templates/templates_plugin.rb
 %%DATADIR%%/modules/tftp/http_config.ru
 %%DATADIR%%/modules/tftp/server.rb
 %%DATADIR%%/modules/tftp/tftp.rb
 %%DATADIR%%/modules/tftp/tftp_api.rb
 %%DATADIR%%/modules/tftp/tftp_plugin.rb
 %%DATADIR%%/public/css/styles.css
 %%DATADIR%%/views/dhcp/index.erb
 %%DATADIR%%/views/dhcp/show.erb
 %%DATADIR%%/views/features/index.erb
 %%DATADIR%%/views/layout.erb
 @dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_LOGDIR%%
 @dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_RUNDIR%%

Property changes on: head/net/foreman-proxy/pkg-plist
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property