Attachment #237088 for bug #266832

View | Details | Raw Unified | Return to bug 266832
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/print/lilypond-devel/Makefile (-2 / +1 lines)
1	PORTNAME= lilypond	1	PORTNAME= lilypond
2	DISTVERSION= 2.23.11	2	DISTVERSION= 2.23.13
3	PORTREVISION= 1
4	CATEGORIES= print audio	3	CATEGORIES= print audio
5	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/	4	MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/
6	PKGNAMESUFFIX= -devel	5	PKGNAMESUFFIX= -devel

Lines 1-3 Link Here

(-)b/print/lilypond-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1658915776	1	TIMESTAMP = 1664622707
2	SHA256 (lilypond-2.23.11.tar.gz) = e158dcb99bd19a93e6899e36cf293dc583e5b1237a904b014917b7d0ffab690f	2	SHA256 (lilypond-2.23.13.tar.gz) = 17a9d1ad0ec7d1b7501b742d6b65ef371c88007537a7b8cbc9d54573270ddf0a
3	SIZE (lilypond-2.23.11.tar.gz) = 19271435	3	SIZE (lilypond-2.23.13.tar.gz) = 19352865




--- configure.orig	2022-05-20 13:40:50 UTC
+++ configure
@@ -8770,71 +8770,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"`"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
-printf %s "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}'
-`
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
-printf "%s\n" "$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




%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-name.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/clip-region.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/color.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/curried-definitions.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-context-properties.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-event-classes.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-grob-interfaces.scm

%%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-lib.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/file-cache.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/font-encodings.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm

%%DATADIR%%/%%DISTVERSION%%/scm/lily/part-combiner.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/predefined-fretboards.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/ps-to-png.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-lily.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-utility-defs.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm

%%DATADIR%%/%%DISTVERSION%%/scm/lily/song.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/stencil.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/tablature.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/text-replacements.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature-settings.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature.scm
%%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm

Return to bug 266832

Removed Link Here

(-)a/print/lilypond-devel/files/patch-configure (-77 lines)
1	--- configure.orig 2022-05-20 13:40:50 UTC
2	+++ configure
3	@@ -8770,71 +8770,10 @@ test -n "$PKG_CONFIG" \|\| PKG_CONFIG="no"
4	if test $? -eq 0; then
5	if test -n "0.9.0" -o -n ""; then
6
7	- r="`eval echo '$'"PKG_CONFIG"`"
8	- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
9	-printf %s "checking $r version... " >&6; }
10	- exe=`
11	- ## which doesn't work in ash, if /usr/bin/which isn't installed
12	- ## type -p doesn't work in ash
13	- ## command -v doesn't work in zsh
14	- ## command -v "$r" 2>&1
15	- ## this test should work in ash, bash, pdksh (ksh), zsh
16	- type -p $r 2>/dev/null \| tail -n 1 \| awk '{print $NF}'
17	-`
18	- ver=`
19	- ## "$exe" --version 2>&1 \| grep -v '^$' \| head -n 1 \| awk '{print $NF}'
20	- ##
21	- ## ARG.
22	- ## Workaround for broken Debian gcc version string:
23	- ## gcc (GCC) 3.1.1 20020606 (Debian prerelease)
24	- ##
25	- ## -V: Workaround for python
26	+ $PKG_CONFIG --atleast-pkgconfig-version 0.9.0
27
28	- #dnl
29	-
30	- ## Assume and hunt for dotted version multiplet.
31	- ## use eval trickery, because we cannot use multi-level $() instead of ``
32	- ## for compatibility reasons.
33	-
34	- ## grab the first version number in --version output.
35	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \|
36	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
37	- head -n 1 \|
38	- tr ' ' '\n' \|
39	- sed 's/\([0-9][0-9]\.[0-9][0-9.]\).*/\1/g' \|
40	- grep -E '(^\| )[0-9][0-9]*\.[0-9]' \|
41	- head -n 1\`\"
42	-
43	- if test -z "$_ver"; then
44	- ## If empty, try date [fontforge]
45	- eval _ver=\"\`("$exe" --version \|\| "$exe" -V) 2>&1 \
46	- \| grep '\(^\\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\\|$\)' \
47	- \| head -n 1 \
48	- \| sed -e 's/^[^.0-9]//' -e 's/[^.0-9]$//'\`\"
49	- fi
50	- echo "$_ver"
51	- #dnl
52	-`
53	- num=`
54	- echo "$ver" \| awk -F. '
55	- {
56	- if ($3) {three = $3}
57	- else {three = 0}
58	- }
59	- {printf "%.0f\n", $11000000 + $21000 + three}'
60	-`
61	- min=`
62	- echo "0.9.0" \| awk -F. '
63	- {
64	- if ($3) {three = $3}
65	- else {three = 0}
66	- }
67	- {printf "%.0f\n", $11000000 + $21000 + three}'
68	-`
69	- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
70	-printf "%s\n" "$ver" >&6; }
71	- if test "$num" -lt "$min"; then
72	-
73	+ if test ! $?; then
74	+ ver=`$PKG_CONFIG --version`
75	eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
76
77	fi

