CVS commit: pkgsrc/editors/hnb

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 15 12:04:19 UTC 2021

Modified Files:
        pkgsrc/editors/hnb: Makefile distinfo
Added Files:
        pkgsrc/editors/hnb/patches: patch-src_Makefile
Removed Files:
        pkgsrc/editors/hnb/patches: patch-ac

Log Message:
hnb: support NetBSD libcurses, use LDFLAGS when linking


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/editors/hnb/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/hnb/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/hnb/patches/patch-ac
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/hnb/patches/patch-src_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/hnb/Makefile
diff -u pkgsrc/editors/hnb/Makefile:1.31 pkgsrc/editors/hnb/Makefile:1.32
--- pkgsrc/editors/hnb/Makefile:1.31    Fri Mar 20 11:57:34 2020
+++ pkgsrc/editors/hnb/Makefile Sat May 15 12:04:18 2021
@@ -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 @@ do-install:
        ${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"

Index: pkgsrc/editors/hnb/distinfo
diff -u pkgsrc/editors/hnb/distinfo:1.8 pkgsrc/editors/hnb/distinfo:1.9
--- pkgsrc/editors/hnb/distinfo:1.8     Sat Oct 19 14:10:45 2019
+++ pkgsrc/editors/hnb/distinfo Sat May 15 12:04:18 2021
@@ -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

Added files:

Index: pkgsrc/editors/hnb/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/editors/hnb/patches/patch-src_Makefile:1.1
--- /dev/null   Sat May 15 12:04:19 2021
+++ pkgsrc/editors/hnb/patches/patch-src_Makefile       Sat May 15 12:04:19 2021
@@ -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)