summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chinese/eric6/distinfo6
-rw-r--r--devel/cs-eric6/distinfo6
-rw-r--r--devel/eric6/Makefile3
-rw-r--r--devel/eric6/Makefile.inc14
-rw-r--r--devel/eric6/distinfo6
-rw-r--r--devel/eric6/files/extra-patch-install-i18n.py6
-rw-r--r--devel/eric6/pkg-plist7
-rw-r--r--devel/es-eric6/distinfo6
-rw-r--r--devel/it-eric6/distinfo6
-rw-r--r--devel/tr-eric6/distinfo6
-rw-r--r--french/eric6/distinfo6
-rw-r--r--german/eric6/distinfo6
-rw-r--r--portuguese/eric6/distinfo6
-rw-r--r--russian/eric6/distinfo6
14 files changed, 50 insertions, 40 deletions
diff --git a/chinese/eric6/distinfo b/chinese/eric6/distinfo
index 8dcccb1f35c5..b3e1c8c5351d 100644
--- a/chinese/eric6/distinfo
+++ b/chinese/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476030872
-SHA256 (eric6-i18n-zh_CN-6.1.10.tar.gz) = 1338cf30e63c4cc996905316c5eeb09a2d5289bf8072ebfafefa1299e5d19a03
-SIZE (eric6-i18n-zh_CN-6.1.10.tar.gz) = 557971
+TIMESTAMP = 1479494343
+SHA256 (eric6-i18n-zh_CN-6.1.11.tar.gz) = 9c3ed871ad8c848daf3811e15b083971374ee242f0eaba11bcfe050eed19e279
+SIZE (eric6-i18n-zh_CN-6.1.11.tar.gz) = 557976
diff --git a/devel/cs-eric6/distinfo b/devel/cs-eric6/distinfo
index df1f68ce0e07..0a1bee751d3b 100644
--- a/devel/cs-eric6/distinfo
+++ b/devel/cs-eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476031012
-SHA256 (eric6-i18n-cs-6.1.10.tar.gz) = 5677820975fcd86b13304fcacac4c09da196bebc6fbb4133bf24c77127b59b9d
-SIZE (eric6-i18n-cs-6.1.10.tar.gz) = 565677
+TIMESTAMP = 1479494399
+SHA256 (eric6-i18n-cs-6.1.11.tar.gz) = 0656d0b1c8e9e03617ba5cfc154351c9bf8a2554a3332eac139b956b1d450b10
+SIZE (eric6-i18n-cs-6.1.11.tar.gz) = 565671
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 05ee67b4436f..67f727b6e518 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -35,6 +35,9 @@ PORTDATA= *
PORTDOCS= *
PORTEXAMPLES= *
+post-patch:
+ ${RM} ${WRKSRC}/eric/i18n/*.qm ${WRKSRC}/eric/i18n/*.ts
+
do-configure:
${SED} -e 's,PYTHON_SITELIBDIR,${PYTHON_SITELIBDIR},' \
-e 's,PREFIX,${PREFIX},' \
diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc
index 7a14de66ffbf..a62a4d51657e 100644
--- a/devel/eric6/Makefile.inc
+++ b/devel/eric6/Makefile.inc
@@ -6,7 +6,7 @@
# french/eric6, german/eric6, russian/eric6
PORTNAME= eric6
-PORTVERSION= 6.1.10
+PORTVERSION= 6.1.11
MASTER_SITES= SF/eric-ide/${PORTNAME}/stable/${PORTVERSION}
DISTNAME?= ${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -22,7 +22,7 @@ I18N_LANG?= ru
INSTALL_CMD?= install-i18n.py -p ${STAGEDIR}
MAKE_ENV+= "HOME=${WRKDIR}"
-USES+= python:2
+USES+= python
NO_BUILD= yes
PLIST_FILES?= %%DATADIR%%/i18n/${PORTNAME}_${I18N_LANG}.qm
EXTRA_PATCHES?= ${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py
@@ -31,10 +31,18 @@ EXTRA_PATCHES?= ${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py
NO_ARCH= yes
.endif
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VER} <= 2.7
+PLIST_SUB+= PYTHON2=
+.else
+PLIST_SUB+= PYTHON2="@comment "
+.endif
+
do-install:
@(cd ${WRKSRC}; \
${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_CMD})
DESCR= ${.CURDIR}/../../devel/eric6/pkg-descr
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/eric6/distinfo b/devel/eric6/distinfo
index 728b12758b9e..312b900901dc 100644
--- a/devel/eric6/distinfo
+++ b/devel/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476026652
-SHA256 (eric6-6.1.10.tar.gz) = 1fb32fcffad4349a13935c19d4dec6e53af2c11f572d4a9a3bdfc0d341419b4c
-SIZE (eric6-6.1.10.tar.gz) = 10897674
+TIMESTAMP = 1479494248
+SHA256 (eric6-6.1.11.tar.gz) = 68297de0c23dde1e8d6a129df4ebd28b977f835e89a0a8483ee3da2368a23240
+SIZE (eric6-6.1.11.tar.gz) = 17033232
diff --git a/devel/eric6/files/extra-patch-install-i18n.py b/devel/eric6/files/extra-patch-install-i18n.py
index 817c9356f60c..fa0b56e8aa53 100644
--- a/devel/eric6/files/extra-patch-install-i18n.py
+++ b/devel/eric6/files/extra-patch-install-i18n.py
@@ -2,7 +2,7 @@
+++ install-i18n.py 2013-10-05 17:55:20.162267518 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
-+#!/usr/bin/env python2
++#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (c) 2004 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
@@ -21,7 +21,7 @@
- targetDir = configDir
+ targetDir = distDir + getConfig('ericTranslationsDir')
+ if not os.path.exists(targetDir):
-+ os.makedirs(targetDir, 0755)
++ os.makedirs(targetDir, 493) # 0o755
else:
targetDir = getConfig('ericTranslationsDir')
@@ -30,7 +30,7 @@
try:
- optlist, args = getopt.getopt(argv[1:], "hp")
-+ optlist, args = getopt.getopt(argv[1:],"hp:")
++ optlist, args = getopt.getopt(argv[1:], "hp:")
except getopt.GetoptError:
usage()
diff --git a/devel/eric6/pkg-plist b/devel/eric6/pkg-plist
index 69fcc3b0c6fa..94b69b674c4c 100644
--- a/devel/eric6/pkg-plist
+++ b/devel/eric6/pkg-plist
@@ -19,10 +19,9 @@ bin/eric6_trpreviewer
bin/eric6_uipreviewer
bin/eric6_unittest
bin/eric6_webbrowser
-@comment lib/python2.7/site-packages/eric6.pth
-lib/python2.7/site-packages/eric6config.py
-lib/python2.7/site-packages/eric6config.pyc
-lib/python2.7/site-packages/eric6plugins/__init__.py
+%%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
diff --git a/devel/es-eric6/distinfo b/devel/es-eric6/distinfo
index b3db481acb41..6cec628b02a4 100644
--- a/devel/es-eric6/distinfo
+++ b/devel/es-eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476031113
-SHA256 (eric6-i18n-es-6.1.10.tar.gz) = 58816080fc5ec028af01163b8700bea077a75a330f1f3b8183f0cb2aeacf3eda
-SIZE (eric6-i18n-es-6.1.10.tar.gz) = 789148
+TIMESTAMP = 1479494457
+SHA256 (eric6-i18n-es-6.1.11.tar.gz) = 2620b43210808372c69b0cf6b9fc8e9eb2a66601a1cac04ddb061011ae8e4417
+SIZE (eric6-i18n-es-6.1.11.tar.gz) = 789161
diff --git a/devel/it-eric6/distinfo b/devel/it-eric6/distinfo
index 1a7055b63bb1..9e939850baa7 100644
--- a/devel/it-eric6/distinfo
+++ b/devel/it-eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476031209
-SHA256 (eric6-i18n-it-6.1.10.tar.gz) = 7bc809c03b8c127c7f20fc2e349842b08d108402e904437d2644a9f74700932a
-SIZE (eric6-i18n-it-6.1.10.tar.gz) = 641916
+TIMESTAMP = 1479494514
+SHA256 (eric6-i18n-it-6.1.11.tar.gz) = dec286a7ab5f26c85893ffe27bd066fec916c232ce525bd0919aa4825fe2ab02
+SIZE (eric6-i18n-it-6.1.11.tar.gz) = 641915
diff --git a/devel/tr-eric6/distinfo b/devel/tr-eric6/distinfo
index 8e4f286a5e91..34390196117d 100644
--- a/devel/tr-eric6/distinfo
+++ b/devel/tr-eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476031299
-SHA256 (eric6-i18n-tr-6.1.10.tar.gz) = 58621998b81f8908e94f0a11bc5272cbab83a4becdc031be93617b37511f2a51
-SIZE (eric6-i18n-tr-6.1.10.tar.gz) = 491339
+TIMESTAMP = 1479494571
+SHA256 (eric6-i18n-tr-6.1.11.tar.gz) = ad5e62e6e7505082af14d86807eadf6a5c92c7c56ccca7d76326301edc976362
+SIZE (eric6-i18n-tr-6.1.11.tar.gz) = 491344
diff --git a/french/eric6/distinfo b/french/eric6/distinfo
index a5533bdf43b2..5fe22e3d1f61 100644
--- a/french/eric6/distinfo
+++ b/french/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476031409
-SHA256 (eric6-i18n-fr-6.1.10.tar.gz) = 64c109c16406b11c7205dec296485d80e2f4d2da702363ba41e9c562a14c1bf6
-SIZE (eric6-i18n-fr-6.1.10.tar.gz) = 513347
+TIMESTAMP = 1479494628
+SHA256 (eric6-i18n-fr-6.1.11.tar.gz) = 924bc0752ddf09f99bb62a308981794d374284a5b889543bc3739cc3bfe0944e
+SIZE (eric6-i18n-fr-6.1.11.tar.gz) = 513342
diff --git a/german/eric6/distinfo b/german/eric6/distinfo
index a3af8cdf6768..a2fa9c030b42 100644
--- a/german/eric6/distinfo
+++ b/german/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476031468
-SHA256 (eric6-i18n-de-6.1.10.tar.gz) = 29ee35675bea99c816bd465761f7f8a61e7edcbd4b604c6d4f65b326ca995a3a
-SIZE (eric6-i18n-de-6.1.10.tar.gz) = 786692
+TIMESTAMP = 1479494684
+SHA256 (eric6-i18n-de-6.1.11.tar.gz) = 8ad7d14105c4eb8d384884853a9d773f983acd464fdf98ed1b31673dd1a60a0f
+SIZE (eric6-i18n-de-6.1.11.tar.gz) = 786693
diff --git a/portuguese/eric6/distinfo b/portuguese/eric6/distinfo
index 6660cd04ee07..5407b6223a28 100644
--- a/portuguese/eric6/distinfo
+++ b/portuguese/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476031528
-SHA256 (eric6-i18n-pt-6.1.10.tar.gz) = ae1b265d112d93b183f43bf7305a30f71757d6f82035e7eeab62da8e09e747d3
-SIZE (eric6-i18n-pt-6.1.10.tar.gz) = 566237
+TIMESTAMP = 1479494741
+SHA256 (eric6-i18n-pt-6.1.11.tar.gz) = 0e89607d2761e3fd3e1a08a766024807d34235b427536935771422e811c89b60
+SIZE (eric6-i18n-pt-6.1.11.tar.gz) = 566239
diff --git a/russian/eric6/distinfo b/russian/eric6/distinfo
index 5a98f7faa54c..ea3f85ac4d00 100644
--- a/russian/eric6/distinfo
+++ b/russian/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476031586
-SHA256 (eric6-i18n-ru-6.1.10.tar.gz) = efc3bc43c27971684d3410f7d08e8176d883f50b0cf9477e88b4447486d736d7
-SIZE (eric6-i18n-ru-6.1.10.tar.gz) = 820579
+TIMESTAMP = 1479494798
+SHA256 (eric6-i18n-ru-6.1.11.tar.gz) = 4201909b2c8574d8e8afc47e6902f10317a3c42226b19a3f5d4d0200eb79acb3
+SIZE (eric6-i18n-ru-6.1.11.tar.gz) = 820536