[pkgsrc/trunk]: pkgsrc/editors/hnb hnb: support NetBSD libcurses, use LDFLAGS...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8af8b7eadeeb
branches:  trunk
changeset: 452775:8af8b7eadeeb
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat May 15 12:04:18 2021 +0000

description:
hnb: support NetBSD libcurses, use LDFLAGS when linking

diffstat:

 editors/hnb/Makefile                   |   5 +++--
 editors/hnb/distinfo                   |   4 ++--
 editors/hnb/patches/patch-ac           |  12 ------------
 editors/hnb/patches/patch-src_Makefile |  23 +++++++++++++++++++++++
 4 files changed, 28 insertions(+), 16 deletions(-)

diffs (75 lines):

diff -r cd941e79370a -r 8af8b7eadeeb editors/hnb/Makefile
--- a/editors/hnb/Makefile      Sat May 15 12:00:29 2021 +0000
+++ b/editors/hnb/Makefile      Sat May 15 12:04:18 2021 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2020/03/20 11:57:34 nia Exp $
+# $NetBSD: Makefile,v 1.32 2021/05/15 12:04:18 nia Exp $
 
 DISTNAME=      hnb-1.9.18
+PKGREVISION=   1
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fraggerfox/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -19,5 +20,5 @@
        ${INSTALL_PROGRAM} ${WRKSRC}/src/hnb ${DESTDIR}${PREFIX}/bin
        ${INSTALL_MAN} ${WRKSRC}/doc/hnb.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r cd941e79370a -r 8af8b7eadeeb editors/hnb/distinfo
--- a/editors/hnb/distinfo      Sat May 15 12:00:29 2021 +0000
+++ b/editors/hnb/distinfo      Sat May 15 12:04:18 2021 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2019/10/19 14:10:45 fox Exp $
+$NetBSD: distinfo,v 1.9 2021/05/15 12:04:18 nia Exp $
 
 SHA1 (hnb-1.9.18.tar.gz) = c2750b7ea998fd8c7b8dedd83645a5d20c01f61c
 RMD160 (hnb-1.9.18.tar.gz) = 484c539df2ddc82172380329d287427c67f082c5
 SHA512 (hnb-1.9.18.tar.gz) = dc7063a214ad7712bd5d44db34ebfc4982c486b12388b280b149902f8a1a3b6dfa1804846b4dded6a5f843bd2718fe80dbdcdefe45553bcf3b473c8919e27248
 Size (hnb-1.9.18.tar.gz) = 141437 bytes
-SHA1 (patch-ac) = 14d7c3fcdb85d9cf277a402af21139e3748d31eb
+SHA1 (patch-src_Makefile) = 3405249c47bcaa874b85002b7edf527af4e253f1
diff -r cd941e79370a -r 8af8b7eadeeb editors/hnb/patches/patch-ac
--- a/editors/hnb/patches/patch-ac      Sat May 15 12:00:29 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2019/10/19 14:10:45 fox Exp $
-
-Added the curses library path for pkgsrc.
-
---- src/Makefile.orig  Sat Oct  1 20:43:07 2005
-+++ src/Makefile       Sat Oct  1 20:43:40 2005
-@@ -1,4 +1,4 @@
--LIBS=-lncurses libcli/libcli.a
-+LIBS=-Wl,-R${PREFIX}/lib -lncurses libcli/libcli.a
- CFLAGS+=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
- 
- CFILES=$(wildcard *.c)
diff -r cd941e79370a -r 8af8b7eadeeb editors/hnb/patches/patch-src_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/hnb/patches/patch-src_Makefile    Sat May 15 12:04:18 2021 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_Makefile,v 1.1 2021/05/15 12:04:19 nia Exp $
+
+Use LDFLAGS when linking. Support NetBSD libcurses.
+
+--- src/Makefile.orig  2019-09-26 04:39:01.000000000 +0000
++++ src/Makefile
+@@ -1,5 +1,5 @@
+-LIBS=-lncurses libcli/libcli.a
+-CFLAGS+=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
++LIBS=-lcurses libcli/libcli.a
++CFLAGS+=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall
+ 
+ CFILES=$(wildcard *.c)
+ OBJS=$(patsubst %.c,%.o,$(CFILES))
+@@ -8,7 +8,7 @@ OBJS=$(patsubst %.c,%.o,$(CFILES))
+       $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+ hnb: libcli/libcli.a Makefile $(OBJS) init_subsystems.c *.h *.inc
+-      $(CC) -o hnb $(OBJS) $(LIBS) $(CFLAGS)
++      $(CC) $(LDFLAGS) -o hnb $(OBJS) $(LIBS)
+ #     strip hnb
+ libcli/libcli.a: libcli/*.c
+       (cd libcli;${MAKE} libcli.a)