Index: head/print/lilypond/Makefile
===================================================================
--- head/print/lilypond/Makefile	(revision 511648)
+++ head/print/lilypond/Makefile	(revision 511649)
@@ -1,86 +1,84 @@
 # Created by: patrick, trevor
 # $FreeBSD$
 
 PORTNAME=	lilypond
 PORTVERSION=	2.18.2
 PORTREVISION=	10
 CATEGORIES=	print audio
 MASTER_SITES=	http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU music typesetter
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		fails to configure
-
 BUILD_DEPENDS=	pdftexi2dvi:print/texinfo \
 		t1ascii:print/t1utils \
 		bash:shells/bash \
 		convert:graphics/ImageMagick6 \
 		dblatex:textproc/dblatex \
 		fontforge:print/fontforge \
 		help2man:misc/help2man \
 		pngtopnm:graphics/netpbm \
 		rsync:net/rsync \
 		zip:archivers/zip \
 		texi2html:textproc/texi2html \
 		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:print/gsfonts
 LIB_DEPENDS=	libguile.so:lang/guile \
 		libgmp.so:math/gmp \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libltdl.so:devel/libltdl
 RUN_DEPENDS=	mftrace:print/mftrace \
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu
 
 USES=		bison:build compiler:c++11-lang gettext ghostscript gmake \
 		gnome pkgconfig perl5 python:2.7
 USE_TEX=	latex
 USE_PERL5=	build
 USE_GNOME=	pango
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts \
 		--with-python-include=${PYTHON_INCLUDEDIR}
 CONFIGURE_ENV+=	ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
 		FLEX=${FLEX} YACC=${YACC}
 
 MAKEFILE=	GNUmakefile
 
 ALL_TARGET=	all
 TEST_TARGET=	test  # fails with sig11
 
 NO_CCACHE=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 INFO=		internals \
 		lilypond-changes \
 		lilypond-contributor \
 		lilypond-essay \
 		lilypond-extending \
 		lilypond-internals \
 		lilypond-learning \
 		lilypond-notation \
 		lilypond-snippets \
 		lilypond-usage \
 		lilypond-web \
 		music-glossary
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<FlexLexer.h>|"/usr/include/FlexLexer.h"|' \
 		${WRKSRC}/lily/include/includable-lexer.hh
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/^PO_FILES/s|= |= #|' ${WRKSRC}/${MAKEFILE}.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lilypond/${PORTVERSION}/python/midi.so
 	@${LN} -fs ${DATADIR}/${PORTVERSION} ${STAGEDIR}${DATADIR}/current
 
 .include <bsd.port.mk>
Index: head/print/lilypond/files/patch-configure
===================================================================
--- head/print/lilypond/files/patch-configure	(revision 511648)
+++ head/print/lilypond/files/patch-configure	(revision 511649)
@@ -1,77 +1,93 @@
 --- configure.orig	2014-03-17 15:29:16 UTC
 +++ configure
-@@ -10881,73 +10881,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
+@@ -9800,13 +9800,8 @@ $as_echo_n "checking $r version... " >&6; }
+     ## for compatibility reasons.
+ 
+     ## grab the first version number in  --version output.
+-    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 |
+-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
+-		head -n 1 |
+-		tr ' ' '\n' |
+-		sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' |
+-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
+-		head -n 1\`\"
++    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>/dev/null |
++		awk '$1 ~ "fontforge" { print $2 }'\`\"
+ 
+     if test -z "$_ver"; then
+         ## If empty, try date [fontforge]
+@@ -10881,73 +10876,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
  
      if test $? -eq 0 -a -n "0.9.0"; then
  
 -    r="`eval echo '$'"PKG_CONFIG"`"
 -    { $as_echo "$as_me:$LINENO: checking $r version" >&5
 -$as_echo_n "checking $r version... " >&6; }
 -    exe=`
 -    ## which doesn't work in ash, if /usr/bin/which isn't installed
 -    ## type -p doesn't work in ash
 -    ## command -v doesn't work in zsh
 -    ## command -v "$r" 2>&1
 -    ## this test should work in ash, bash, pdksh (ksh), zsh
 -    type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
 -`
 -    if test -n ""; then
 -        ver=""
 -    else
 -        ver=`
 -    ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}'
 -    ##
 -    ## ARG.
 -    ## Workaround for broken Debian gcc version string:
 -    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
 -    ##
 -    ## -V: Workaround for python
 -
 -    #dnl
 -
 -    ## Assume and hunt for dotted version multiplet.
 -    ## use eval trickery, because we cannot use multi-level $() instead of ``
 -    ## for compatibility reasons.
 -
 -    ## grab the first version number in  --version output.
 -    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 |
 -		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
 -		head -n 1 |
 -		tr ' ' '\n' |
 -		sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' |
 -		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
 -		head -n 1\`\"
 -
 -    if test -z "$_ver"; then
 -        ## If empty, try date [fontforge]
 -        eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \
 -	    | head -n 1 \
 -	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
 -    fi
 -    echo "$_ver"
 -    #dnl
 -`
 -    fi
 -    num=`
 -    echo "$ver" | awk -F. '
 -    {
 -      if ($3) {three = $3}
 -      else {three = 0}
 -    }
 -    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
 -`
 -    req=`
 -    echo "0.9.0" | awk -F. '
 -    {
 -      if ($3) {three = $3}
 -      else {three = 0}
 -    }
 -    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
 -`
 -    { $as_echo "$as_me:$LINENO: result: $ver" >&5
 -$as_echo "$ver" >&6; }
 -    if test "$num" -lt "$req"; then
 +    if $exec --atleast-pkgconfig-version 0.9.0; then
  
      eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"