Index: head/print/frescobaldi/files/patch-frescobaldi__app_menu.py
===================================================================
--- head/print/frescobaldi/files/patch-frescobaldi__app_menu.py	(revision 434359)
+++ head/print/frescobaldi/files/patch-frescobaldi__app_menu.py	(nonexistent)
@@ -1,18 +0,0 @@
---- 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
- 

Property changes on: head/print/frescobaldi/files/patch-frescobaldi__app_menu.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/print/frescobaldi/files/patch-frescobaldi__app_po_____init____.py
===================================================================
--- head/print/frescobaldi/files/patch-frescobaldi__app_po_____init____.py	(revision 434359)
+++ head/print/frescobaldi/files/patch-frescobaldi__app_po_____init____.py	(nonexistent)
@@ -1,15 +0,0 @@
---- 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

Property changes on: head/print/frescobaldi/files/patch-frescobaldi__app_po_____init____.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/print/frescobaldi/files/patch-frescobaldi__app_snippet_highlight.py
===================================================================
--- head/print/frescobaldi/files/patch-frescobaldi__app_snippet_highlight.py	(revision 434359)
+++ head/print/frescobaldi/files/patch-frescobaldi__app_snippet_highlight.py	(nonexistent)
@@ -1,15 +0,0 @@
---- 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

Property changes on: head/print/frescobaldi/files/patch-frescobaldi__app_snippet_highlight.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/print/frescobaldi/files/patch-frescobaldi__app_snippet_builtin.py
===================================================================
--- head/print/frescobaldi/files/patch-frescobaldi__app_snippet_builtin.py	(revision 434359)
+++ head/print/frescobaldi/files/patch-frescobaldi__app_snippet_builtin.py	(nonexistent)
@@ -1,15 +0,0 @@
---- 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

Property changes on: head/print/frescobaldi/files/patch-frescobaldi__app_snippet_builtin.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/print/frescobaldi/files/patch-frescobaldi__app_snippet_expand.py
===================================================================
--- head/print/frescobaldi/files/patch-frescobaldi__app_snippet_expand.py	(revision 434359)
+++ head/print/frescobaldi/files/patch-frescobaldi__app_snippet_expand.py	(nonexistent)
@@ -1,15 +0,0 @@
---- 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

Property changes on: head/print/frescobaldi/files/patch-frescobaldi__app_snippet_expand.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/print/frescobaldi/Makefile
===================================================================
--- head/print/frescobaldi/Makefile	(revision 434359)
+++ head/print/frescobaldi/Makefile	(revision 434360)
@@ -1,27 +1,31 @@
 # Created by: martin.dieringer@gmx.de
 # $FreeBSD$
 
 PORTNAME=	frescobaldi
-PORTVERSION=	2.19.0
+PORTVERSION=	2.20.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	print kde
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Music score editor for lilypond
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	lilypond:print/lilypond \
-		${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 \
 		${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly
+
+OPTIONS_DEFINE=	LILYPOND
+LILYPOND_DESC=	Use unstable LilyPond (lilypond-devel)
+LILYPOND_RUN_DEPENDS=	lilypond:print/lilypond-devel
+LILYPOND_RUN_DEPENDS_OFF=	lilypond:print/lilypond
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wbsoft
 
 USES=		gettext kde:4 python
 INSTALLS_ICONS=	yes
 USE_KDE=	kdelibs pykde4_build pykde4_run
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
Index: head/print/frescobaldi/distinfo
===================================================================
--- head/print/frescobaldi/distinfo	(revision 434359)
+++ head/print/frescobaldi/distinfo	(revision 434360)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486329913
-SHA256 (wbsoft-frescobaldi-v2.19.0_GH0.tar.gz) = a00857f32c77fc5ff364c33f07c4d5b513aa69b76059c4557096469276b2e35b
-SIZE (wbsoft-frescobaldi-v2.19.0_GH0.tar.gz) = 7136513
+TIMESTAMP = 1487410650
+SHA256 (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 4e0bc5f371724b6c409fe5b8cbd61d05c7ca0c740c608806f09a245dae336de6
+SIZE (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 7379468