diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile index dcfb796742c5..8fbee81eefc9 100644 --- a/finance/odoo/Makefile +++ b/finance/odoo/Makefile @@ -1,112 +1,105 @@ PORTNAME= odoo -PORTVERSION= 16.0 +PORTVERSION= 16.0.20230804 CATEGORIES= finance www PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= acm@FreeBSD.org COMMENT= Suite of web based open source business apps WWW= https://www.odoo.com LICENSE= LGPL3 USE_GITHUB= yes -GH_TAGNAME= 0a766557bcf95e0b9fc3363103fce8277b0fa835 +GH_TAGNAME= b46544d3cbd4116f69a03064c61798cef8435c5b LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt \ libevent.so:devel/libevent \ libsasl2.so:security/cyrus-sasl2 RUN_DEPENDS= wkhtmltopdf>0:converters/wkhtmltopdf \ ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}num2words>=0:devel/py-num2words@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}vatnumber>=0:finance/py-vatnumber@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zeep>=0:net/py-zeep@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html2text>=0:textproc/py-html2text@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qrcode>=0:textproc/py-qrcode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xlwt>=0:textproc/py-xlwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pypdf2>0:print/py-pypdf2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-file>0:www/py-requests-file@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}secure-cookie>0:www/py-secure-cookie@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xlrd>=1.2.0:textproc/py-xlrd@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xlwt>=1.3.0:textproc/py-xlwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ofxparse>=0.20:finance/py-ofxparse@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ebaysdk>=2.1.3:finance/py-ebaysdk@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR} USES= cpe ldap python pgsql shebangfix USE_PYTHON= distutils SHEBANG_LANG= python SHEBANG_FILES= ${WRKSRC}/${PORTNAME}/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init.d/timesyncd \ ${WRKSRC}/${PORTNAME}/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init.d/odoo \ ${WRKSRC}/${PORTNAME}/addons/web/static/lib/select2/release.sh \ ${WRKSRC}/${PORTNAME}/addons/web/tooling/*.sh \ ${WRKSRC}/${PORTNAME}/addons/web/tooling/hooks/pre-commit \ ${WRKSRC}/${PORTNAME}/addons/mail/static/scripts/odoo-mailgate.py \ ${WRKSRC}/${PORTNAME}-bin USERS= odoo GROUPS= ${USERS} USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message CONFLICTS= odoo14 odoo15 ETCDIR= ${PREFIX}/etc/odoo post-patch: - @${REINPLACE_CMD} -i "" -e 's|werkzeug.url_quote_plus|werkzeug.urls.url_quote_plus|g' \ - ${WRKSRC}/odoo/addons/base/models/ir_ui_view.py - @${REINPLACE_CMD} -i "" -e 's|werkzeug.url_unquote_plus|werkzeug.urls.url_quote_plus|g' \ - -e 's|.NumberConverter|.converters.NumberConverter|g' \ - ${WRKSRC}/odoo/addons/base/models/ir_http.py \ - ${WRKSRC}/odoo/addons/http_routing/models/ir_http.py - @${REINPLACE_CMD} -i "" -e 's|from werkzeug import url_encode|from werkzeug.urls import url_encode|g' \ - ${WRKSRC}/odoo/addons/mail/models/mail_thread.py \ - ${WRKSRC}/odoo/addons/hr/models/hr_employee.py @${REINPLACE_CMD} -i "" -e 's|(index !== |(index == |g' \ ${WRKSRC}/odoo/addons/web/static/src/legacy/js/libs/content-disposition.js \ ${WRKSRC}/odoo/addons/web/static/src/core/network/download.js + @${REINPLACE_CMD} -i "" -e 's|charset =|_charset =|g' ${WRKSRC}/odoo/http.py post-extract: @cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/ pre-install: @${MKDIR} ${STAGEDIR}${ETCDIR} post-install: @${INSTALL_SCRIPT} ${FILESDIR}/odoo.conf ${STAGEDIR}${ETCDIR}/odoo.conf.sample .include diff --git a/finance/odoo/distinfo b/finance/odoo/distinfo index 302d810ede54..40f87d781b61 100644 --- a/finance/odoo/distinfo +++ b/finance/odoo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668642684 -SHA256 (odoo-odoo-16.0-0a766557bcf95e0b9fc3363103fce8277b0fa835_GH0.tar.gz) = 85574d017294467beb0d8933bc02375cde1991baf43e2b75958d041ca855c29f -SIZE (odoo-odoo-16.0-0a766557bcf95e0b9fc3363103fce8277b0fa835_GH0.tar.gz) = 141506848 +TIMESTAMP = 1691214238 +SHA256 (odoo-odoo-16.0.20230804-b46544d3cbd4116f69a03064c61798cef8435c5b_GH0.tar.gz) = 86e044f9d79fa42e0c718a33701dfb09539c1323b9efd8e0e5a66bc19a789421 +SIZE (odoo-odoo-16.0.20230804-b46544d3cbd4116f69a03064c61798cef8435c5b_GH0.tar.gz) = 156000245 diff --git a/finance/odoo/files/odoo.conf b/finance/odoo/files/odoo.conf index cdbc35e17995..f46a48d2a096 100644 --- a/finance/odoo/files/odoo.conf +++ b/finance/odoo/files/odoo.conf @@ -1,7 +1,7 @@ [options] #admin_passwd = secretpassword db_host = localhost db_port = 5432 db_user = odoouser db_password = odoopwd -;addons_path = /usr/local/lib/python3.7/site-packages/odoo/addons/ +;addons_path = /usr/local/lib/python3.9/site-packages/odoo/addons/ diff --git a/finance/odoo/files/pkg-message.in b/finance/odoo/files/pkg-message.in index 69c004f8df8e..9cd9875f0281 100644 --- a/finance/odoo/files/pkg-message.in +++ b/finance/odoo/files/pkg-message.in @@ -1,44 +1,44 @@ [ { type: install message: <