diff options
author | jperkin <jperkin@pkgsrc.org> | 2015-12-08 11:02:25 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2015-12-08 11:02:25 +0000 |
commit | 3e66c0e54bea5d9b7bac73c197a559c91f718ce0 (patch) | |
tree | 38ee64f0a7e2097a100b1e881d4b7aea38d5eff4 /devel/cppunit | |
parent | b8f373abdd5d6b6a2eae38aca3ddaca5b27b9504 (diff) | |
download | pkgsrc-3e66c0e54bea5d9b7bac73c197a559c91f718ce0.tar.gz |
Use $as_echo to ensure \1 etc sequences are supported.
Diffstat (limited to 'devel/cppunit')
-rw-r--r-- | devel/cppunit/distinfo | 5 | ||||
-rw-r--r-- | devel/cppunit/patches/patch-configure | 45 | ||||
-rw-r--r-- | devel/cppunit/patches/patch-doc_Makefile.in | 4 |
3 files changed, 50 insertions, 4 deletions
diff --git a/devel/cppunit/distinfo b/devel/cppunit/distinfo index 827906410cd..bd520d57b35 100644 --- a/devel/cppunit/distinfo +++ b/devel/cppunit/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 03:27:20 agc Exp $ +$NetBSD: distinfo,v 1.11 2015/12/08 11:02:25 jperkin Exp $ SHA1 (cppunit-1.13.2.tar.gz) = 0eaf8bb1dcf4d16b12bec30d0732370390d35e6f RMD160 (cppunit-1.13.2.tar.gz) = 2a86e06409b53b3477842354b21dd17fc4943b09 SHA512 (cppunit-1.13.2.tar.gz) = 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd Size (cppunit-1.13.2.tar.gz) = 953596 bytes -SHA1 (patch-doc_Makefile.in) = 577ddd32700a069b5d5127d957d9dccca88ae846 +SHA1 (patch-configure) = 467518999a6bbf1f18ce8b11edd9922f5ccbd09f +SHA1 (patch-doc_Makefile.in) = 2cbff40694ef13088f7deafcbc0d91078d4e4c88 diff --git a/devel/cppunit/patches/patch-configure b/devel/cppunit/patches/patch-configure new file mode 100644 index 00000000000..a75344461c6 --- /dev/null +++ b/devel/cppunit/patches/patch-configure @@ -0,0 +1,45 @@ +$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 diff --git a/devel/cppunit/patches/patch-doc_Makefile.in b/devel/cppunit/patches/patch-doc_Makefile.in index 46cee387092..1071a4c61ff 100644 --- a/devel/cppunit/patches/patch-doc_Makefile.in +++ b/devel/cppunit/patches/patch-doc_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-doc_Makefile.in,v 1.1 2013/08/15 10:26:32 gsutre Exp $ +$NetBSD: patch-doc_Makefile.in,v 1.2 2015/12/08 11:02:25 jperkin Exp $ Install docs in $docdir. ---- doc/Makefile.in.orig 2012-09-24 17:52:23.000000000 +0000 +--- doc/Makefile.in.orig 2013-11-11 04:41:52.000000000 +0000 +++ doc/Makefile.in @@ -50,7 +50,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : |