 @@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.29 2018/02/24 01:03:53 schmonz Exp $
+$NetBSD: distinfo,v 1.30 2020/06/30 13:24:05 schmonz Exp $
 SHA1 (bglibs-2.04.tar.gz) = 4f95d5d7779669bb336ccf460e4ffbbadbd4f18b
 RMD160 (bglibs-2.04.tar.gz) = db4fac7244cb394c73a1440fc29d9daff4b4322d
 SHA512 (bglibs-2.04.tar.gz) = 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f
 Size (bglibs-2.04.tar.gz) = 713673 bytes
-SHA1 (patch-ab) = 6568ac7dfada53baa378670155e9214e3879c9b9
+SHA1 (patch-Makefile) = 6568ac7dfada53baa378670155e9214e3879c9b9
 SHA1 (patch-crypto_hmac-md5.c) = 197c0d6de2b48dd611430d64d029381d95c8e5d8
 SHA1 (patch-crypto_hmac-sha1.c) = d540ac565ef79e68099186c64578f32c8925cfb1
 SHA1 (patch-crypto_hmac-sha256.c) = 29635908a1012e5a31ed46599a64ed33249c4015
 SHA1 (patch-crypto_hmac-sha384.c) = 1a6300ef2d8ab01e20853439ac578b862de19e7d
 SHA1 (patch-crypto_hmac-sha512.c) = 664430b6c21a3044be713af3770ac672212953d7
 SHA1 (patch-crypto_hmac.c) = 7699db75cdc269fb2fded70ed501bcef635691f6
 SHA1 (patch-include_hmac.h) = e0b113a73dfaf78327be5bf8a7001efd8896a8da

$NetBSD: patch-Makefile,v 1.1 2020/06/30 13:24:05 schmonz Exp $ Avoid "echo -n" in subshells and unsupported linker flags to fix OS X build. --- Makefile.orig 2018-02-23 16:24:54.000000000 +0000 +++ Makefile @@ -69,7 +69,7 @@ adt/hashb.lo adt/hashb.o: ltcompile adt/ adt/hashs.lo adt/hashs.o: ltcompile adt/hashs.c include/bglibs/adt_common.h ./ltcompile adt/hashs.c -all: sysdeps.h libraries programs man selftests +all: sysdeps.h libraries programs man base64/asc2bin.lo base64/asc2bin.o: ltcompile base64/asc2bin.c include/bglibs/base64.h include/bglibs/str.h sysdeps.h ./ltcompile base64/asc2bin.c @@ -90,7 +90,7 @@ base64/encode_part.lo base64/encode_part ./ltcompile base64/encode_part.c bg-installer: bg-installer.o ltload libbg-cli.la libbg.la bg-installer-cli.o - ./ltload bg-installer libbg-cli.la libbg.la bg-installer-cli.o -lbg-cli -static + ./ltload bg-installer libbg-cli.la libbg.la bg-installer-cli.o -static bg-installer-cli.c: bg-installer.cli cli-generate sysdeps.h ./cli-generate -c $< >$@ @@ -157,7 +157,7 @@ compile: conf-cc chmod 755 compile crc-gentab: crc-gentab.o load fmt/lcase.o fmt/ucase.o fmt/unum.o iobuf/iobuf_timeout.o iobuf/obuf_flush.o iobuf/obuf_pad.o iobuf/obuf_put3s.o iobuf/obuf_put5s.o iobuf/obuf_putc.o iobuf/obuf_putunumw.o iobuf/obuf_stderr.o iobuf/obuf_stdout.o iobuf/obuf_write.o msg/common.o msg/die.o sys/iopoll.o - ./load crc-gentab fmt/lcase.o fmt/ucase.o fmt/unum.o iobuf/iobuf_timeout.o iobuf/obuf_flush.o iobuf/obuf_pad.o iobuf/obuf_put3s.o iobuf/obuf_put5s.o iobuf/obuf_putc.o iobuf/obuf_putunumw.o iobuf/obuf_stderr.o iobuf/obuf_stdout.o iobuf/obuf_write.o msg/common.o msg/die.o sys/iopoll.o -static + ./load crc-gentab fmt/lcase.o fmt/ucase.o fmt/unum.o iobuf/iobuf_timeout.o iobuf/obuf_flush.o iobuf/obuf_pad.o iobuf/obuf_put3s.o iobuf/obuf_put5s.o iobuf/obuf_putc.o iobuf/obuf_putunumw.o iobuf/obuf_stderr.o iobuf/obuf_stdout.o iobuf/obuf_write.o msg/common.o msg/die.o sys/iopoll.o crc-gentab.o: compile crc-gentab.c sysdeps.h include/bglibs/iobuf.h include/bglibs/iobuf_common.h include/bglibs/ibuf.h include/iobuf_common.h include/bglibs/obuf.h sysdeps.h include/bglibs/msg.h sysdeps.h include/bglibs/debug.h ./compile crc-gentab.c @@ -863,9 +863,7 @@ path/mktemp.lo path/mktemp.o: ltcompile ./ltcompile path/mktemp.c perl-head.pl: - ( set -e; PATH="/bin:/usr/bin:/usr/local/bin:$$PATH"; export PATH; \ - perl=`which perl`; \ - echo "#! $$perl"; \ + ( echo "#! ${PERL5}"; \ echo "# WARNING: This file was auto-generated. Do not edit!"; \ echo ) >perl-head.pl