diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile index 61f041aa3cc8..dc47d57ae5ce 100644 --- a/finance/odoo/Makefile +++ b/finance/odoo/Makefile @@ -1,106 +1,108 @@ PORTNAME= odoo -PORTVERSION= 16.0.20240222 -PORTREVISION= 1 +PORTVERSION= 17.0.20240325 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= ecb1f0268adde613bbcb0aa122c0c53847a600a9 +GH_TAGNAME= c18b9f44be3d666ca1e082807a2fdfc7ef2049d2 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}python-ldap>=0:net/py-python-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}werkzeug2>0:www/py-werkzeug2@${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} \ ${PYTHON_PKGNAMEPREFIX}rjsmin>0:archivers/py-rjsmin@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography-legacy>0:security/py-cryptography-legacy@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}cryptography-legacy>0:security/py-cryptography-legacy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}GeoIP2>0:net/py-GeoIP2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} -USES= cpe ldap python pgsql shebangfix +USES= cpe ldap python:3.10 pgsql shebangfix USE_PYTHON= distutils SHEBANG_LANG= python SHEBANG_FILES= ${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 +CONFLICTS= odoo14 odoo15 odoo16 ETCDIR= ${PREFIX}/etc/odoo post-patch: @${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 - @${RM} ${WRKSRC}/odoo/release.py.orig 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 fada4fa153e2..a85908dd7986 100644 --- a/finance/odoo/distinfo +++ b/finance/odoo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708628850 -SHA256 (odoo-odoo-16.0.20240222-ecb1f0268adde613bbcb0aa122c0c53847a600a9_GH0.tar.gz) = 271ec3129c8e280acf2619d995cccbdb9ece023f1ec341b9289aa943e4e64ab0 -SIZE (odoo-odoo-16.0.20240222-ecb1f0268adde613bbcb0aa122c0c53847a600a9_GH0.tar.gz) = 158008620 +TIMESTAMP = 1711398516 +SHA256 (odoo-odoo-17.0.20240325-c18b9f44be3d666ca1e082807a2fdfc7ef2049d2_GH0.tar.gz) = 2ce2b6d0efc4caca1538537d9da262c56384fe88260fc750168c878a236c5e4e +SIZE (odoo-odoo-17.0.20240325-c18b9f44be3d666ca1e082807a2fdfc7ef2049d2_GH0.tar.gz) = 168250327 diff --git a/finance/odoo/files/pkg-message.in b/finance/odoo/files/pkg-message.in index 9cd9875f0281..d7ab2fe3d4dc 100644 --- a/finance/odoo/files/pkg-message.in +++ b/finance/odoo/files/pkg-message.in @@ -1,44 +1,44 @@ [ { type: install message: <