ports/185844: finance/openerp-server update from 6.0.3 to 7.0

Pakhom Golynga pakhom706 at gmail.com
Fri Jan 17 14:30:00 UTC 2014 

>Number:         185844
>Category:       ports
>Synopsis:       finance/openerp-server update from 6.0.3 to 7.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 17 14:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Pakhom Golynga
>Release:        
>Organization:
>Environment:
>Description:
update to 7.0 LTS (stable)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN openerp-server.orig/Makefile openerp-server/Makefile
--- openerp-server.orig/Makefile	2014-01-17 18:12:26.321050509 +0400
+++ openerp-server/Makefile	2014-01-17 02:35:34.511037151 +0400
@@ -1,15 +1,17 @@
-# Created by: Wen Heping <wenheping at gmail.com>
-# $FreeBSD: head/finance/openerp-server/Makefile 339634 2014-01-13 21:00:02Z rene $
+# Created by: Pakhom Golynga <pakhom706 at gmail.com>
+# $FreeBSD: head/finance/openerp-server/Makefile 327727 2013-09-20 17:18:38Z bapt $
 
 PORTNAME=	openerp-server
-PORTVERSION=	6.0.3
-PORTREVISION=	2
-PORTEPOCH=	1
+PORTVERSION=	7.0
+PORTREVISION=	0
+NIGHTLY=	20140115-002435
 CATEGORIES=	finance python
