From 39fd5a6648cb436bc4ce8b14c374ddfaf28eedbb Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Mon, 2 Jan 2017 14:13:32 +0000
Subject: Fix build on NetBSD, Linux, Solaris: when linking bg-installer,
 remove -lbg-cli and restore -static. Add LICENSE while here.

---
 devel/bglibs/Makefile         |  3 ++-
 devel/bglibs/distinfo         |  4 ++--
 devel/bglibs/patches/patch-ab | 10 ++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
index 6c4ec28bd06..1414a8d549e 100644
--- a/devel/bglibs/Makefile
+++ b/devel/bglibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/01/02 02:18:30 schmonz Exp $
+# $NetBSD: Makefile,v 1.32 2017/01/02 14:13:32 schmonz Exp $
 #
 
 DISTNAME=		bglibs-2.03
@@ -8,6 +8,7 @@ MASTER_SITES=		${HOMEPAGE}
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://untroubled.org/bglibs/
 COMMENT=		Collection of libraries by Bruce Guenter
+LICENSE=		gnu-gpl-v2
 
 USE_TOOLS+=		perl:run gmake
 MAKE_ENV+=		PERL5=${TOOLS_PERL5:Q}
diff --git a/devel/bglibs/distinfo b/devel/bglibs/distinfo
index f427de2b1ed..41b9011bda4 100644
--- a/devel/bglibs/distinfo
+++ b/devel/bglibs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.27 2017/01/02 02:18:30 schmonz Exp $
+$NetBSD: distinfo,v 1.28 2017/01/02 14:13:32 schmonz Exp $
 
 SHA1 (bglibs-2.03.tar.gz) = 9c1506f60cd3d2572fd2019f676834cdf0a52860
 RMD160 (bglibs-2.03.tar.gz) = 474d460f062f3d573f38d4e4c7451b34a31a29a6
 SHA512 (bglibs-2.03.tar.gz) = 45d600e59394edd696c0e3f8477ce3b711a6729f199a5c263de1380427501d502aa5630c79fe3bc661615faabff754db51718f24fa354b2844ef4ed9f68e71df
 Size (bglibs-2.03.tar.gz) = 676188 bytes
-SHA1 (patch-ab) = c35699dba585340d6c9c7fcefbd80344c86c2102
+SHA1 (patch-ab) = e5403b329e9b34534beaa890924735dc1481ac33
 SHA1 (patch-crypto_hmac-md5.c) = 197c0d6de2b48dd611430d64d029381d95c8e5d8
 SHA1 (patch-crypto_hmac-sha1.c) = d540ac565ef79e68099186c64578f32c8925cfb1
 SHA1 (patch-crypto_hmac-sha256.c) = 29635908a1012e5a31ed46599a64ed33249c4015
diff --git a/devel/bglibs/patches/patch-ab b/devel/bglibs/patches/patch-ab
index 61f6c332474..f721f18178f 100644
--- a/devel/bglibs/patches/patch-ab
+++ b/devel/bglibs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2017/01/02 02:18:30 schmonz Exp $
+$NetBSD: patch-ab,v 1.9 2017/01/02 14:13:32 schmonz Exp $
 
 Avoid "echo -n" in subshells and unsupported linker flags to fix OS X build.
 
@@ -13,14 +13,12 @@ Avoid "echo -n" in subshells and unsupported linker flags to fix OS X build.
  
  base64/asc2bin.lo base64/asc2bin.o: ltcompile base64/asc2bin.c include/bglibs/base64.h include/bglibs/str.h sysdeps.h
  	./ltcompile base64/asc2bin.c
-@@ -89,8 +89,8 @@ base64/encode_line.lo base64/encode_line
- base64/encode_part.lo base64/encode_part.o: ltcompile base64/encode_part.c include/bglibs/base64.h include/bglibs/str.h sysdeps.h
+@@ -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
+ 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 
-+bg-installer: bg-installer.o load libbg-cli.la libbg.la bg-installer-cli.o
-+	./load bg-installer .libs/libbg-cli.a .libs/libbg.a bg-installer-cli.o
++	./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 $< >$@
-- 
cgit v1.2.3