View | Details | Raw Unified | Return to bug 240407 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 lines)
Lines 13-20 Link Here
13
13
14
LICENSE=	GPLv3
14
LICENSE=	GPLv3
15
15
16
BROKEN=		fails to configure
17
18
BUILD_DEPENDS=	pdftexi2dvi:print/texinfo \
16
BUILD_DEPENDS=	pdftexi2dvi:print/texinfo \
19
		t1ascii:print/t1utils \
17
		t1ascii:print/t1utils \
20
		bash:shells/bash \
18
		bash:shells/bash \
(-)files/patch-configure (-5 / +20 lines)
Lines 1-7 Link Here
1
--- configure.orig	2017-10-15 16:42:11 UTC
1
--- configure.orig	2019-03-20 13:52:23 UTC
2
+++ configure
2
+++ configure
3
@@ -11527,75 +11527,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
3
@@ -10512,13 +10512,8 @@ $as_echo_n "checking $r version... " >&6; }
4
     ## for compatibility reasons.
4
 
5
 
6
     ## grab the first version number in  --version output.
7
-    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 |
8
-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
9
-		head -n 1 |
10
-		tr ' ' '\n' |
11
-		sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' |
12
-		grep -E '(^| )[0-9][0-9]*\.[0-9]' |
13
-		head -n 1\`\"
14
+    eval _ver=\"\`("$exe" --version || "$exe" -V) 2>/dev/null |
15
+		awk '$1 ~ "fontforge" { print $2 }'\`\"
16
 
17
     if test -z "$_ver"; then
18
         ## If empty, try date [fontforge]
19
@@ -11595,75 +11590,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
20
 
5
     if test $? -eq 0 -a -n "0.9.0"; then
21
     if test $? -eq 0 -a -n "0.9.0"; then
6
 
22
 
7
-    r="`eval echo '$'"PKG_CONFIG"`"
23
-    r="`eval echo '$'"PKG_CONFIG"`"
Lines 26-32 Link Here
26
-    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
42
-    ##     gcc (GCC) 3.1.1 20020606 (Debian prerelease)
27
-    ##
43
-    ##
28
-    ## -V: Workaround for python
44
-    ## -V: Workaround for python
29
-
45
+    $PKG_CONFIG --atleast-pkgconfig-version 0.9.0
46
 
30
-    #dnl
47
-    #dnl
31
-
48
-
32
-    ## Assume and hunt for dotted version multiplet.
49
-    ## Assume and hunt for dotted version multiplet.
Lines 73-80 Link Here
73
-$as_echo "$ver" >&6; }
90
-$as_echo "$ver" >&6; }
74
-    if test "$num" -lt "$req"; then
91
-    if test "$num" -lt "$req"; then
75
-
92
-
76
+    $PKG_CONFIG --atleast-pkgconfig-version 0.9.0
77
+    
78
+    if test ! $?; then
93
+    if test ! $?; then
79
+    ver=`$PKG_CONFIG --version`
94
+    ver=`$PKG_CONFIG --version`
80
     eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
95
     eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"

Return to bug 240407