Date: Sat, 1 Jan 2022 14:09:41 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e2b444d89aa7 - main - eric6: Revert removal. Message-ID: <202201011409.201E9fpH034638@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2b444d89aa72f2d914995363aece00012b470ed commit e2b444d89aa72f2d914995363aece00012b470ed Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2022-01-01 13:04:44 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2022-01-01 13:48:55 +0000 eric6: Revert removal. This reverts commits * e6fa82f13214be6efb40b6cca698607fe15adfc0 * fb41f4077d321912b1e1c1c586cc90e9df5ce9d8 * 75b955057c8e0c7cf9f47d4070802312e8427d34 (eric6 part) Requested by: fluffy, tcberner --- MOVED | 4 -- devel/Makefile | 2 + devel/eric6/Makefile | 80 ++++++++++++++++++++++++++++++++++++++ devel/eric6/Makefile.inc | 22 +++++++++++ devel/eric6/bsd.eric6.mk | 22 +++++++++++ devel/eric6/distinfo | 3 ++ devel/eric6/files/config | 22 +++++++++++ devel/eric6/files/eric6.desktop.in | 10 +++++ devel/eric6/pkg-descr | 11 ++++++ devel/eric6/pkg-message | 10 +++++ devel/eric6/pkg-plist | 44 +++++++++++++++++++++ devel/es-eric6/Makefile | 6 +++ devel/es-eric6/distinfo | 3 ++ german/Makefile | 1 + german/eric6/Makefile | 6 +++ german/eric6/distinfo | 3 ++ russian/Makefile | 1 + russian/eric6/Makefile | 6 +++ russian/eric6/distinfo | 3 ++ 19 files changed, 255 insertions(+), 4 deletions(-) diff --git a/MOVED b/MOVED index 79819d9bf4af..c2e6416a58ba 100644 --- a/MOVED +++ b/MOVED @@ -16724,7 +16724,6 @@ www/py-dj31-django-mptt||2021-12-31|Has expired: Extended support of Django 3.1 net/py-flask-xml-rpc||2021-12-31|Has expired: No longer maintained upstream audio/libaacplus||2021-12-31|Has expired: Abandoned upstream, no new release since 2011 security/obfsclient||2021-12-31|Has expired: https://github.com/Yawning/obfsclient/issues/37 -devel/eric6||2021-12-31|Has expired: Uses EOL Python 2.7 via www/py-qt5-webengine www/grafana||2021-12-31|Has expired: No longer maintained upstream, use www/grafana8 www/py-dj31-django-auth-ldap||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/ www/py-dj31-django-filter||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/ @@ -16758,9 +16757,6 @@ www/py-dj31-django-redis||2021-12-31|Has expired: Extended support of Django 3.1 devel/py-dj31-django-rq||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/ graphics/libreatlas||2021-12-31|Has expired: Abandoned upstream, no new release since 2012 www/py-dj31-djangorestframework||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/ -devel/es-eric6||2021-12-31|Slave of expired devel/eric6 -german/eric6||2021-12-31|Slave of expired devel/eric6 -russian/eric6||2021-12-31|Slave of expired devel/eric6 astro/google-earth||2022-01-01|Has expired: Needs newer version to connect to server net/tramp||2022-01-01|Has expired: Not updated in 5 years and now part of Emacs archivers/p7zip-codec-rar||2022-01-01|Has expired: Unmaintained for years and has known vulnerabilities diff --git a/devel/Makefile b/devel/Makefile index a6690ddecbef..bf073b1817dd 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -613,6 +613,7 @@ SUBDIR += envsubst SUBDIR += epl.el SUBDIR += epm + SUBDIR += eric6 SUBDIR += eris SUBDIR += erlang-backoff SUBDIR += erlang-bbmustache @@ -652,6 +653,7 @@ SUBDIR += erlang-ssl_verify_fun SUBDIR += erlang-syslog SUBDIR += erlang-unicode_util_compat + SUBDIR += es-eric6 SUBDIR += esbuild SUBDIR += estd SUBDIR += etcd diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile new file mode 100644 index 000000000000..7f975775b5c1 --- /dev/null +++ b/devel/eric6/Makefile @@ -0,0 +1,80 @@ +# Created by: Boris Samorodov <bsam@FreeBSD.org> + +.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-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}-qt5-/} + +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 <bsd.port.options.mk> + +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 <bsd.port.mk> diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc new file mode 100644 index 000000000000..3c6ab023316d --- /dev/null +++ b/devel/eric6/Makefile.inc @@ -0,0 +1,22 @@ +# Created by: Boris Samorodov <bsam@FreeBSD.org> +# +# This is a set of Makefile macros which allow to build the +# localized language packages for devel/eric6: +# german/eric6, russian/eric6, devel/es-eric6 + +.include "${.CURDIR}/../../devel/eric6/bsd.eric6.mk" + +PKGNAMEPREFIX= ${I18N_LANG}- +DISTNAME= ${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION} + +COMMENT= ${I18N_LANG} i18n package for Eric6 IDE + +NO_ARCH= yes +NO_BUILD= yes +PLIST_FILES= ${DATADIR}/i18n/${PORTNAME}_${I18N_LANG}.qm + +do-install: + ${MKDIR} ${STAGEDIR}${DATADIR}/i18n + ${INSTALL_DATA} ${WRKSRC}/eric/eric6/i18n/${PORTNAME}_${I18N_LANG}.qm ${STAGEDIR}${DATADIR}/i18n/ + +.include <bsd.port.mk> diff --git a/devel/eric6/bsd.eric6.mk b/devel/eric6/bsd.eric6.mk new file mode 100644 index 000000000000..6f6afc6b8257 --- /dev/null +++ b/devel/eric6/bsd.eric6.mk @@ -0,0 +1,22 @@ +# Created by: Boris Samorodov <bsam@FreeBSD.org> +# +# 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.11 +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 new file mode 100644 index 000000000000..68d4504b0814 --- /dev/null +++ b/devel/eric6/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1636374251 +SHA256 (eric6-nolang-21.11.tar.gz) = 769e85fbf06650069e41b7587b13ae5c07c68ef49ea1cf9d38f19ea8655bb0e1 +SIZE (eric6-nolang-21.11.tar.gz) = 12945495 diff --git a/devel/eric6/files/config b/devel/eric6/files/config new file mode 100644 index 000000000000..e93b28228f01 --- /dev/null +++ b/devel/eric6/files/config @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# +# This module contains the configuration of the individual eric6 installation +# + +cfg = { + 'ericDir' : 'DATADIR', + 'ericPixDir' : 'DATADIR/pixmaps', + 'ericIconDir' : 'DATADIR/icons', + 'ericDTDDir' : 'DATADIR/DTDs', + 'ericCSSDir' : 'DATADIR/CSSs', + 'ericStylesDir' : 'DATADIR/Styles', + 'ericDocDir' : 'DOCSDIR', + 'ericExamplesDir' : 'EXAMPLESDIR', + 'ericTranslationsDir' : 'DATADIR/i18n', + 'ericTemplatesDir' : 'DATADIR/DesignerTemplates', + 'ericCodeTemplatesDir' : 'DATADIR/CodeTemplates', + 'ericOthersDir' : 'DATADIR/Others', + 'bindir' : 'PREFIX/bin', + 'mdir' : 'PYTHON_SITELIBDIR', + 'apidir' : 'LOCALBASE/share/qt5/qsci/api', +} diff --git a/devel/eric6/files/eric6.desktop.in b/devel/eric6/files/eric6.desktop.in new file mode 100644 index 000000000000..bdcfcabfaea2 --- /dev/null +++ b/devel/eric6/files/eric6.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Eric IDE +GenericName=Python and Ruby IDE +Comment=Full featured Python and Ruby editor and IDE based on Qt4 +Type=Application +Exec=eric6 +Icon=eric6 +MimeType=application/x-python;application/x-eric; +Categories=Development;TextEditor;Qt;Application; +Terminal=false diff --git a/devel/eric6/pkg-descr b/devel/eric6/pkg-descr new file mode 100644 index 000000000000..f5830555dd10 --- /dev/null +++ b/devel/eric6/pkg-descr @@ -0,0 +1,11 @@ +Eric is a full featured Python and Ruby editor and IDE, written in python. + +It is based on the cross platform Qt gui toolkit, integrating the highly +flexible Scintilla editor control. It is designed to be usable as everyday's +quick and dirty editor as well as being usable as a professional project +management tool integrating many advanced features Python offers +the professional coder. + +This is a port of eric6 (based on Qt5). + +WWW: https://eric-ide.python-projects.org/index.html diff --git a/devel/eric6/pkg-message b/devel/eric6/pkg-message new file mode 100644 index 000000000000..9cf10be76e1d --- /dev/null +++ b/devel/eric6/pkg-message @@ -0,0 +1,10 @@ +[ +{ type: install + message: <<EOM +eric6 has the following localized language packages: + de-eric6 + es-eric6 + ru-eric6 +EOM +} +] diff --git a/devel/eric6/pkg-plist b/devel/eric6/pkg-plist new file mode 100644 index 000000000000..13b42758fe2e --- /dev/null +++ b/devel/eric6/pkg-plist @@ -0,0 +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/Makefile b/devel/es-eric6/Makefile new file mode 100644 index 000000000000..b31e4a130e5d --- /dev/null +++ b/devel/es-eric6/Makefile @@ -0,0 +1,6 @@ +# Created by: Boris Samorodov <bsam@FreeBSD.org> + +CATEGORIES= devel python +I18N_LANG= es + +.include "${.CURDIR}/../../devel/eric6/Makefile.inc" diff --git a/devel/es-eric6/distinfo b/devel/es-eric6/distinfo new file mode 100644 index 000000000000..74874d9dc17b --- /dev/null +++ b/devel/es-eric6/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1636374625 +SHA256 (eric6-i18n-es-21.11.tar.gz) = 877bbc5fd67ec24ac51d5c4244973d24de608e904104d03b75a7dfc22425163e +SIZE (eric6-i18n-es-21.11.tar.gz) = 1079101 diff --git a/german/Makefile b/german/Makefile index 1f19250a762f..f56a2fbb9195 100644 --- a/german/Makefile +++ b/german/Makefile @@ -7,6 +7,7 @@ SUBDIR += dict SUBDIR += ding SUBDIR += dtaus + SUBDIR += eric6 SUBDIR += geonext SUBDIR += hunspell SUBDIR += hyphen diff --git a/german/eric6/Makefile b/german/eric6/Makefile new file mode 100644 index 000000000000..b5a1c5052ed4 --- /dev/null +++ b/german/eric6/Makefile @@ -0,0 +1,6 @@ +# Created by: Boris Samorodov <bsam@FreeBSD.org> + +CATEGORIES= german devel python +I18N_LANG= de + +.include "${.CURDIR}/../../devel/eric6/Makefile.inc" diff --git a/german/eric6/distinfo b/german/eric6/distinfo new file mode 100644 index 000000000000..5d48ec4de1d4 --- /dev/null +++ b/german/eric6/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1636374681 +SHA256 (eric6-i18n-de-21.11.tar.gz) = 3c2fb8f7f92e8635eef5337aba7f26ba8d26331a8fa891145ee23d81c9ac09e4 +SIZE (eric6-i18n-de-21.11.tar.gz) = 1077638 diff --git a/russian/Makefile b/russian/Makefile index 84a9ccf87e0b..256b178024f4 100644 --- a/russian/Makefile +++ b/russian/Makefile @@ -5,6 +5,7 @@ SUBDIR += bugzilla44 SUBDIR += d1489 SUBDIR += emkatic + SUBDIR += eric6 SUBDIR += gd SUBDIR += hunspell SUBDIR += hyphen diff --git a/russian/eric6/Makefile b/russian/eric6/Makefile new file mode 100644 index 000000000000..9cccf3e6751b --- /dev/null +++ b/russian/eric6/Makefile @@ -0,0 +1,6 @@ +# Created by: Boris Samorodov <bsam@FreeBSD.org> + +CATEGORIES= russian devel python +I18N_LANG= ru + +.include "${.CURDIR}/../../devel/eric6/Makefile.inc" diff --git a/russian/eric6/distinfo b/russian/eric6/distinfo new file mode 100644 index 000000000000..2ac41929b754 --- /dev/null +++ b/russian/eric6/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1636374699 +SHA256 (eric6-i18n-ru-21.11.tar.gz) = c0e00c5c459b5017af7d0f76cf9f00e6cc518347fe932e1f3c5ffa716c52c3d0 +SIZE (eric6-i18n-ru-21.11.tar.gz) = 1136627
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201011409.201E9fpH034638>