-MASTER_SITES=	http://www.openerp.com/download/stable/source/
+MASTER_SITES=	http://nightly.openerp.com/7.0/nightly/src/
+DISTNAME=       openerp-${PORTVERSION}-${NIGHTLY}
+WRKSRC=         ${WRKDIR}/openerp-${PORTVERSION}-${NIGHTLY}
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Open source application ERP & CRM in Python using Postgresql
+MAINTAINER=     pakhom706 at gmail.com
+COMMENT=	OpenERP is an OpenSource/Free software Enterprise Resource Planning and Customer Relationship Management software in Python using Postgresql
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
@@ -24,60 +26,40 @@
 		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako \
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2
+		${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2 \
+		${PYTHON_PKGNAMEPREFIX}ldap2>0:${PORTSDIR}/net/py-ldap2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_RC_SUBR=	openerpd
 SUB_FILES=	openerp-server.conf pkg-message
 SUB_LIST=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 
-USE_PYTHON=			yes
+USE_PYTHON=			2.6+
 USE_PYDISTUTILS=		yes
-PYDISTUTILS_EGGINFODIR=		${PYTHON_SITELIBDIR}/openerp_server-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info
-PYDISTUTILS_EGGINFO=		PKG-INFO
+PYDISTUTILS_NOEGGINFO=		yes
+PYDISTUTILS_AUTOPLIST=		yes
 
 USERS=		openerpd
 GROUPS=		openerpd
 
-MAN1=		openerp-server.1
-MAN5=		openerp_serverrc.5
-
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|g' ${WRKSRC}/bin/openerp-server.py
+NIGHTLY_= ${NIGHTLY:S/-/_/g}
 
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
-	@${FIND} -s -d ${DOCSDIR} -type f | ${SED} 's#${PREFIX}/##g' >> ${TMPPLIST}
-	@${FIND} -s -d ${DOCSDIR} -type d | ${SED} 's#${PREFIX}/#@dirrm #g' >> ${TMPPLIST}
+# only touch easy-install.pth if we installed it ourselves
+.if !exists(${PYTHONPREFIX_SITELIBDIR}/easy-install.pth)
+PLIST_FILES+=   ${PYTHON_SITELIBDIR:S;${LOCALBASE}/;;}/easy-install.pth
 .endif
 
-	${INSTALL_MAN} ${WRKSRC}/man/openerp-server.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/openerp_serverrc.5 ${PREFIX}/man/man5
-
+post-install:
+	@${REINPLACE_CMD} -e 's|site-packages/openerp-server|site-packages/openerp-${PORTVERSION}_${NIGHTLY_}-${PYTHON_VERSION:S/thon//}.egg/openerp|g' ${WRKDIR}/openerp-server.conf
 	${INSTALL_DATA} ${WRKDIR}/openerp-server.conf ${PREFIX}/etc/openerp-server.conf.sample
 	@if  [ ! -f ${PREFIX}/etc/openerp-server.conf ]; then \
 		${CP} -p ${PREFIX}/etc/openerp-server.conf.sample ${PREFIX}/etc/openerp-server.conf ; \
 	fi
-	@${ECHO} '@unexec if cmp -s %D/etc/openerp-server.conf.sample %D/etc/openerp-server.conf; then rm -f %D/etc/openerp-server.conf; fi' >> ${TMPPLIST}
 	@${ECHO} etc/openerp-server.conf.sample >> ${TMPPLIST}
-	@${ECHO} '@exec if [ ! -f %D/etc/openerp-server.conf ]; then cp -p %D/%F %B/openerp-server.conf; fi' >> ${TMPPLIST}
-
-	@${CHMOD} a+x ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/openerp-server.py
-
-	@${ECHO} bin/openerp-server >> ${TMPPLIST}
-	@${FIND} -s -d ${PYTHON_SITELIBDIR}/${PORTNAME} \
-		-type f | ${SED} 's#${PREFIX}/##g' >> ${TMPPLIST}
-	@${FIND} -s -d ${PYTHON_SITELIBDIR}/${PORTNAME} \
-		-type d | ${SED} 's#${PREFIX}/#@dirrm #g' >> ${TMPPLIST}
-	@${FIND} -s -d ${PYDISTUTILS_EGGINFODIR} \
-		-type f -print |grep -v PKG-INFO| ${SED} 's#${PREFIX}/##g' >> ${TMPPLIST}
-	@${FIND} -s -d ${PYDISTUTILS_EGGINFODIR} \
-		-type d | ${SED} 's#${PREFIX}/#@dirrm #g' >> ${TMPPLIST}
+	@${CHMOD} a+x ${PREFIX}/bin/openerp-server
 
 	@${CAT} ${PKGMESSAGE}
 
diff -urN openerp-server.orig/distinfo openerp-server/distinfo
--- openerp-server.orig/distinfo	2013-07-10 18:38:21.489672000 +0400
+++ openerp-server/distinfo	2014-01-15 17:53:35.056044288 +0400
@@ -1,2 +1,2 @@
-SHA256 (openerp-server-6.0.3.tar.gz) = 763296aef9967848506daa23dca017b2f341d12936d1db9df1f2ba1412b218a9
-SIZE (openerp-server-6.0.3.tar.gz) = 28477345
+SHA256 (openerp-7.0-20140115-002435.tar.gz) = 462f7ce568fe9ffb5b2dc429df53e19b8effd8237b2de5af1213d97e5dad56f1
+SIZE (openerp-7.0-20140115-002435.tar.gz) = 64096565
diff -urN openerp-server.orig/files/openerpd.in openerp-server/files/openerpd.in
--- openerp-server.orig/files/openerpd.in	2013-07-10 18:38:21.496672000 +0400
+++ openerp-server/files/openerpd.in	2014-01-17 17:15:43.390056049 +0400
@@ -48,6 +48,8 @@
 status_cmd="${name}_status"
 getval_cmd="${name}_getval"
 
+export PYTHON_EGG_DIR=/tmp
+
 openerpd_prestart()
 {
     local d
diff -urN openerp-server.orig/files/patch-setup.py openerp-server/files/patch-setup.py
--- openerp-server.orig/files/patch-setup.py	2013-07-10 18:38:21.500668000 +0400
+++ openerp-server/files/patch-setup.py	2014-01-15 11:47:26.548063190 +0400
@@ -1,29 +1,10 @@
---- setup.py	2011-08-21 16:34:59.526991138 +0200
-+++ setup.diffs	2011-08-21 16:35:49.515560426 +0200
-@@ -145,16 +145,16 @@
-         #    files.append((root, [join(root, name) for name in names]))
-         files.append(('.', [join('bin', 'import_xml.rng'),]))
-     else:
--        man_directory = join('share', 'man')
--        files.append((join(man_directory, 'man1'), ['man/openerp-server.1']))
--        files.append((join(man_directory, 'man5'), ['man/openerp_serverrc.5']))
--
--        doc_directory = join('share', 'doc', 'openerp-server-%s' % version)
--        files.append((doc_directory, filter(isfile, glob.glob('doc/*'))))
--        files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'),
--                      filter(isfile, glob.glob('doc/migrate/3.3.0-3.4.0/*'))))
--        files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'),
--                      filter(isfile, glob.glob('doc/migrate/3.4.0-4.0.0/*'))))
-+#        man_directory = join('share', 'man')
-+#        files.append((join(man_directory, 'man1'), ['man/openerp-server.1']))
-+#        files.append((join(man_directory, 'man5'), ['man/openerp_serverrc.5']))
-+#
-+#        doc_directory = join('share', 'doc', 'openerp-server-%s' % version)
-+#        files.append((doc_directory, filter(isfile, glob.glob('doc/*'))))
-+#        files.append((join(doc_directory, 'migrate', '3.3.0-3.4.0'),
-+#                      filter(isfile, glob.glob('doc/migrate/3.3.0-3.4.0/*'))))
-+#        files.append((join(doc_directory, 'migrate', '3.4.0-4.0.0'),
-+#                      filter(isfile, glob.glob('doc/migrate/3.4.0-4.0.0/*'))))
- 
-         openerp_site_packages = join(get_python_lib(prefix=''), 'openerp-server')
- 
+--- setup.py.orig	2013-05-15 03:10:46.000000000 +0400
++++ setup.py	2014-01-15 10:13:59.067058613 +0400
+@@ -128,7 +128,6 @@
+           'psycopg2 >= 2.2',
+           'pydot',
+           'python-dateutil < 2',
+-          'python-ldap', # optional
+           'python-openid',
+           'pytz',
+           'pywebdav',
diff -urN openerp-server.orig/files/pkg-message.in openerp-server/files/pkg-message.in
--- openerp-server.orig/files/pkg-message.in	2013-07-10 18:38:21.506668000 +0400
+++ openerp-server/files/pkg-message.in	2014-01-15 12:53:23.168058223 +0400
@@ -16,4 +16,10 @@
 [PGSQL] $ createuser $openerp_dbuser
 [PGSQL] $ createdb --owner=${openerp_dbuser} --encoding=UTF-8 --locale=en_EN.UTF-8 ${openerp_dbname} "OpenERP initial database"
 
+Setuping you first database
+---------------------------
+
+Point your browser to http://localhost:8069/ and click "Manage Databases", the
+default master password is "admin".
+
 ************************************************************************


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list