Fix unportable test(1) construct and use appropriate awk.

4 files changed, 42 insertions, 3 deletions

diff --git a/devel/sofia-sip/Makefile b/devel/sofia-sip/Makefile
index bc143644cb3..7467095e69d 100644
--- a/devel/sofia-sip/Makefile
+++ b/devel/sofia-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/12/17 01:09:17 khorben Exp $
+# $NetBSD: Makefile,v 1.2 2012/12/22 02:10:42 wiz Exp $
 #
 
 DISTNAME=	sofia-sip-1.12.11
@@ -11,12 +11,19 @@ COMMENT=	Open-source SIP User-Agent library
 
 LICENSE=	gnu-lgpl-v2.1
 
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	awk:run pkg-config
 
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c
 
+SUBST_CLASSES+=	awk
+SUBST_FILES.awk+=	libsofia-sip-ua/msg/msg_parser.awk
+SUBST_FILES.awk+=	libsofia-sip-ua/su/tag_dll.awk
+SUBST_STAGE.awk=	pre-configure
+SUBST_SED.awk=		-e "s,/usr/bin/env *awk,${AWK},"
+SUBST_MESSAGE.awk=	Fixing path to awk.
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/sofia-sip/distinfo b/devel/sofia-sip/distinfo
index 0c601463a21..5352ae14621 100644
--- a/devel/sofia-sip/distinfo
+++ b/devel/sofia-sip/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1 2012/12/17 01:09:17 khorben Exp $
+$NetBSD: distinfo,v 1.2 2012/12/22 02:10:42 wiz Exp $
 
 SHA1 (sofia-sip-1.12.11.tar.gz) = fe11c98fae19cbdbd7e55876c5553c1f9a0c561d
 RMD160 (sofia-sip-1.12.11.tar.gz) = 0d398a03b8ca227c84d0909bb6f3d4fa1011cb08
 Size (sofia-sip-1.12.11.tar.gz) = 2927808 bytes
+SHA1 (patch-scripts_lcov-report) = 0a2e5037e1431ea855e1f042fd57b0f07f51300b
+SHA1 (patch-scripts_uncovered) = 849617364284eca3dec21ef39a8dfc5df822f607
diff --git a/devel/sofia-sip/patches/patch-scripts_lcov-report b/devel/sofia-sip/patches/patch-scripts_lcov-report
new file mode 100644
index 00000000000..0d6b931b448
--- /dev/null
+++ b/devel/sofia-sip/patches/patch-scripts_lcov-report
@@ -0,0 +1,15 @@
+$NetBSD: patch-scripts_lcov-report,v 1.1 2012/12/22 02:10:42 wiz Exp $
+
+Fix unportable test(1) construct.
+
+--- scripts/lcov-report.orig	2011-03-11 14:49:19.000000000 +0000
++++ scripts/lcov-report
+@@ -11,7 +11,7 @@
+ 
+ usage()
+ {
+-  test X$1 == X0 || exec >&2
++  test X$1 = X0 || exec >&2
+   cat << EOF
+ usage: coverage-report OPTIONS
+ where OPTIONS are
diff --git a/devel/sofia-sip/patches/patch-scripts_uncovered b/devel/sofia-sip/patches/patch-scripts_uncovered
new file mode 100644
index 00000000000..8e60d8e79fa
--- /dev/null
+++ b/devel/sofia-sip/patches/patch-scripts_uncovered
@@ -0,0 +1,15 @@
+$NetBSD: patch-scripts_uncovered,v 1.1 2012/12/22 02:10:42 wiz Exp $
+
+Fix unportable test(1) construct.
+
+--- scripts/uncovered.orig	2011-03-11 14:49:19.000000000 +0000
++++ scripts/uncovered
+@@ -11,7 +11,7 @@
+ 
+ usage()
+ {
+-  test X$1 == X0 || exec >&2
++  test X$1 = X0 || exec >&2
+   cat <<EOF
+ usage: uncovered OPTIONS
+ where OPTIONS are