Index: head/misc/py-glance/Makefile
===================================================================
--- head/misc/py-glance/Makefile	(revision 427225)
+++ head/misc/py-glance/Makefile	(revision 427226)
@@ -1,74 +1,77 @@
 # Created by: Alexander Nusov <alexander.nusov@nfvexpress.com>
 # $FreeBSD$
 
 PORTNAME=	glance
 PORTVERSION=	13.0.0
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	https://fossies.org/linux/misc/openstack/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	alexander.nusov@nfvexpress.com
 COMMENT=	OpenStack Image Service
 
+LICENSE=	APACHE20
+
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \
 		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \
 		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \
 		${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \
 		${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \
 		${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2 \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto \
 		${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \
 		${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \
 		${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \
 		${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \
 		${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \
 		${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \
 		${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow \
 		${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \
 		${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \
 		${PYTHON_PKGNAMEPREFIX}wsme>=0.8:devel/py-wsme \
 		${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \
 		${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \
 		${PYTHON_PKGNAMEPREFIX}keystoneclient>=0:net/py-keystoneclient \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \
 		${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \
 		${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \
 		${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \
 		${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \
 		${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \
 		${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \
 		${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \
 		${PYTHON_PKGNAMEPREFIX}glance-store>=0.18.0:devel/py-glance-store \
 		${PYTHON_PKGNAMEPREFIX}semantic_version>=2.3.1:devel/py-semantic_version \
 		${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \
 		${PYTHON_PKGNAMEPREFIX}cursive>=0.1.1:devel/py-cursive \
 		${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \
 		${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse
 
 NO_ARCH=	yes
 
 USES=		python
 USE_PYTHON=	autoplist distutils noegginfo
 
-USE_RC_SUBR=	glance-api glance-registry glance-scrubber
+USE_RC_SUBR=	glance-api glance-registry glance-scrubber glance-glare
 USERS=		glance
 GROUPS=		glance
 
 post-extract:
 	@(cd ${WRKSRC}/etc; for f in *.conf; do ${MV} $${f} $${f}.sample; done)
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 	${CP} -R ${WRKSRC}/etc/ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/misc/py-glance/distinfo
===================================================================
--- head/misc/py-glance/distinfo	(revision 427225)
+++ head/misc/py-glance/distinfo	(revision 427226)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476650212
+TIMESTAMP = 1479815522
 SHA256 (glance-13.0.0.tar.gz) = 3ef3594018469ba36425afafa61ae31487b6025e6f8d9d14febcedfa7136160f
 SIZE (glance-13.0.0.tar.gz) = 1742124
Index: head/misc/py-glance/files/glance-api.in
===================================================================
--- head/misc/py-glance/files/glance-api.in	(revision 427225)
+++ head/misc/py-glance/files/glance-api.in	(revision 427226)
@@ -1,34 +1,61 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
+
 # PROVIDE: glance_api
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
+
 #
-# Add the following lines to /etc/rc.conf to enable glance-api:
+# Add the following lines to /etc/rc.conf to enable glance_api:
 #
-# glance_api_enable (bool):	Set it to "YES" to enable glance-api.
-# 				Default is "NO".
+# glance_api_enable="YES"
+#
+# glance_api_enable (bool):
+#	Set it to "YES" to enable glance_api.
+# 	Default is "NO".
+#
+# glance_api_logdir (str):
+#	Set it to chagge log directory
+#	Default is "/var/log/glance"
+#
+# glance_api_args (str):
+#	Set it to change command line arguments.
+#	Default is "--log-file ${glance_api_logdir}/glance-api.log"
+#
 
 . /etc/rc.subr
 
-name="glance_api"
+name=glance_api
 rcvar=glance_api_enable
 
-extra_commands="reload shutdown status"
-reload_cmd="glance-control api reload"
-shutdown_cmd="glance-control api shutdown"
-start_cmd="glance-control api start"
-status_cmd="glance-control api status"
-stop_cmd="glance-control api stop"
-
 required_files=%%PREFIX%%/etc/glance/glance-api.conf
+PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
 
-PATH=%%PREFIX%%/bin:$PATH
+pidfile="/var/run/glance-api.pid"
+procname="%%PREFIX%%/bin/python2.7"
 
+start_precmd=glance_precmd
+stop_postcmd=glance_postcmd
+
 load_rc_config $name
 
 : ${glance_api_enable:="NO"}
+: ${glance_api_logdir:="/var/log/glance"}
+: ${glance_api_args:="--log-file ${glance_api_logdir}/glance-api.log"}
+
+command="/usr/sbin/daemon"
+command_args="-f -p ${pidfile} -u glance glance-api ${glance_api_args}"
+
+glance_precmd() {
+	mkdir -p ${glance_api_logdir}
+	chown glance ${glance_api_logdir}
+}
+
+glance_postcmd() {
+	# this is a workaround for a glance-api bug
+	pkill -u glance -f glance-api
+}
 
 run_rc_command "$1"
Index: head/misc/py-glance/files/glance-glare.in
===================================================================
--- head/misc/py-glance/files/glance-glare.in	(nonexistent)
+++ head/misc/py-glance/files/glance-glare.in	(revision 427226)
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: glance_glare
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable glance_glare:
+#
+# glance_glare_enable="YES"
+#
+# glance_glare_enable (bool):
+#	Set it to "YES" to enable glance_glare.
+# 	Default is "NO".
+#
+# glance_glare_logdir (str):
+#	Set it to chagge log directory
+#	Default is "/var/log/glance"
+#
+# glance_glare_args (str):
+#	Set it to change command line arguments.
+#	Default is "--log-file ${glance_glare_logdir}/glance-glare.log"
+#
+
+. /etc/rc.subr
+
+name=glance_glare
+rcvar=glance_glare_enable
+
+required_files=%%PREFIX%%/etc/glance/glance-glare.conf
+PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
+
+pidfile="/var/run/glance-glare.pid"
+procname="%%PREFIX%%/bin/python2.7"
+
+start_precmd=glance_precmd
+
+load_rc_config $name
+
+: ${glance_glare_enable:="NO"}
+: ${glance_glare_logdir:="/var/log/glance"}
+: ${glance_glare_args:="--log-file ${glance_glare_logdir}/glance-glare.log"}
+
+command="/usr/sbin/daemon"
+command_args="-f -p ${pidfile} -u glance glance-glare ${glance_glare_args}"
+
+glance_precmd() {
+	mkdir -p ${glance_glare_logdir}
+	chown glance ${glance_glare_logdir}
+}
+
+run_rc_command "$1"

Property changes on: head/misc/py-glance/files/glance-glare.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/misc/py-glance/files/glance-registry.in
===================================================================
--- head/misc/py-glance/files/glance-registry.in	(revision 427225)
+++ head/misc/py-glance/files/glance-registry.in	(revision 427226)
@@ -1,34 +1,55 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
+
 # PROVIDE: glance_registry
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
+
 #
-# Add the following lines to /etc/rc.conf to enable glance-registry:
+# Add the following lines to /etc/rc.conf to enable glance_registry:
 #
-# glance_registry_enable (bool):	Set it to "YES" to enable glance-registry.
-# 					Default is "NO".
+# glance_registry_enable="YES"
+#
+# glance_registry_enable (bool):
+#	Set it to "YES" to enable glance_registry.
+# 	Default is "NO".
+#
+# glance_registry_logdir (str):
+#	Set it to chagge log directory
+#	Default is "/var/log/glance"
+#
+# glance_registry_args (str):
+#	Set it to change command line arguments.
+#	Default is "--log-file ${glance_registry_logdir}/glance-registry.log"
+#
 
 . /etc/rc.subr
 
-name="glance_registry"
+name=glance_registry
 rcvar=glance_registry_enable
 
-extra_commands="reload shutdown status"
-reload_cmd="glance-control registry reload"
-shutdown_cmd="glance-control registry shutdown"
-start_cmd="glance-control registry start"
-status_cmd="glance-control registry status"
-stop_cmd="glance-control registry stop"
-
 required_files=%%PREFIX%%/etc/glance/glance-registry.conf
+PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
 
-PATH=%%PREFIX%%/bin:$PATH
+pidfile="/var/run/glance-registry.pid"
+procname="%%PREFIX%%/bin/python2.7"
 
+start_precmd=glance_precmd
+
 load_rc_config $name
 
 : ${glance_registry_enable:="NO"}
+: ${glance_registry_logdir:="/var/log/glance"}
+: ${glance_registry_args:="--log-file ${glance_registry_logdir}/glance-registry.log"}
+
+command="/usr/sbin/daemon"
+command_args="-f -p ${pidfile} -u glance glance-registry ${glance_registry_args}"
+
+glance_precmd() {
+	mkdir -p ${glance_registry_logdir}
+	chown glance ${glance_registry_logdir}
+}
 
 run_rc_command "$1"
Index: head/misc/py-glance/files/glance-scrubber.in
===================================================================
--- head/misc/py-glance/files/glance-scrubber.in	(revision 427225)
+++ head/misc/py-glance/files/glance-scrubber.in	(revision 427226)
@@ -1,33 +1,55 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
+
 # PROVIDE: glance_scrubber
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
+
 #
-# Add the following lines to /etc/rc.conf to enable glance-scrubber:
+# Add the following lines to /etc/rc.conf to enable glance_scrubber:
 #
-# glance_scrubber_enable (bool):	Set it to "YES" to enable glance-scrubber.
-# 					Default is "NO".
+# glance_scrubber_enable="YES"
+#
+# glance_scrubber_enable (bool):
+#	Set it to "YES" to enable glance_scrubber.
+# 	Default is "NO".
+#
+# glance_scrubber_logdir (str):
+#	Set it to chagge log directory
+#	Default is "/var/log/glance"
+#
+# glance_scrubber_args (str):
+#	Set it to change command line arguments.
+#	Default is "--log-file ${glance_scrubber_logdir}/glance-scrubber.log"
+#
 
 . /etc/rc.subr
 
-name="glance_scrubber"
+name=glance_scrubber
 rcvar=glance_scrubber_enable
 
-extra_commands="shutdown status"
-shutdown_cmd="glance-control scrubber shutdown"
-start_cmd="glance-control scrubber start"
-status_cmd="glance-control scrubber status"
-stop_cmd="glance-control scrubber stop"
-
 required_files=%%PREFIX%%/etc/glance/glance-scrubber.conf
+PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:$PATH
 
-PATH=%%PREFIX%%/bin:$PATH
+pidfile="/var/run/glance-scrubber.pid"
+procname="%%PREFIX%%/bin/python2.7"
 
+start_precmd=glance_precmd
+
 load_rc_config $name
 
 : ${glance_scrubber_enable:="NO"}
+: ${glance_scrubber_logdir:="/var/log/glance"}
+: ${glance_scrubber_args:="--log-file ${glance_scrubber_logdir}/glance-scrubber.log"}
+
+command="/usr/sbin/daemon"
+command_args="-f -p ${pidfile} -u glance glance-scrubber ${glance_scrubber_args}"
+
+glance_precmd() {
+	mkdir -p ${glance_scrubber_logdir}
+	chown glance ${glance_scrubber_logdir}
+}
 
 run_rc_command "$1"