Tue Dec 8 11:13:04 2015 UTC ()
Use $as_echo to support escape sequences correctly.  Cleanup some patch
headers while here.


(jperkin)
diff -r1.11 -r1.12 pkgsrc/archivers/zziplib/distinfo
diff -r1.4 -r1.5 pkgsrc/archivers/zziplib/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/archivers/zziplib/patches/patch-ba
diff -r1.2 -r1.3 pkgsrc/archivers/zziplib/patches/patch-bc
cvs diff -r1.11 -r1.12 pkgsrc/archivers/zziplib/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/zziplib/distinfo 2015/11/03 00:56:27 1.11
+++ pkgsrc/archivers/zziplib/distinfo 2015/12/08 11:13:04 1.12
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.11 2015/11/03 00:56:27 agc Exp $ 1$NetBSD: distinfo,v 1.12 2015/12/08 11:13:04 jperkin Exp $
2 2
3SHA1 (zziplib-0.13.59.tar.bz2) = ddbce25cb36c3b4c2b892e2c8a88fa4a0be29a71 3SHA1 (zziplib-0.13.59.tar.bz2) = ddbce25cb36c3b4c2b892e2c8a88fa4a0be29a71
4RMD160 (zziplib-0.13.59.tar.bz2) = b96f547039ac005f6e9ca2cf92c388a077b9b21e 4RMD160 (zziplib-0.13.59.tar.bz2) = b96f547039ac005f6e9ca2cf92c388a077b9b21e
5SHA512 (zziplib-0.13.59.tar.bz2) = e417867abd2a35a896c0e04d06a841db3569923fea1fbbb5de615d3357d708cdf5b085c4391b14a0943d8c574100b50c3d0de1f827090ee442fb5bf4010e3c53 5SHA512 (zziplib-0.13.59.tar.bz2) = e417867abd2a35a896c0e04d06a841db3569923fea1fbbb5de615d3357d708cdf5b085c4391b14a0943d8c574100b50c3d0de1f827090ee442fb5bf4010e3c53
6Size (zziplib-0.13.59.tar.bz2) = 691000 bytes 6Size (zziplib-0.13.59.tar.bz2) = 691000 bytes
7SHA1 (patch-aa) = d834435ea63a9a263fb6848be30053f00b0302da 7SHA1 (patch-aa) = e5687abbc3bbffa2b461f6e835baa18090e2c3a8
8SHA1 (patch-ba) = 086cbf68accef14f878f1e63e1f20db63749a4c8 8SHA1 (patch-ba) = 1f680820112114534318ad46603992b16e183866
9SHA1 (patch-bb) = afdcf01c5aea03f7bfd61492acbe4f3743d50b0a 9SHA1 (patch-bb) = afdcf01c5aea03f7bfd61492acbe4f3743d50b0a
10SHA1 (patch-bc) = d5300d81155c11358625ff320cb6055dcc8ed860 10SHA1 (patch-bc) = 897a79994d90124972afdb9fa803e82520e6ae0e
cvs diff -r1.4 -r1.5 pkgsrc/archivers/zziplib/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/archivers/zziplib/patches/Attic/patch-aa 2010/05/15 06:37:03 1.4
+++ pkgsrc/archivers/zziplib/patches/Attic/patch-aa 2015/12/08 11:13:04 1.5
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-aa,v 1.4 2010/05/15 06:37:03 adam Exp $ 1$NetBSD: patch-aa,v 1.5 2015/12/08 11:13:04 jperkin Exp $
2 2
3--- zzip/Makefile.in.orig 2010-05-15 06:16:27.000000000 +0000 3--- zzip/Makefile.in.orig 2010-03-29 19:40:50.000000000 +0000
4+++ zzip/Makefile.in 4+++ zzip/Makefile.in
5@@ -775,6 +775,7 @@ install-data-hook : install-zzipHEADERS 5@@ -775,6 +775,7 @@ install-data-hook : install-zzipHEADERS
6 $(DESTDIR)$(includedir)/zzip.h >$(DESTDIR)$(includedir)/zzip-io.h 6 $(DESTDIR)$(includedir)/zzip.h >$(DESTDIR)$(includedir)/zzip-io.h
7  7
8 install-exec-hook: 8 install-exec-hook:
9+xxx: 9+xxx:
10 @ for i in . $(DESTDIR)$(libdir)/libzzip*.so.13 \ 10 @ for i in . $(DESTDIR)$(libdir)/libzzip*.so.13 \
11 ; do test -d $$i && continue ; lib=`basename "$$i" .so.13` \ 11 ; do test -d $$i && continue ; lib=`basename "$$i" .so.13` \
12 ; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.10" \ 12 ; echo "$(DESTDIR)$(libdir): ln -s $$lib.so.13 $$lib.so.10" \
cvs diff -r1.3 -r1.4 pkgsrc/archivers/zziplib/patches/Attic/patch-ba (expand / switch to unified diff)

--- pkgsrc/archivers/zziplib/patches/Attic/patch-ba 2010/05/15 06:37:03 1.3
+++ pkgsrc/archivers/zziplib/patches/Attic/patch-ba 2015/12/08 11:13:04 1.4
@@ -1,13 +1,95 @@ @@ -1,13 +1,95 @@
1$NetBSD: patch-ba,v 1.3 2010/05/15 06:37:03 adam Exp $ 1$NetBSD: patch-ba,v 1.4 2015/12/08 11:13:04 jperkin Exp $
 2
 3Use $as_echo to support escape sequences correctly.
