5 files changed, 23 insertions, 13 deletions

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