diff --git a/srcpkgs/lilypond/INSTALL.msg b/srcpkgs/lilypond/INSTALL.msg deleted file mode 100644 index fa7f45ba1ce..00000000000 --- a/srcpkgs/lilypond/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -To use lilypond a working texlive installation is also needed. diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template index 1d2ded8aabb..ba073098e02 100644 --- a/srcpkgs/lilypond/template +++ b/srcpkgs/lilypond/template @@ -1,23 +1,22 @@ # Template file for 'lilypond' pkgname=lilypond -version=2.21.5 +version=2.21.7 revision=1 build_wrksrc="build" build_style="gnu-configure" configure_script="../configure" configure_args="--disable-documentation ac_cv_func_isinf=yes - --with-texgyre-dir=/opt/texlive/2020/texmf-dist/fonts/opentype/public/tex-gyre" + --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre" hostmakedepends="autogen automake flex fontforge gettext gnupg guile1.8 pkg-config - tar texinfo texlive-bin" + t1utils tar texinfo texlive" makedepends="gc-devel guile1.8-devel libltdl-devel pango-devel python-devel" depends="python ghostscript" short_desc="Music engraving program" maintainer="newbluemoon " license="GPL-3.0-or-later, GFDL-1.3-or-later" -homepage="http://lilypond.org/" -distfiles="http://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz" -checksum=09d05285fd334113b91b14a9d8d19fc0e086bec5868b69c73a61f9ea218a96cb -patch_args="-Np1" +homepage="https://lilypond.org/" +distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz" +checksum=058a18558944305aa7b8bca1a1098dce33a177cf108ed7eafeecdc0e7dd754ff python_version=2 if [ -n "${CROSS_BUILD}" ]; then @@ -28,11 +27,6 @@ if [ -n "${CROSS_BUILD}" ]; then --with-python-include=${XBPS_CROSS_BASE}/usr/include/python2.7" fi -case "$XBPS_TARGET_MACHINE" in - x86_64-musl) ;; - *-musl) broken="TeX Live not available, yet." ;; -esac - post_extract() { if [ ! -d $wrksrc/$build_wrksrc ]; then mkdir $wrksrc/$build_wrksrc @@ -40,16 +34,9 @@ post_extract() { } pre_configure() { - source /etc/profile.d/texlive.sh - tlmgr install t1utils lh epsf tex-gyre cd .. && ./autogen.sh --noconfigure } -do_build() { - source /etc/profile.d/texlive.sh - make ${makejobs} ${make_build_args} ${make_build_target} -} - post_install() { vmkdir usr/share/vim mv $DESTDIR/usr/share/lilypond/${version}/vim $DESTDIR/usr/share/vim/vim82