Tue Dec 8 11:02:25 2015 UTC ()
Use $as_echo to ensure \1 etc sequences are supported.


(jperkin)
diff -r1.10 -r1.11 pkgsrc/devel/cppunit/distinfo
diff -r0 -r1.1 pkgsrc/devel/cppunit/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/devel/cppunit/patches/patch-doc_Makefile.in
cvs diff -r1.10 -r1.11 pkgsrc/devel/cppunit/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cppunit/distinfo 2015/11/03 03:27:20 1.10
+++ pkgsrc/devel/cppunit/distinfo 2015/12/08 11:02:25 1.11
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.10 2015/11/03 03:27:20 agc Exp $ 1$NetBSD: distinfo,v 1.11 2015/12/08 11:02:25 jperkin Exp $
2 2
3SHA1 (cppunit-1.13.2.tar.gz) = 0eaf8bb1dcf4d16b12bec30d0732370390d35e6f 3SHA1 (cppunit-1.13.2.tar.gz) = 0eaf8bb1dcf4d16b12bec30d0732370390d35e6f
4RMD160 (cppunit-1.13.2.tar.gz) = 2a86e06409b53b3477842354b21dd17fc4943b09 4RMD160 (cppunit-1.13.2.tar.gz) = 2a86e06409b53b3477842354b21dd17fc4943b09
5SHA512 (cppunit-1.13.2.tar.gz) = 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd 5SHA512 (cppunit-1.13.2.tar.gz) = 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd
6Size (cppunit-1.13.2.tar.gz) = 953596 bytes 6Size (cppunit-1.13.2.tar.gz) = 953596 bytes
7SHA1 (patch-doc_Makefile.in) = 577ddd32700a069b5d5127d957d9dccca88ae846 7SHA1 (patch-configure) = 467518999a6bbf1f18ce8b11edd9922f5ccbd09f
 8SHA1 (patch-doc_Makefile.in) = 2cbff40694ef13088f7deafcbc0d91078d4e4c88
File Added: pkgsrc/devel/cppunit/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.1 2015/12/08 11:02:25 jperkin Exp $

Use $as_echo to ensure \1 etc are supported.

--- configure.orig	2013-11-11 04:41:53.000000000 +0000
+++ configure
@@ -19087,23 +19087,23 @@ $as_echo X/* automatically generated */
 	    q
 	  }
 	  s/.*/./; q'
-    echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT
-    echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT
-    echo ' ' >>$ac_prefix_conf_OUT
-    echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$ac_prefix_conf_OUT
+    $as_echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT
+    $as_echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT
+    $as_echo ' ' >>$ac_prefix_conf_OUT
+    $as_echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$ac_prefix_conf_OUT
 
-    echo 's/#undef  *\([A-Z_]\)/#undef '$ac_prefix_conf_UPP'_\1/' >conftest.sed
-    echo 's/#undef  *\([a-z]\)/#undef '$ac_prefix_conf_LOW'_\1/' >>conftest.sed
-    echo 's/#define  *\([A-Z_][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_UPP"_\\1 \\" >>conftest.sed
-    echo '#define '$ac_prefix_conf_UPP"_\\1 \\2 \\" >>conftest.sed
-    echo '#endif/' >>conftest.sed
-    echo 's/#define  *\([a-z][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_LOW"_\\1 \\" >>conftest.sed
-    echo '#define '$ac_prefix_conf_LOW"_\\1 \\2 \\" >>conftest.sed
-    echo '#endif/' >>conftest.sed
+    $as_echo 's/#undef  *\([A-Z_]\)/#undef '$ac_prefix_conf_UPP'_\1/' >conftest.sed
+    $as_echo 's/#undef  *\([a-z]\)/#undef '$ac_prefix_conf_LOW'_\1/' >>conftest.sed
+    $as_echo 's/#define  *\([A-Z_][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_UPP"_\\1 \\" >>conftest.sed
+    $as_echo '#define '$ac_prefix_conf_UPP"_\\1 \\2 \\" >>conftest.sed
+    $as_echo '#endif/' >>conftest.sed
+    $as_echo 's/#define  *\([a-z][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_LOW"_\\1 \\" >>conftest.sed
+    $as_echo '#define '$ac_prefix_conf_LOW"_\\1 \\2 \\" >>conftest.sed
+    $as_echo '#endif/' >>conftest.sed
     sed -f conftest.sed $ac_prefix_conf_INP >>$ac_prefix_conf_OUT
-    echo ' ' >>$ac_prefix_conf_OUT
-    echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT
-    echo '#endif' >>$ac_prefix_conf_OUT
+    $as_echo ' ' >>$ac_prefix_conf_OUT
+    $as_echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT
+    $as_echo '#endif' >>$ac_prefix_conf_OUT
   else
     as_fn_error $? "input file $ac_prefix_conf_IN does not exist,     skip generating $ac_prefix_conf_OUT" "$LINENO" 5
   fi
cvs diff -r1.1 -r1.2 pkgsrc/devel/cppunit/patches/patch-doc_Makefile.in (expand / switch to unified diff)

--- pkgsrc/devel/cppunit/patches/patch-doc_Makefile.in 2013/08/15 10:26:32 1.1
+++ pkgsrc/devel/cppunit/patches/patch-doc_Makefile.in 2015/12/08 11:02:25 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-doc_Makefile.in,v 1.1 2013/08/15 10:26:32 gsutre Exp $ 1$NetBSD: patch-doc_Makefile.in,v 1.2 2015/12/08 11:02:25 jperkin Exp $
2 2
3Install docs in $docdir. 3Install docs in $docdir.
4 4
5--- doc/Makefile.in.orig 2012-09-24 17:52:23.000000000 +0000 5--- doc/Makefile.in.orig 2013-11-11 04:41:52.000000000 +0000
6+++ doc/Makefile.in 6+++ doc/Makefile.in
7@@ -50,7 +50,7 @@ PRE_UNINSTALL = : 7@@ -50,7 +50,7 @@ PRE_UNINSTALL = :
8 POST_UNINSTALL = : 8 POST_UNINSTALL = :
9 build_triplet = @build@ 9 build_triplet = @build@
10 host_triplet = @host@ 10 host_triplet = @host@
11-@DOC_TRUE@am__append_1 = $(pkgdatadir)/html 11-@DOC_TRUE@am__append_1 = $(pkgdatadir)/html
12+@DOC_TRUE@am__append_1 = $(docdir)/html 12+@DOC_TRUE@am__append_1 = $(docdir)/html
13 @DOC_TRUE@am__append_2 = $(static_pages) html/index.html 13 @DOC_TRUE@am__append_2 = $(static_pages) html/index.html
14 subdir = doc 14 subdir = doc
15 DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ 15 DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \