svn commit: r538410 - in head: devel/eric6 devel/eric6/files devel/es-eric6 german/eric6 russian/eric6
Dima Panov
fluffy at FreeBSD.org
Wed Jun 10 16:41:51 UTC 2020
Author: fluffy
Date: Wed Jun 10 16:41:49 2020
New Revision: 538410
URL: https://svnweb.freebsd.org/changeset/ports/538410
Log:
devel/eric6: update to 20.6 release
- pass all python scripts via shebangfix (env python3 is not looks good)
- rename variable INSTALL_CMD to INSTALL_PY to avoid stage error at pkg build cluster
- install qsci files under share/qt5 subdir instead of share/qt4
Modified:
head/devel/eric6/Makefile
head/devel/eric6/Makefile.inc
head/devel/eric6/bsd.eric6.mk
head/devel/eric6/distinfo
head/devel/eric6/files/config (contents, props changed)
head/devel/eric6/pkg-plist
head/devel/es-eric6/distinfo
head/german/eric6/distinfo
head/russian/eric6/distinfo
Modified: head/devel/eric6/Makefile
==============================================================================
--- head/devel/eric6/Makefile Wed Jun 10 16:25:16 2020 (r538409)
+++ head/devel/eric6/Makefile Wed Jun 10 16:41:49 2020 (r538410)
@@ -1,7 +1,6 @@
# Created by: Boris Samorodov <bsam at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
PKGNAMESUFFIX= -qt5-${FLAVOR:U:S/_/-/}
DISTNAME= ${PORTNAME}-nolang-${DISTVERSION}
CATEGORIES= devel python
@@ -13,11 +12,12 @@ RUN_DEPENDS+= ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so
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
@@ -44,7 +44,7 @@ do-configure:
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/
Modified: head/devel/eric6/Makefile.inc
==============================================================================
--- head/devel/eric6/Makefile.inc Wed Jun 10 16:25:16 2020 (r538409)
+++ head/devel/eric6/Makefile.inc Wed Jun 10 16:41:49 2020 (r538410)
@@ -10,7 +10,8 @@
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
Modified: head/devel/eric6/bsd.eric6.mk
==============================================================================
--- head/devel/eric6/bsd.eric6.mk Wed Jun 10 16:25:16 2020 (r538409)
+++ head/devel/eric6/bsd.eric6.mk Wed Jun 10 16:41:49 2020 (r538410)
@@ -6,7 +6,8 @@
# 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}
@@ -18,4 +19,5 @@ LICENSE= GPLv3
DESCR= ${.CURDIR}/../../devel/eric6/pkg-descr
MAKE_ENV+= "HOME=${WRKDIR}"
+NO_ARCH= yes
NO_BUILD= yes
Modified: head/devel/eric6/distinfo
==============================================================================
--- head/devel/eric6/distinfo Wed Jun 10 16:25:16 2020 (r538409)
+++ head/devel/eric6/distinfo Wed Jun 10 16:41:49 2020 (r538410)
@@ -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
Modified: head/devel/eric6/files/config
==============================================================================
--- head/devel/eric6/files/config Wed Jun 10 16:25:16 2020 (r538409)
+++ head/devel/eric6/files/config Wed Jun 10 16:41:49 2020 (r538410)
@@ -18,5 +18,5 @@ cfg = {
'ericOthersDir' : 'DATADIR/Others',
'bindir' : 'PREFIX/bin',
'mdir' : 'PYTHON_SITELIBDIR',
- 'apidir' : 'LOCALBASE/share/qt4/qsci/api',
+ 'apidir' : 'LOCALBASE/share/qt5/qsci/api',
}
Modified: head/devel/eric6/pkg-plist
==============================================================================
--- head/devel/eric6/pkg-plist Wed Jun 10 16:25:16 2020 (r538409)
+++ head/devel/eric6/pkg-plist Wed Jun 10 16:41:49 2020 (r538410)
@@ -22,25 +22,24 @@ 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%%
Modified: head/devel/es-eric6/distinfo
==============================================================================
--- head/devel/es-eric6/distinfo Wed Jun 10 16:25:16 2020 (r538409)
+++ head/devel/es-eric6/distinfo Wed Jun 10 16:41:49 2020 (r538410)
@@ -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
Modified: head/german/eric6/distinfo
==============================================================================
--- head/german/eric6/distinfo Wed Jun 10 16:25:16 2020 (r538409)
+++ head/german/eric6/distinfo Wed Jun 10 16:41:49 2020 (r538410)
@@ -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
Modified: head/russian/eric6/distinfo
==============================================================================
--- head/russian/eric6/distinfo Wed Jun 10 16:25:16 2020 (r538409)
+++ head/russian/eric6/distinfo Wed Jun 10 16:41:49 2020 (r538410)
@@ -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
More information about the svn-ports-head
mailing list