Lines 262-267 share/emacs/site-lisp/lilypond-words.el Link Here

(-)b/print/lilypond-devel/pkg-plist (-2 / +3 lines)
262	%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-name.scm	262	%%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-name.scm
263	%%DATADIR%%/%%DISTVERSION%%/scm/lily/clip-region.scm	263	%%DATADIR%%/%%DISTVERSION%%/scm/lily/clip-region.scm
264	%%DATADIR%%/%%DISTVERSION%%/scm/lily/color.scm	264	%%DATADIR%%/%%DISTVERSION%%/scm/lily/color.scm
		265	%%DATADIR%%/%%DISTVERSION%%/scm/lily/curried-definitions.scm
265	%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-context-properties.scm	266	%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-context-properties.scm
266	%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-event-classes.scm	267	%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-event-classes.scm
267	%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-grob-interfaces.scm	268	%%DATADIR%%/%%DISTVERSION%%/scm/lily/define-grob-interfaces.scm
Lines 291-296 share/emacs/site-lisp/lilypond-words.el Link Here
291	%%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-lib.scm	292	%%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-lib.scm
292	%%DATADIR%%/%%DISTVERSION%%/scm/lily/file-cache.scm	293	%%DATADIR%%/%%DISTVERSION%%/scm/lily/file-cache.scm
293	%%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm	294	%%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm
		295	%%DATADIR%%/%%DISTVERSION%%/scm/lily/font-encodings.scm
294	%%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm	296	%%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm
295	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm	297	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm
296	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm	298	%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm
Lines 322-329 share/emacs/site-lisp/lilypond-words.el Link Here
322	%%DATADIR%%/%%DISTVERSION%%/scm/lily/part-combiner.scm	324	%%DATADIR%%/%%DISTVERSION%%/scm/lily/part-combiner.scm
323	%%DATADIR%%/%%DISTVERSION%%/scm/lily/predefined-fretboards.scm	325	%%DATADIR%%/%%DISTVERSION%%/scm/lily/predefined-fretboards.scm
324	%%DATADIR%%/%%DISTVERSION%%/scm/lily/ps-to-png.scm	326	%%DATADIR%%/%%DISTVERSION%%/scm/lily/ps-to-png.scm
325	%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-lily.scm
326	%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-utility-defs.scm
327	%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm	327	%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm
328	%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm	328	%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm
329	%%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm	329	%%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm
Lines 332-337 share/emacs/site-lisp/lilypond-words.el Link Here
332	%%DATADIR%%/%%DISTVERSION%%/scm/lily/song.scm	332	%%DATADIR%%/%%DISTVERSION%%/scm/lily/song.scm
333	%%DATADIR%%/%%DISTVERSION%%/scm/lily/stencil.scm	333	%%DATADIR%%/%%DISTVERSION%%/scm/lily/stencil.scm
334	%%DATADIR%%/%%DISTVERSION%%/scm/lily/tablature.scm	334	%%DATADIR%%/%%DISTVERSION%%/scm/lily/tablature.scm
		335	%%DATADIR%%/%%DISTVERSION%%/scm/lily/text-replacements.scm
335	%%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature-settings.scm	336	%%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature-settings.scm
336	%%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature.scm	337	%%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature.scm
337	%%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm	338	%%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm