--- frescobaldi/distinfo	2017-02-12 15:21:24.000000000 +0100
+++ frescobaldi/distinfo	2017-02-17 18:36:36.109238000 +0100
@@ -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 = 1487352996
+SHA256 (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 4e0bc5f371724b6c409fe5b8cbd61d05c7ca0c740c608806f09a245dae336de6
+SIZE (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 7379468
--- frescobaldi/files/patch-frescobaldi__app_menu.py	2017-02-12 15:21:24.000000000 +0100
+++ frescobaldi/files/patch-frescobaldi__app_menu.py	1970-01-01 01:00:00.000000000 +0100
@@ -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
- 
--- frescobaldi/files/patch-frescobaldi__app_po_____init____.py	2017-02-12 15:21:24.000000000 +0100
+++ frescobaldi/files/patch-frescobaldi__app_po_____init____.py	1970-01-01 01:00:00.000000000 +0100
@@ -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
--- frescobaldi/files/patch-frescobaldi__app_snippet_builtin.py	2017-02-12 15:21:24.000000000 +0100
+++ frescobaldi/files/patch-frescobaldi__app_snippet_builtin.py	1970-01-01 01:00:00.000000000 +0100
@@ -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
--- frescobaldi/files/patch-frescobaldi__app_snippet_expand.py	2017-02-12 15:21:24.000000000 +0100
+++ frescobaldi/files/patch-frescobaldi__app_snippet_expand.py	1970-01-01 01:00:00.000000000 +0100
@@ -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
--- frescobaldi/files/patch-frescobaldi__app_snippet_highlight.py	2017-02-12 15:21:24.000000000 +0100
+++ frescobaldi/files/patch-frescobaldi__app_snippet_highlight.py	1970-01-01 01:00:00.000000000 +0100
@@ -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
--- frescobaldi/Makefile	2017-02-14 17:09:00.000000000 +0100
+++ frescobaldi/Makefile	2017-02-17 18:37:38.375015000 +0100
@@ -2,7 +2,7 @@ 
 # $FreeBSD: head/print/frescobaldi/Makefile 434122 2017-02-14 16:09:00Z amdmi3 $
 
 PORTNAME=	frescobaldi
-PORTVERSION=	2.19.0
+PORTVERSION=	2.20.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	print kde
 
@@ -12,10 +12,21 @@ 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	lilypond:print/lilypond \
-		${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 \
+OPTIONS_DEFINE=	LILYPOND_DEVEL
+
+LILYPOND_DEVEL_DESC=	Use print/lilypond-devel
+
+.include <bsd.port.options.mk>
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 \
 		${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly
 
+.if ${PORT_OPTIONS:MLILYPOND_DEVEL}
+RUN_DEPENDS+=	lilypond:print/lilypond-devel
+.else
+RUN_DEPENDS+=	lilypond:print/lilypond
+.endif
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	wbsoft