4 files changed, 24 insertions, 84 deletions

diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
index 1c88e3e544a2..0edd7b85d67d 100644
--- a/net/foreman-proxy/Makefile
+++ b/net/foreman-proxy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	foreman-proxy
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.2
 CATEGORIES=	net
 MASTER_SITES=	GH
 
@@ -17,19 +17,19 @@ RUN_DEPENDS=	rubygem-bundler_ext>=0.4:${PORTSDIR}/sysutils/rubygem-bundler_ext \
 		rubygem-sinatra>=1.4.3:${PORTSDIR}/www/rubygem-sinatra \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
-OPTIONS_DEFINE= BMC PUPPET
+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
-GH_COMMIT= 	0330140
+GH_COMMIT=	b53b4d0
 USE_RUBY=	yes
 USE_RAKE=	yes
 USE_RC_SUBR=	foreman-proxy
 NO_BUILD=	yes
-PKGINSTALL=	${WRKDIR}/pkg-install
+NO_ARCH=	yes
 
 FOREMAN_PROXY_USER?=	foreman_proxy
 FOREMAN_PROXY_GROUP?=	foreman_proxy
@@ -39,28 +39,17 @@ FOREMAN_PROXY_RUNDIR?=	/var/run/foreman-proxy
 USERS=		${FOREMAN_PROXY_USER}
 GROUPS=		${FOREMAN_PROXY_GROUP}
 
-SUB_FILES+=	pkg-install
-SUB_LIST+=	RUBY="${RUBY}" \
+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}"
+PLIST_SUB=	${SUB_LIST} MKDIR="${MKDIR}"
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBMC}
-RUN_DEPENDS+=	rubygem-rubyipmi>=0.7:${PORTSDIR}/sysutils/rubygem-rubyipmi
-.endif
-
-.if ${PORT_OPTIONS:MPUPPET}
-RUN_DEPENDS+=	puppet:${PORTSDIR}/sysutils/puppet \
-		rubygem-ruby-augeas>=0.5:${PORTSDIR}/textproc/rubygem-augeas
-.endif
-
-.include <bsd.port.pre.mk>
+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} \
@@ -77,30 +66,27 @@ post-patch:
 		${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 \
+	${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}
+	${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
 .endfor
-	@${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in
+	${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} ${COPY} -m 644 ${WRKSRC}/config/settings.yml.example \
+	${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample
 .for cfg in bmc chef dhcp dns puppet puppetca realm tftp
-	${INSTALL} ${COPY} -m 644 ${WRKSRC}/config/settings.d/${cfg}.yml.example \
+	${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample
 .endfor
-
-post-install:
-	@${MKDIR} -m 0700 ${STAGEDIR}${FOREMAN_PROXY_LOGDIR} \
+	${MKDIR} -m 0700 ${STAGEDIR}${FOREMAN_PROXY_LOGDIR} \
 		${STAGEDIR}${FOREMAN_PROXY_RUNDIR}
-	@${SH} ${PKGINSTALL} STAGEDIR=${STAGEDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo
index 890fc991029b..8da2c50dfa48 100644
--- a/net/foreman-proxy/distinfo
+++ b/net/foreman-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (foreman-proxy-1.6.0.tar.gz) = 0f3fc7da8794afe9c5d86807e064fd1dd8864ef5c16ff893411794cb62dc437f
-SIZE (foreman-proxy-1.6.0.tar.gz) = 106572
+SHA256 (foreman-proxy-1.6.2.tar.gz) = 5dac214d0a3e1c5dda9d82ffb48a3c05efbb780f82fd35ee8a5f2c8335be3771
+SIZE (foreman-proxy-1.6.2.tar.gz) = 107543
diff --git a/net/foreman-proxy/files/pkg-install.in b/net/foreman-proxy/files/pkg-install.in
deleted file mode 100644
index 565bf8d40af8..000000000000
--- a/net/foreman-proxy/files/pkg-install.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "POST-INSTALL" ]; then
-    exit 0
-fi
-
-USER=%%FOREMAN_PROXY_USER%%
-GROUP=%%FOREMAN_PROXY_GROUP%%
-LOGDIR=%%FOREMAN_PROXY_LOGDIR%%
-RUNDIR=%%FOREMAN_PROXY_RUNDIR%%
-
-echo "===> Changing owner and modes for \"${LOGDIR}\"."
-chown -R ${USER}:${GROUP} ${STAGEDIR}${LOGDIR}
-chmod -R go= ${STAGEDIR}${LOGDIR}
-
-echo "===> Changing owner and modes for \"${RUNDIR}\"."
-chown -R ${USER}:${GROUP} ${STAGEDIR}${RUNDIR}
-chmod -R go= ${STAGEDIR}${RUNDIR}
diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist
index 23034275b23e..4e05284c2ecd 100644
--- a/net/foreman-proxy/pkg-plist
+++ b/net/foreman-proxy/pkg-plist
@@ -44,6 +44,7 @@ sbin/smart-proxy
 %%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-patch.rb
 %%DATADIR%%/lib/smart_proxy.rb
@@ -129,33 +130,5 @@ sbin/smart-proxy
 %%DATADIR%%/views/dhcp/show.erb
 %%DATADIR%%/views/features/index.erb
 %%DATADIR%%/views/layout.erb
-@dirrm %%DATADIR%%/views/features
-@dirrm %%DATADIR%%/views/dhcp
-@dirrm %%DATADIR%%/views
-@dirrm %%DATADIR%%/public/css
-@dirrm %%DATADIR%%/public
-@dirrm %%DATADIR%%/modules/tftp
-@dirrm %%DATADIR%%/modules/root
-@dirrm %%DATADIR%%/modules/realm
-@dirrm %%DATADIR%%/modules/puppetca
-@dirrm %%DATADIR%%/modules/puppet_proxy
-@dirrm %%DATADIR%%/modules/facts
-@dirrm %%DATADIR%%/modules/dns/providers
-@dirrm %%DATADIR%%/modules/dhcp/dhcp/record
-@dirrm %%DATADIR%%/modules/dhcp/dhcp/providers
-@dirrm %%DATADIR%%/modules/dhcp/dhcp
-@dirrm %%DATADIR%%/modules/dhcp
-@dirrm %%DATADIR%%/modules/dns
-@dirrm %%DATADIR%%/modules/bmc
-@dirrm %%DATADIR%%/modules/chef_proxy
-@dirrm %%DATADIR%%/modules
-@dirrm %%DATADIR%%/lib/proxy
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%/extra
-@dirrm %%DATADIR%%/bundler.d
-@dirrmtry %%DATADIR%%
-@dirrmtry etc/foreman-proxy
-@cwd /
-@exec %%MKDIR%% -m 0700 %%FOREMAN_PROXY_LOGDIR%% %%FOREMAN_PROXY_RUNDIR%%
-@unexec rmdir %%FOREMAN_PROXY_LOGDIR%% >/dev/null 2>&1 || :
-@unexec rmdir %%FOREMAN_PROXY_RUNDIR%% >/dev/null 2>&1 || :
+@dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_LOGDIR%%
+@dir(%%FOREMAN_PROXY_USER%%,%%FOREMAN_PROXY_GROUP%%,0700) %%FOREMAN_PROXY_RUNDIR%%