kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use $as_echo to support escape sequences correctly. Cleanup some patch

Browse source 
headers while here.
This commit is contained in:
jperkin 2015-12-08 11:13:04 +00:00
parent 275c65c883
commit 6c504bf60c
4 changed files with 93 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
archivers/zziplib/distinfo
View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.11 2015/11/03 00:56:27 agc Exp $
$NetBSD: distinfo,v 1.12 2015/12/08 11:13:04 jperkin Exp $
SHA1 (zziplib-0.13.59.tar.bz2) = ddbce25cb36c3b4c2b892e2c8a88fa4a0be29a71
RMD160 (zziplib-0.13.59.tar.bz2) = b96f547039ac005f6e9ca2cf92c388a077b9b21e
SHA512 (zziplib-0.13.59.tar.bz2) = e417867abd2a35a896c0e04d06a841db3569923fea1fbbb5de615d3357d708cdf5b085c4391b14a0943d8c574100b50c3d0de1f827090ee442fb5bf4010e3c53
Size (zziplib-0.13.59.tar.bz2) = 691000 bytes
SHA1 (patch-aa) = d834435ea63a9a263fb6848be30053f00b0302da
SHA1 (patch-ba) = 086cbf68accef14f878f1e63e1f20db63749a4c8
SHA1 (patch-aa) = e5687abbc3bbffa2b461f6e835baa18090e2c3a8
SHA1 (patch-ba) = 1f680820112114534318ad46603992b16e183866
SHA1 (patch-bb) = afdcf01c5aea03f7bfd61492acbe4f3743d50b0a
SHA1 (patch-bc) = d5300d81155c11358625ff320cb6055dcc8ed860
SHA1 (patch-bc) = 897a79994d90124972afdb9fa803e82520e6ae0e

4
archivers/zziplib/patches/patch-aa
View file

@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.4 2010/05/15 06:37:03 adam Exp $
$NetBSD: patch-aa,v 1.5 2015/12/08 11:13:04 jperkin Exp $
--- zzip/Makefile.in.orig 2010-05-15 06:16:27.000000000 +0000
--- zzip/Makefile.in.orig 2010-03-29 19:40:50.000000000 +0000
+++ zzip/Makefile.in
@@ -775,6 +775,7 @@ install-data-hook : install-zzipHEADERS
$(DESTDIR)$(includedir)/zzip.h >$(DESTDIR)$(includedir)/zzip-io.h

84
archivers/zziplib/patches/patch-ba
View file

@ -1,4 +1,6 @@
$NetBSD: patch-ba,v 1.3 2010/05/15 06:37:03 adam Exp $
$NetBSD: patch-ba,v 1.4 2015/12/08 11:13:04 jperkin Exp $
Use $as_echo to support escape sequences correctly.
--- configure.orig 2010-03-29 19:24:41.000000000 +0000
+++ configure
@ -11,3 +13,83 @@ $NetBSD: patch-ba,v 1.3 2010/05/15 06:37:03 adam Exp $
RESOLVES=" # "
case "$host_os" in mingw*)
ZZIPLIB_LDFLAGS="-no-undefined -export-all-symbols -mconsole"
@@ -20218,24 +20220,24 @@ else
{ $as_echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
$as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
if test -f $ac_prefix_conf_INP ; then
- echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
- echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
- echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
- echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
- echo "#endif/" >>conftest.prefix
- echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
- echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
- echo "#endif/" >> conftest.prefix
+ $as_echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
+ $as_echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
+ $as_echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
+ $as_echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
+ $as_echo "#endif/" >>conftest.prefix
+ $as_echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
+ $as_echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
+ $as_echo "#endif/" >> conftest.prefix
# now executing _script on _DEF input to create _OUT output file
- echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
- echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
- echo ' ' >>$tmp/pconfig.h
- echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
+ $as_echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
+ $as_echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
+ $as_echo ' ' >>$tmp/pconfig.h
+ $as_echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
sed -f conftest.prefix $ac_prefix_conf_INP >>$tmp/pconfig.h
- echo ' ' >>$tmp/pconfig.h
- echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
- echo "#endif" >>$tmp/pconfig.h
+ $as_echo ' ' >>$tmp/pconfig.h
+ $as_echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
+ $as_echo "#endif" >>$tmp/pconfig.h
if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
{ $as_echo "$as_me:$LINENO: $ac_prefix_conf_OUT is unchanged" >&5
$as_echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}
@@ -20352,24 +20354,24 @@ else
{ $as_echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
$as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
if test -f $ac_prefix_conf_INP ; then
- echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
- echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
- echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
- echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
- echo "#endif/" >>conftest.prefix
- echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
- echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
- echo "#endif/" >> conftest.prefix
+ $as_echo "s/^#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
+ $as_echo "s/^#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
+ $as_echo "s/^#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
+ $as_echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
+ $as_echo "#endif/" >>conftest.prefix
+ $as_echo "s/^#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
+ $as_echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
+ $as_echo "#endif/" >> conftest.prefix
# now executing _script on _DEF input to create _OUT output file
- echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
- echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
- echo ' ' >>$tmp/pconfig.h
- echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
+ $as_echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
+ $as_echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
+ $as_echo ' ' >>$tmp/pconfig.h
+ $as_echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
sed -f conftest.prefix $ac_prefix_conf_INP >>$tmp/pconfig.h
- echo ' ' >>$tmp/pconfig.h
- echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
- echo "#endif" >>$tmp/pconfig.h
+ $as_echo ' ' >>$tmp/pconfig.h
+ $as_echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
+ $as_echo "#endif" >>$tmp/pconfig.h
if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
{ $as_echo "$as_me:$LINENO: $ac_prefix_conf_OUT is unchanged" >&5
$as_echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}

8
archivers/zziplib/patches/patch-bc
View file

@ -1,11 +1,11 @@
$NetBSD: patch-bc,v 1.2 2009/11/29 20:40:08 sno Exp $
$NetBSD: patch-bc,v 1.3 2015/12/08 11:13:04 jperkin Exp $
replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
for xlc
--- m4/libtool.m4.orig 2009-11-29 20:26:36.000000000 +0000
+++ m4/libtool.m4 2009-11-29 20:29:09.000000000 +0000
@@ -5947,7 +5947,7 @@
--- m4/libtool.m4.orig 2009-08-23 11:38:19.000000000 +0000
+++ m4/libtool.m4
@@ -5947,7 +5947,7 @@ if test "$_lt_caught_CXX_error" != yes;
xl*)
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'