- Update to 5.0.11

PR:		ports/148465
Submitted by:	Francisco de Borja Lopez Rio <borja AT pexego.es> (maintainer)

finance/openerp-web/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openerp-web
-PORTVERSION=	5.0.6
-PORTREVISION=	1
+PORTVERSION=	5.0.11
 CATEGORIES=	finance python
 MASTER_SITES=	http://openerp.com/download/stable/source/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,6 +16,7 @@ COMMENT=	OpenERP Web Client
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cherrypy>0:${PORTSDIR}/www/py-cherrypy \
 		${PYTHON_PKGNAMEPREFIX}Babel>0:${PORTSDIR}/devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}beaker>0:${PORTSDIR}/www/py-beaker \
 		${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:${PORTSDIR}/devel/py-simplejson \
 		${PYTHON_PKGNAMEPREFIX}formencode>0:${PORTSDIR}/www/py-formencode \
@@ -27,13 +27,13 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GETTEXT=	yes
 
-USE_PYTHON=		2.4+
-USE_PYDISTUTILS=	yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_NOEGGINFO=	yes
 
 USE_RC_SUBR=	openerp-web
 
-WRKSRC=		${WRKDIR}/openerp-client-web-${PORTVERSION}
+WRKSRC=		${WRKDIR}/openerp-web-${PORTVERSION}
 
 post-install:
 	@${INSTALL_DATA} ${FILESDIR}/openerp-web.conf ${PREFIX}/etc/openerp-web.conf.sample

finance/openerp-web/distinfo

@@ -1,3 +1,3 @@
-MD5 (openerp-web-5.0.6.tar.gz) = 5a785426e2a1d0adb61b565e434bbb83
-SHA256 (openerp-web-5.0.6.tar.gz) = 699137f9e7cfd88a0328f456f889f3b3d5d519a9ab5d1ffba7d36a01f7a2f382
-SIZE (openerp-web-5.0.6.tar.gz) = 1362118
+MD5 (openerp-web-5.0.11.tar.gz) = 0fb5d58ba7593c1530738ea83b0123a6
+SHA256 (openerp-web-5.0.11.tar.gz) = 7c52eb1d7e11e4f9ae5dd4567ccf01cd45d7913cfcb97c845ecdc08281df4935
+SIZE (openerp-web-5.0.11.tar.gz) = 1341763

finance/openerp-web/files/openerp-web.in

@@ -48,7 +48,7 @@ openerpweb_logdir=${openerpweb_logdir:-"/var/log/openerp-web"}
 openerpweb_flags=${openerpweb_flags:-"--config=${openerpweb_config}"}
 
 start_precmd="${name}_prestart"
-stop_cmd="${name}_poststop"
+stop_cmd="${name}_stop"
 
 openerpweb_prestart()
 {
@@ -73,7 +73,14 @@ openerpweb_stop()
         echo "Stopping ${name}."
         kill -15 `cat ${openerpweb_pidfile}`
     else
-        echo "${name} not running? (pidfile not found)"
+        openerpweb_pid=`pgrep -f "openerp-web.py ${openerpweb_flags}"`
+        if [ ${openerpweb_pid} ]
+        then
+            echo "Stopping ${name}."
+             kill -15 ${openerpweb_pid}
+        else
+            echo "${name} not running? (pidfile not found)"
+        fi
     fi
 }
 

finance/openerp-web/files/openerp-web.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # EASY-INSTALL-ENTRY-SCRIPT: 'openerp-web==5.0.6','console_scripts','openerp-web'
-__requires__ = 'openerp-web==5.0.6'
+__requires__ = 'openerp-web==5.0.11'
 import sys
 from pkg_resources import load_entry_point
 
 sys.exit(
-   load_entry_point('openerp-web==5.0.6', 'console_scripts', 'openerp-web')()
+   load_entry_point('openerp-web==5.0.11', 'console_scripts', 'openerp-web')()
 )

finance/openerp-web/files/openerp-web.wrapper

@@ -9,5 +9,6 @@
 # Edit this file to suit your needs (for example, setting your OpenERP
 # web client home directory)
 
+export PYTHON_EGG_CACHE="/tmp"
 cd /usr/local/openerp-web
-./openerp-web.py $@ & > /dev/null
+./openerp-server.py $@ >> /var/log/openerp-web.log 2> /var/log/openerp-web.err &