With the latest curl, the output of curl-config --vernum contains

hex digits, so patching the makefile to compare it as decimal will
not work. Just patch out the test entirely, as pkgsrc guarantees
curl will always be present and the packaging is not equipped to
deal with this check failing anyhow.
This commit is contained in:
dholland 2012-06-09 08:29:41 +00:00
parent 3bc2a96202
commit 165d4a8120
2 changed files with 4 additions and 4 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.47 2012/05/04 16:06:13 joerg Exp $
$NetBSD: distinfo,v 1.48 2012/06/09 08:29:41 dholland Exp $
SHA1 (asterisk-1.2.37.tar.gz) = c9a3c4684e021f62b4d19f6e0c8fc11f64db19d6
RMD160 (asterisk-1.2.37.tar.gz) = 1de7ff96d3b1fd8d89f3ef7b3bb9e35bedccfb33
@ -7,7 +7,7 @@ SHA1 (patch-aa) = 47b6c420e05605aea8917ae43bf6f2268015deaf
SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127
SHA1 (patch-ad) = 93a40eebdd2049cce2a976e54fcc3ea6a0548ebb
SHA1 (patch-ae) = a3b9dbf8017286dcc9327d65fb9c47c7b7ac5b79
SHA1 (patch-ae) = 9504a14eb246df8cff28d935fb8bee294e1ade74
SHA1 (patch-af) = 393bfbe218e843039fc9f4bc59a42ba1b9e896bd
SHA1 (patch-ag) = 7adec0d05371f6ffa56e067770c04c8acec2d922
SHA1 (patch-ai) = 81c0ff8f8a273562a64ab7cfb301d578e18808e3

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ae,v 1.4 2009/01/26 13:15:49 jnemeth Exp $
$NetBSD: patch-ae,v 1.5 2012/06/09 08:29:41 dholland Exp $
--- apps/Makefile.orig 2006-04-30 06:38:22.000000000 -0700
+++ apps/Makefile
@ -26,7 +26,7 @@ $NetBSD: patch-ae,v 1.4 2009/01/26 13:15:49 jnemeth Exp $
-CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
-ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
+CURLLIBS=$(shell $(PREFIX)/bin/curl-config --libs)
+ifneq ($(shell if [ `$(PREFIX)/bin/curl-config --vernum` -ge 70907 ]; then echo "OK" ; fi),)
+ifneq (OK,)
ifneq (${CURLLIBS},)
APPS+=app_curl.so
endif