Index: head/print/lilypond-devel/Makefile =================================================================== --- head/print/lilypond-devel/Makefile (revision 542669) +++ head/print/lilypond-devel/Makefile (revision 542670) @@ -1,86 +1,86 @@ # Created by: patrick, trevor # $FreeBSD$ PORTNAME= lilypond -DISTVERSION= 2.21.2 +DISTVERSION= 2.21.3 CATEGORIES= print audio MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/ PKGNAMESUFFIX= -devel MAINTAINER= m.ne@gmx.net COMMENT= GNU music typesetter LICENSE= GPLv3 BUILD_DEPENDS= bash:shells/bash \ convert:graphics/ImageMagick6 \ dblatex:textproc/dblatex \ fontforge:print/fontforge \ help2man:misc/help2man \ pdftexi2dvi:print/texinfo \ pngtopnm:graphics/netpbm \ rsync:net/rsync \ t1ascii:print/t1utils \ texi2html:textproc/texi2html \ zip:archivers/zip LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgmp.so:math/gmp \ libguile.so:lang/guile1 \ libltdl.so:devel/libltdl RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \ mftrace:print/mftrace USES= bison:build compiler:c++11-lib ghostscript gmake gnome \ perl5 pkgconfig python:3.5+ USE_CXXSTD= c++11 USE_GNOME= pango USE_PERL5= build USE_TEX= latex texmf GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre \ --without-urwotf-dir CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \ FLEX=${FLEX} \ HOME=${WRKDIR} \ YACC=${YACC} MAKEFILE= GNUmakefile ALL_TARGET= all BINARY_ALIAS= python=${PYTHON_VERSION} INFO= internals \ lilypond-changes \ lilypond-contributor \ lilypond-essay \ lilypond-extending \ lilypond-internals \ lilypond-learning \ lilypond-notation \ lilypond-snippets \ lilypond-usage \ lilypond-web \ music-glossary PLIST_SUB= DISTVERSION=${DISTVERSION} OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext post-patch: @${REINPLACE_CMD} -e 's||"/usr/include/FlexLexer.h"|' \ ${WRKSRC}/lily/include/includable-lexer.hh ${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|' \ ${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf post-patch-NLS-off: @${REINPLACE_CMD} -e '/po \\$$/d' ${WRKSRC}/${MAKEFILE}.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond (cd ${STAGEDIR}/${DATADIR} && ${LN} -fs ${DISTVERSION} current) .include Index: head/print/lilypond-devel/distinfo =================================================================== --- head/print/lilypond-devel/distinfo (revision 542669) +++ head/print/lilypond-devel/distinfo (revision 542670) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592814143 -SHA256 (lilypond-2.21.2.tar.gz) = af5dd5fce4f7d2850fb07104c1c837f398f336a27032e356306e6a987f86a3a3 -SIZE (lilypond-2.21.2.tar.gz) = 18103643 +TIMESTAMP = 1595125665 +SHA256 (lilypond-2.21.3.tar.gz) = 927975f3357c53369900425dcd88925022d32b597756226cee5fafb7ba798397 +SIZE (lilypond-2.21.3.tar.gz) = 17985310 Index: head/print/lilypond-devel/files/patch-Documentation_GNUmakefile =================================================================== --- head/print/lilypond-devel/files/patch-Documentation_GNUmakefile (revision 542669) +++ head/print/lilypond-devel/files/patch-Documentation_GNUmakefile (revision 542670) @@ -1,14 +1,14 @@ ---- Documentation/GNUmakefile.orig 2020-04-09 12:55:56 UTC +--- Documentation/GNUmakefile.orig 2020-07-13 14:02:44 UTC +++ Documentation/GNUmakefile -@@ -73,9 +73,9 @@ source-links = $(outdir)/source\ +@@ -70,9 +70,9 @@ source-links = $(outdir)/source\ MAIN_INFO_DOC = lilypond-web INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \ lilypond-essay lilypond-learning lilypond-notation music-glossary \ - lilypond-web lilypond-extending + lilypond-web lilypond-extending lilypond-snippets internals ifeq ($(out),www) -INFO_DOCS += lilypond-snippets +INFO_DOCS += endif INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info) Index: head/print/lilypond-devel/files/patch-config.make.in =================================================================== --- head/print/lilypond-devel/files/patch-config.make.in (revision 542669) +++ head/print/lilypond-devel/files/patch-config.make.in (revision 542670) @@ -1,11 +1,11 @@ ---- config.make.in.orig 2020-04-09 12:55:56 UTC +--- config.make.in.orig 2020-07-13 14:02:44 UTC +++ config.make.in -@@ -96,7 +96,7 @@ mandir = @mandir@ +@@ -98,7 +98,7 @@ mandir = @mandir@ package = lilypond package_datadir = $(datadir)/$(package) package_docdir = $(docdir)/$(package) -package_infodir = $(infodir)/$(package) +package_infodir = $(infodir) package_libdir = $(libdir)/$(package) prefix = @prefix@ program_prefix = @program_prefix@ Index: head/print/lilypond-devel/files/patch-configure =================================================================== --- head/print/lilypond-devel/files/patch-configure (revision 542669) +++ head/print/lilypond-devel/files/patch-configure (revision 542670) @@ -1,99 +1,77 @@ ---- configure.orig 2020-04-26 09:45:49 UTC +--- configure.orig 2020-07-13 14:02:44 UTC +++ configure -@@ -9087,71 +9087,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" +@@ -9035,71 +9035,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" if test $? -eq 0; then if test -n "0.9.0" -o -n ""; then - r="`eval echo '$'"PKG_CONFIG"`" - { $as_echo "$as_me:${as_lineno-$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}' -` - 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 + $PKG_CONFIG --atleast-pkgconfig-version 0.9.0 - #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-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \ - | head -n 1 \ - | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" - fi - echo "$_ver" - #dnl -` - num=` - echo "$ver" | awk -F. ' - { - if ($3) {three = $3} - else {three = 0} - } - {printf "%.0f\n", $1*1000000 + $2*1000 + three}' -` - min=` - 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:${as_lineno-$LINENO}: result: $ver" >&5 -$as_echo "$ver" >&6; } - if test "$num" -lt "$min"; then - + if test ! $?; then + ver=`$PKG_CONFIG --version` eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\" fi -@@ -11579,21 +11518,7 @@ $as_echo "$ver" >&6; } - eval "$TEXI2HTML_REQUIRED"=\"`eval echo \"'$'$TEXI2HTML_REQUIRED\" \""$r >= 1.82 (installed: $ver)"\"`\" - - fi -- if test -n "1.82"; then -- max=` -- echo "1.82" | awk -F. ' -- { -- if ($3) {three = $3} -- else {three = 0} -- } -- {printf "%.0f\n", $1*1000000 + $2*1000 + three}' --` -- if test "$num" -gt "$max"; then - -- eval "$TEXI2HTML_REQUIRED"=\"`eval echo \"'$'$TEXI2HTML_REQUIRED\" \""$r <= 1.82 (installed: $ver)"\"`\" -- -- fi -- fi - vervar="`echo TEXI2HTML | tr 'a-z' 'A-Z'`_VERSION" - eval `echo $vervar=$num` - ## AC_SUBST(`eval echo $vervar`)