2 4
3--- configure.orig 2010-03-29 19:24:41.000000000 +0000 5--- configure.orig 2010-03-29 19:24:41.000000000 +0000
4+++ configure 6+++ configure
5@@ -16257,7 +16257,7 @@ fi 7@@ -16257,7 +16257,7 @@ fi
6 { $as_echo "$as_me:$LINENO: checking link options" >&5 8 { $as_echo "$as_me:$LINENO: checking link options" >&5
7 $as_echo_n "checking link options... " >&6; } 9 $as_echo_n "checking link options... " >&6; }
8 ZZIPLIB_LDFLAGS="" 10 ZZIPLIB_LDFLAGS=""
9-test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic" 11-test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="--export-dynamic"
10+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" 12+test ".$can_build_shared" != ".no" && ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
11 RESOLVES=" # " 13 RESOLVES=" # "
12 case "$host_os" in mingw*) 14 case "$host_os" in mingw*)
13 ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole" 15 ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
 16@@ -20218,24 +20220,24 @@ else
 17 { $as_echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
 18 $as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
 19 if test -f $ac_prefix_conf_INP ; then
 20- echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
 21- echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
 22- echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
 23- echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
 24- echo "#endif/" >>conftest.prefix
 25- echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
 26- echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
 27- echo "#endif/" >> conftest.prefix
 28+ $as_echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
 29+ $as_echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
 30+ $as_echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
 31+ $as_echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
 32+ $as_echo "#endif/" >>conftest.prefix
 33+ $as_echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
 34+ $as_echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
 35+ $as_echo "#endif/" >> conftest.prefix
 36 # now executing _script on _DEF input to create _OUT output file
 37- echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
 38- echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
 39- echo ' ' >>$tmp/pconfig.h
 40- echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
 41+ $as_echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
 42+ $as_echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
 43+ $as_echo ' ' >>$tmp/pconfig.h
 44+ $as_echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
 45
 46 sed -f conftest.prefix $ac_prefix_conf_INP >>$tmp/pconfig.h
 47- echo ' ' >>$tmp/pconfig.h
 48- echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
 49- echo "#endif" >>$tmp/pconfig.h
 50+ $as_echo ' ' >>$tmp/pconfig.h
 51+ $as_echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
 52+ $as_echo "#endif" >>$tmp/pconfig.h
 53 if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
 54 { $as_echo "$as_me:$LINENO: $ac_prefix_conf_OUT is unchanged" >&5
 55 $as_echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}
 56@@ -20352,24 +20354,24 @@ else
 57 { $as_echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
 58 $as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
 59 if test -f $ac_prefix_conf_INP ; then
 60- echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
 61- echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
 62- echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
 63- echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
 64- echo "#endif/" >>conftest.prefix
 65- echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
 66- echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
 67- echo "#endif/" >> conftest.prefix
 68+ $as_echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
 69+ $as_echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
 70+ $as_echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
 71+ $as_echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
 72+ $as_echo "#endif/" >>conftest.prefix
 73+ $as_echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
 74+ $as_echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
 75+ $as_echo "#endif/" >> conftest.prefix
 76 # now executing _script on _DEF input to create _OUT output file
 77- echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
 78- echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
 79- echo ' ' >>$tmp/pconfig.h
 80- echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
 81+ $as_echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
 82+ $as_echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
 83+ $as_echo ' ' >>$tmp/pconfig.h
 84+ $as_echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
 85
 86 sed -f conftest.prefix $ac_prefix_conf_INP >>$tmp/pconfig.h
 87- echo ' ' >>$tmp/pconfig.h
 88- echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
 89- echo "#endif" >>$tmp/pconfig.h
 90+ $as_echo ' ' >>$tmp/pconfig.h
 91+ $as_echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
 92+ $as_echo "#endif" >>$tmp/pconfig.h
 93 if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
 94 { $as_echo "$as_me:$LINENO: $ac_prefix_conf_OUT is unchanged" >&5
 95 $as_echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}
cvs diff -r1.2 -r1.3 pkgsrc/archivers/zziplib/patches/Attic/patch-bc (expand / switch to unified diff)

--- pkgsrc/archivers/zziplib/patches/Attic/patch-bc 2009/11/29 20:40:08 1.2
+++ pkgsrc/archivers/zziplib/patches/Attic/patch-bc 2015/12/08 11:13:04 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-bc,v 1.2 2009/11/29 20:40:08 sno Exp $ 1$NetBSD: patch-bc,v 1.3 2015/12/08 11:13:04 jperkin Exp $
2 2
3replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS} 3replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
4for xlc 4for xlc
5 5
6--- m4/libtool.m4.orig 2009-11-29 20:26:36.000000000 +0000 6--- m4/libtool.m4.orig 2009-08-23 11:38:19.000000000 +0000
7+++ m4/libtool.m4 2009-11-29 20:29:09.000000000 +0000 7+++ m4/libtool.m4
8@@ -5947,7 +5947,7 @@ 8@@ -5947,7 +5947,7 @@ if test "$_lt_caught_CXX_error" != yes;
9 xl*) 9 xl*)
10 # IBM XL 8.0 on PPC, with GNU ld 10 # IBM XL 8.0 on PPC, with GNU ld
11 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' 11 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
12- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' 12- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
13+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${EXPORT_SYMBOLS_LDFLAGS}' 13+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${EXPORT_SYMBOLS_LDFLAGS}'
14 _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 14 _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
15 if test "x$supports_anon_versioning" = xyes; then 15 if test "x$supports_anon_versioning" = xyes; then
16 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ 16 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~