Attachment #180094 for bug #217187

Lines 1-3 Link Here

(-)frescobaldi/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486329913	1	TIMESTAMP = 1487352996
2	SHA256 (wbsoft-frescobaldi-v2.19.0_GH0.tar.gz) = a00857f32c77fc5ff364c33f07c4d5b513aa69b76059c4557096469276b2e35b	2	SHA256 (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 4e0bc5f371724b6c409fe5b8cbd61d05c7ca0c740c608806f09a245dae336de6
3	SIZE (wbsoft-frescobaldi-v2.19.0_GH0.tar.gz) = 7136513	3	SIZE (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 7379468




--- frescobaldi_app/menu.py.orig	2016-04-21 23:00:30 UTC
+++ frescobaldi_app/menu.py
@@ -23,11 +23,12 @@ Frescobaldi main menu.
 
 from __future__ import unicode_literals
 
-try:
+import sys
+if sys.version_info >= (3, 0):
     import builtins # py3
-except ImportError:
+else:
     import __builtin__ as builtins # py2
-
+    
 from PyQt4.QtCore import QSettings
 from PyQt4.QtGui import QMenu
 




--- frescobaldi_app/po/__init__.py.orig	2016-04-21 23:00:30 UTC
+++ frescobaldi_app/po/__init__.py
@@ -21,9 +21,10 @@
 Internationalization of Frescobaldi.
 """
 
-try:
+import sys
+if sys.version_info >= (3, 0):
     import builtins # py3
-except ImportError:
+else:
     import __builtin__ as builtins # py2
 
 import os




--- frescobaldi_app/snippet/builtin.py.orig	2016-04-21 23:00:30 UTC
+++ frescobaldi_app/snippet/builtin.py
@@ -23,9 +23,10 @@ Builtin snippets.
 
 from __future__ import unicode_literals
 
-try:
+import sys
+if sys.version_info >= (3, 0):
     import builtins # py3
-except ImportError:
+else:
     import __builtin__ as builtins # py2
 
 import collections




--- frescobaldi_app/snippet/expand.py.orig	2016-04-21 23:00:30 UTC
+++ frescobaldi_app/snippet/expand.py
@@ -23,9 +23,10 @@ Expand variables like $DATE, $LILYPOND_V
 
 from __future__ import unicode_literals
 
-try:
+import sys
+if sys.version_info >= (3, 0):
     import builtins # py3
-except ImportError:
+else:
     import __builtin__ as builtins # py2
 
 import time




--- frescobaldi_app/snippet/highlight.py.orig	2016-04-21 23:00:30 UTC
+++ frescobaldi_app/snippet/highlight.py
@@ -23,9 +23,10 @@ Highlighter for the snippet editor and v
 
 from __future__ import unicode_literals
 
-try:
+import sys
+if sys.version_info >= (3, 0):
     import builtins # py3
-except ImportError:
+else:
     import __builtin__ as builtins # py2
 
 import keyword

Lines 2-8 Link Here

(-)frescobaldi/Makefile (-3 / +14 lines)
2	# $FreeBSD: head/print/frescobaldi/Makefile 434122 2017-02-14 16:09:00Z amdmi3 $	2	# $FreeBSD: head/print/frescobaldi/Makefile 434122 2017-02-14 16:09:00Z amdmi3 $
3		3
4	PORTNAME= frescobaldi	4	PORTNAME= frescobaldi
5	PORTVERSION= 2.19.0	5	PORTVERSION= 2.20.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= print kde	7	CATEGORIES= print kde
8		8
Lines 12-21 Link Here
12	LICENSE= GPLv2+	12	LICENSE= GPLv2+
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	RUN_DEPENDS= lilypond:print/lilypond \	15	OPTIONS_DEFINE= LILYPOND_DEVEL
16	${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 \	16
		17	LILYPOND_DEVEL_DESC= Use print/lilypond-devel
		18
		19	.include <bsd.port.options.mk>
		20
		21	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 \
17	${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly	22	${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly
18		23
		24	.if ${PORT_OPTIONS:MLILYPOND_DEVEL}
		25	RUN_DEPENDS+= lilypond:print/lilypond-devel
		26	.else
		27	RUN_DEPENDS+= lilypond:print/lilypond
		28	.endif
		29
19	USE_GITHUB= yes	30	USE_GITHUB= yes
20	GH_ACCOUNT= wbsoft	31	GH_ACCOUNT= wbsoft
21		32

Return to bug 217187

Lines 1-18 Link Here

(-)frescobaldi/files/patch-frescobaldi__app_menu.py (-18 lines)
1	--- frescobaldi_app/menu.py.orig 2016-04-21 23:00:30 UTC
2	+++ frescobaldi_app/menu.py
3	@@ -23,11 +23,12 @@ Frescobaldi main menu.
4
5	from __future__ import unicode_literals
6
7	-try:
8	+import sys
9	+if sys.version_info >= (3, 0):
10	import builtins # py3
11	-except ImportError:
12	+else:
13	import __builtin__ as builtins # py2
14	-
15	+
16	from PyQt4.QtCore import QSettings
17	from PyQt4.QtGui import QMenu
18

Lines 1-15 Link Here

(-)frescobaldi/files/patch-frescobaldi__app_po_____init____.py (-15 lines)
1	--- frescobaldi_app/po/__init__.py.orig 2016-04-21 23:00:30 UTC
2	+++ frescobaldi_app/po/__init__.py
3	@@ -21,9 +21,10 @@
4	Internationalization of Frescobaldi.
5	"""
6
7	-try:
8	+import sys
9	+if sys.version_info >= (3, 0):
10	import builtins # py3
11	-except ImportError:
12	+else:
13	import __builtin__ as builtins # py2
14
15	import os

Lines 1-15 Link Here

(-)frescobaldi/files/patch-frescobaldi__app_snippet_builtin.py (-15 lines)
1	--- frescobaldi_app/snippet/builtin.py.orig 2016-04-21 23:00:30 UTC
2	+++ frescobaldi_app/snippet/builtin.py
3	@@ -23,9 +23,10 @@ Builtin snippets.
4
5	from __future__ import unicode_literals
6
7	-try:
8	+import sys
9	+if sys.version_info >= (3, 0):
10	import builtins # py3
11	-except ImportError:
12	+else:
13	import __builtin__ as builtins # py2
14
15	import collections

Lines 1-15 Link Here

(-)frescobaldi/files/patch-frescobaldi__app_snippet_expand.py (-15 lines)
1	--- frescobaldi_app/snippet/expand.py.orig 2016-04-21 23:00:30 UTC
2	+++ frescobaldi_app/snippet/expand.py
3	@@ -23,9 +23,10 @@ Expand variables like $DATE, $LILYPOND_V
4
5	from __future__ import unicode_literals
6
7	-try:
8	+import sys
9	+if sys.version_info >= (3, 0):
10	import builtins # py3
11	-except ImportError:
12	+else:
13	import __builtin__ as builtins # py2
14
15	import time

Lines 1-15 Link Here

(-)frescobaldi/files/patch-frescobaldi__app_snippet_highlight.py (-15 lines)
1	--- frescobaldi_app/snippet/highlight.py.orig 2016-04-21 23:00:30 UTC
2	+++ frescobaldi_app/snippet/highlight.py
3	@@ -23,9 +23,10 @@ Highlighter for the snippet editor and v
4
5	from __future__ import unicode_literals
6
7	-try:
8	+import sys
9	+if sys.version_info >= (3, 0):
10	import builtins # py3
11	-except ImportError:
12	+else:
13	import __builtin__ as builtins # py2
14
15	import keyword