diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile index 0784c8ab2935..004b40a7416e 100644 --- a/devel/eric6/Makefile +++ b/devel/eric6/Makefile @@ -1,67 +1,80 @@ # Created by: Boris Samorodov .include "${.CURDIR}/../../devel/eric6/bsd.eric6.mk" PKGNAMESUFFIX= -qt5-${FLAVOR:U:S/_/-/} DISTNAME= ${PORTNAME}-nolang-${DISTVERSION} PORTREVISION= 0 CATEGORIES= devel python DEPRECATED= Uses EOL Python 2.7 via www/py-qt5-webengine -EXPIRATION_DATE=2021-06-23 +EXPIRATION_DATE=2021-12-31 BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}send2trash>=1.5:deskutils/py-send2trash@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}asttokens>=1.1:devel/py-asttokens@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} + RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}send2trash>=1.5:deskutils/py-send2trash@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}asttokens>=1.1:devel/py-asttokens@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}${PKGNAMESUFFIX}-/:C/$/-[0-9]*/} USES+= desktop-file-utils python:3.5+ pyqt:5 shebangfix USE_PYTHON= flavors USE_PYQT= chart core gui qscintilla2 webengine \ help_run network_run svg_run sql_run INSTALL_PY= install.py -c -f eric6config.freebsd -i ${STAGEDIR} SHEBANG_FILES= *.py eric/eric6/*.py eric/scripts/*.py SUB_FILES= eric6.desktop MASTERPORT= yes PORTDATA= * PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES .include post-patch: ${RM} ${WRKSRC}/eric/i18n/*.qm ${WRKSRC}/eric/i18n/*.ts do-configure: ${SED} -e 's,PYTHON_SITELIBDIR,${PYTHON_SITELIBDIR},' \ -e 's,PREFIX,${PREFIX},' \ -e 's,DATADIR,${DATADIR},' \ -e 's,LOCALBASE,${LOCALBASE},' \ -e 's,DOCSDIR,${DOCSDIR},' \ -e 's,EXAMPLESDIR,${EXAMPLESDIR},' \ < ${FILESDIR}/config > ${WRKSRC}/eric6config.freebsd do-install: @(cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_PY}) post-install: ${INSTALL_DATA} ${WRKDIR}/eric6.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${LN} -sf ${DATADIR:C|${PREFIX}(/share(/pixmaps)?)?||:C|/[^/]+|../|g}eric6/icons/default/eric.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/eric6.png @${MKDIR} ${STAGEDIR}${DATADIR}/i18n ${REINPLACE_CMD} -e 's|${STAGEDIR}|${DATADIR}|g' \ -e 's|${WRKSRC}|${DATADIR}|g' \ ${STAGEDIR}/${DATADIR}/eric6install.json @${RM} ${STAGEDIR}/${DATADIR}/eric6install.json.bak .include diff --git a/devel/eric6/bsd.eric6.mk b/devel/eric6/bsd.eric6.mk index 3866d4c01add..2ccb007d2448 100644 --- a/devel/eric6/bsd.eric6.mk +++ b/devel/eric6/bsd.eric6.mk @@ -1,22 +1,22 @@ # Created by: Boris Samorodov # # This is a set of Makefile macros that are common between devel/eric6 and # localized language packages for devel/eric6: # german/eric6, russian/eric6, devel/es-eric6 PORTNAME= eric6 -PORTVERSION= 21.7 +PORTVERSION= 21.9 PORTREVISION?= 0 MASTER_SITES= SF/eric-ide/${PORTNAME}/stable/${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAINTAINER= fluffy@FreeBSD.org COMMENT= Full featured Python and Ruby editor and IDE based on Qt LICENSE= GPLv3 DESCR= ${.CURDIR}/../../devel/eric6/pkg-descr MAKE_ENV+= "HOME=${WRKDIR}" NO_ARCH= yes NO_BUILD= yes diff --git a/devel/eric6/distinfo b/devel/eric6/distinfo index 9043dc16a9fa..330161a22f68 100644 --- a/devel/eric6/distinfo +++ b/devel/eric6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629119012 -SHA256 (eric6-nolang-21.7.tar.gz) = 50f2c7d0d08a33e7edf22518cc66c448246208308de578891fd7341a591c206c -SIZE (eric6-nolang-21.7.tar.gz) = 12929287 +TIMESTAMP = 1630872796 +SHA256 (eric6-nolang-21.9.tar.gz) = 05546fcace624ea06d4aab1e827861371b31e02ad33c4ab3333fc5ac07e49212 +SIZE (eric6-nolang-21.9.tar.gz) = 12928567 diff --git a/devel/eric6/pkg-plist b/devel/eric6/pkg-plist index 5fed9bbcc45f..13b42758fe2e 100644 --- a/devel/eric6/pkg-plist +++ b/devel/eric6/pkg-plist @@ -1,45 +1,44 @@ bin/eric6 bin/eric6_api bin/eric6_browser bin/eric6_compare bin/eric6_configure bin/eric6_diff bin/eric6_doc bin/eric6_editor bin/eric6_hexeditor bin/eric6_iconeditor bin/eric6_plugininstall bin/eric6_pluginrepository bin/eric6_pluginuninstall bin/eric6_qregularexpression bin/eric6_re bin/eric6_shell bin/eric6_snap bin/eric6_sqlbrowser bin/eric6_tray bin/eric6_trpreviewer bin/eric6_uipreviewer bin/eric6_unittest %%PYTHON_SITELIBDIR%%/eric6config.py %%PYTHON_SITELIBDIR%%/eric6plugins/__init__.py share/applications/eric6.desktop share/pixmaps/eric6.png share/qt5/qsci/api/python/eric6.api share/qt5/qsci/api/python/eric6.bas share/qt5/qsci/api/python/zope-2.10.7.api share/qt5/qsci/api/python/zope-2.11.2.api share/qt5/qsci/api/python/zope-3.3.1.api share/qt5/qsci/api/qss/qss.api share/qt5/qsci/api/ruby/Ruby-1.8.7.api share/qt5/qsci/api/ruby/Ruby-1.8.7.bas share/qt5/qsci/api/ruby/Ruby-1.9.1.api share/qt5/qsci/api/ruby/Ruby-1.9.1.bas share/qt5/qsci/api/python/calliope.api share/qt5/qsci/api/python/circuitpython.api share/qt5/qsci/api/python/microbit.api share/qt5/qsci/api/python/micropython.api share/qt5/qsci/api/python/micropython.bas @dir %%DATADIR%%/DTDs @dir %%DATADIR%%/i18n %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%% - diff --git a/devel/es-eric6/distinfo b/devel/es-eric6/distinfo index 5e7f6c759cc0..bd3691faaf07 100644 --- a/devel/es-eric6/distinfo +++ b/devel/es-eric6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629119022 -SHA256 (eric6-i18n-es-21.7.tar.gz) = 27e8cc86b4b62387d358ee2a73b299f752c81bc6dc81fecf3c8f83082a1a7aba -SIZE (eric6-i18n-es-21.7.tar.gz) = 1079100 +TIMESTAMP = 1630872817 +SHA256 (eric6-i18n-es-21.9.tar.gz) = 29ef96bcf8de56786b5b042d03a9e77f3e484de45e269e8f5c3127efdef2fbb9 +SIZE (eric6-i18n-es-21.9.tar.gz) = 1079097 diff --git a/german/eric6/distinfo b/german/eric6/distinfo index 145b555a2917..92df3c190f5a 100644 --- a/german/eric6/distinfo +++ b/german/eric6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629119400 -SHA256 (eric6-i18n-de-21.7.tar.gz) = f2c5535a887086683961001ecc42cb22620aa746dc1db63cf718afe977a68a5f -SIZE (eric6-i18n-de-21.7.tar.gz) = 1077635 +TIMESTAMP = 1630872840 +SHA256 (eric6-i18n-de-21.9.tar.gz) = 4538dfa98b512e1129ebdf9cdf6301865fba39f5b4a9eaa16e2161cc21398f97 +SIZE (eric6-i18n-de-21.9.tar.gz) = 1077632 diff --git a/russian/eric6/distinfo b/russian/eric6/distinfo index 8a5d8486b55b..e423eb9f84c0 100644 --- a/russian/eric6/distinfo +++ b/russian/eric6/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629119454 -SHA256 (eric6-i18n-ru-21.7.tar.gz) = 8ba042ebda7952c9e0d41b5efb7d87a253214c9fdd21e2e81e901e4ab502ec6f -SIZE (eric6-i18n-ru-21.7.tar.gz) = 1136625 +TIMESTAMP = 1630872859 +SHA256 (eric6-i18n-ru-21.9.tar.gz) = 043a038dde5b343ca64a0dfd63ac97e8202958944a825679fd5d1f8ba42adce8 +SIZE (eric6-i18n-ru-21.9.tar.gz) = 1136622