Index: head/devel/eric6/Makefile =================================================================== --- head/devel/eric6/Makefile (revision 538409) +++ head/devel/eric6/Makefile (revision 538410) @@ -1,55 +1,55 @@ # Created by: Boris Samorodov # $FreeBSD$ -PORTREVISION= 1 PKGNAMESUFFIX= -qt5-${FLAVOR:U:S/_/-/} DISTNAME= ${PORTNAME}-nolang-${DISTVERSION} CATEGORIES= devel python # Note to MAINTAINER: this should be converted to USES=pyqt, USE_PYQT=[...] BUILD_DEPENDS+= ${PYQT_PY_RELNAME}-chart>=${PYQT_VERSION}:x11-toolkits/py-qt5-chart@${PY_FLAVOR} RUN_DEPENDS+= ${PYQT_PY_RELNAME}-chart>=${PYQT_VERSION}:x11-toolkits/py-qt5-chart@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}${PKGNAMESUFFIX}-/:C/$/-[0-9]*/} -USES= desktop-file-utils python:3.5+ pyqt:5 +USES+= desktop-file-utils python:3.5+ pyqt:5 shebangfix USE_PYTHON= flavors USE_PYQT= core gui qscintilla2 webengine \ help_run network_run svg_run sql_run -INSTALL_CMD= install.py -c -f eric6config.freebsd -i ${STAGEDIR} +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 "${.CURDIR}/bsd.eric6.mk" .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_CMD}) + ${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 .include Index: head/devel/eric6/Makefile.inc =================================================================== --- head/devel/eric6/Makefile.inc (revision 538409) +++ head/devel/eric6/Makefile.inc (revision 538410) @@ -1,22 +1,23 @@ # Created by: Boris Samorodov # $FreeBSD$ # # 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} -#INSTALL_CMD= ${WRKSRC}/install-i18n.py -p ${STAGEDIR} +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 Index: head/devel/eric6/bsd.eric6.mk =================================================================== --- head/devel/eric6/bsd.eric6.mk (revision 538409) +++ head/devel/eric6/bsd.eric6.mk (revision 538410) @@ -1,21 +1,23 @@ # Created by: Boris Samorodov # $FreeBSD$ # # 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= 20.5 +PORTVERSION= 20.6 +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 Index: head/devel/eric6/distinfo =================================================================== --- head/devel/eric6/distinfo (revision 538409) +++ head/devel/eric6/distinfo (revision 538410) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590886026 -SHA256 (eric6-nolang-20.5.tar.gz) = 465331995f2c181179c1c35b9e587014c20f8a1d1cb20bdc96b1d84defe28f54 -SIZE (eric6-nolang-20.5.tar.gz) = 13729229 +TIMESTAMP = 1591803015 +SHA256 (eric6-nolang-20.6.tar.gz) = ebe014659a96841d118dcfb798788337f6e2322c8fd5149aabd5bc0ff521b8ab +SIZE (eric6-nolang-20.6.tar.gz) = 13743166 Index: head/devel/eric6/files/config =================================================================== --- head/devel/eric6/files/config (revision 538409) +++ head/devel/eric6/files/config (revision 538410) @@ -1,22 +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/qt4/qsci/api', + 'apidir' : 'LOCALBASE/share/qt5/qsci/api', } Property changes on: head/devel/eric6/files/config ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/devel/eric6/pkg-plist =================================================================== --- head/devel/eric6/pkg-plist (revision 538409) +++ head/devel/eric6/pkg-plist (revision 538410) @@ -1,47 +1,46 @@ 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_qregexp 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 -%%PYTHON2%%%%PYTHON_SITELIBDIR%%/eric6config.pyc %%PYTHON_SITELIBDIR%%/eric6plugins/__init__.py share/applications/eric6.desktop share/pixmaps/eric6.png -share/qt4/qsci/api/python/eric6.api -share/qt4/qsci/api/python/eric6.bas -share/qt4/qsci/api/python/zope-2.10.7.api -share/qt4/qsci/api/python/zope-2.11.2.api -share/qt4/qsci/api/python/zope-3.3.1.api -share/qt4/qsci/api/qss/qss.api -share/qt4/qsci/api/ruby/Ruby-1.8.7.api -share/qt4/qsci/api/ruby/Ruby-1.8.7.bas -share/qt4/qsci/api/ruby/Ruby-1.9.1.api -share/qt4/qsci/api/ruby/Ruby-1.9.1.bas -share/qt4/qsci/api/python/calliope.api -share/qt4/qsci/api/python/circuitpython.api -share/qt4/qsci/api/python/microbit.api -share/qt4/qsci/api/python/micropython.api -share/qt4/qsci/api/python/micropython.bas +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%% Index: head/devel/es-eric6/distinfo =================================================================== --- head/devel/es-eric6/distinfo (revision 538409) +++ head/devel/es-eric6/distinfo (revision 538410) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590886041 -SHA256 (eric6-i18n-es-20.5.tar.gz) = 022d11dc3de4205ed285a4f4e9ef1d845668bb9a1fe2250f42332598f07bf47d -SIZE (eric6-i18n-es-20.5.tar.gz) = 1056949 +TIMESTAMP = 1591803241 +SHA256 (eric6-i18n-es-20.6.tar.gz) = c069a1d8d04b0560126fe5ad5f87ba166b76c9b9181d1238c2f25e6fe3f4319c +SIZE (eric6-i18n-es-20.6.tar.gz) = 1058964 Index: head/german/eric6/distinfo =================================================================== --- head/german/eric6/distinfo (revision 538409) +++ head/german/eric6/distinfo (revision 538410) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590886052 -SHA256 (eric6-i18n-de-20.5.tar.gz) = c65e6939193a6721dc36fd01facd370456f19272f4d625c0fea8675a3a2b98b6 -SIZE (eric6-i18n-de-20.5.tar.gz) = 1052996 +TIMESTAMP = 1591803359 +SHA256 (eric6-i18n-de-20.6.tar.gz) = 7f7145491f128e2a6cf4191bfdc51d980d01e986e315f14d9151fe6dc85ad6d8 +SIZE (eric6-i18n-de-20.6.tar.gz) = 1055191 Index: head/russian/eric6/distinfo =================================================================== --- head/russian/eric6/distinfo (revision 538409) +++ head/russian/eric6/distinfo (revision 538410) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590886061 -SHA256 (eric6-i18n-ru-20.5.tar.gz) = 75810f6b6a702c4bcd1085f6058afd17597aa240af550c0d8293c9a353678710 -SIZE (eric6-i18n-ru-20.5.tar.gz) = 1111090 +TIMESTAMP = 1591803417 +SHA256 (eric6-i18n-ru-20.6.tar.gz) = 91e575a0760558010676ce947c65ad7ac7be3eeee3bbeaf7281e68fd293492c4 +SIZE (eric6-i18n-ru-20.6.tar.gz) = 1113180