pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/hnb editors/hnb: Update to 1.9.18
details: https://anonhg.NetBSD.org/pkgsrc/rev/5777675a2831
branches: trunk
changeset: 403000:5777675a2831
user: fox <fox%pkgsrc.org@localhost>
date: Sat Oct 19 14:10:45 2019 +0000
description:
editors/hnb: Update to 1.9.18
- Removes obsolete patches.
- Updates the source code upstream to github.
Changes since 1.9.17:
1.9.18
fixes crashes when trying to run in amd64 systems
ok maya@
diffstat:
editors/hnb/Makefile | 15 +-
editors/hnb/distinfo | 45 +----
editors/hnb/patches/patch-ac | 4 +-
editors/hnb/patches/patch-src_actions.c | 55 ------
editors/hnb/patches/patch-src_cal.c | 64 -------
editors/hnb/patches/patch-src_cli__macro.c | 47 -----
editors/hnb/patches/patch-src_clipboard.c | 55 ------
editors/hnb/patches/patch-src_evilloop.c | 24 --
editors/hnb/patches/patch-src_expanded.c | 72 --------
editors/hnb/patches/patch-src_file.c | 42 ----
editors/hnb/patches/patch-src_file__ascii.c | 65 -------
editors/hnb/patches/patch-src_file__help.c | 51 -----
editors/hnb/patches/patch-src_file__hnb.c | 69 -------
editors/hnb/patches/patch-src_file__html.c | 65 -------
editors/hnb/patches/patch-src_file__opml.c | 69 -------
editors/hnb/patches/patch-src_file__ps.c | 38 ----
editors/hnb/patches/patch-src_file__xml.c | 74 --------
editors/hnb/patches/patch-src_libcli_cli.c | 104 ------------
editors/hnb/patches/patch-src_libcli_cli.h | 43 ----
editors/hnb/patches/patch-src_libcli_cli__tokenize.c | 24 --
editors/hnb/patches/patch-src_node.c | 79 ---------
editors/hnb/patches/patch-src_query.c | 29 ---
editors/hnb/patches/patch-src_search.c | 54 ------
editors/hnb/patches/patch-src_spell.c | 29 ---
editors/hnb/patches/patch-src_statcmds.c | 65 -------
editors/hnb/patches/patch-src_state.c | 42 ----
editors/hnb/patches/patch-src_tree__misc.c | 164 -------------------
editors/hnb/patches/patch-src_tree__sort.c | 29 ---
editors/hnb/patches/patch-src_tree__todo.c | 48 -----
editors/hnb/patches/patch-src_ui__binding.c | 68 -------
editors/hnb/patches/patch-src_ui__cli.c | 153 -----------------
editors/hnb/patches/patch-src_ui__draw.c | 38 ----
editors/hnb/patches/patch-src_ui__edit.c | 38 ----
editors/hnb/patches/patch-src_ui__menu.c | 33 ---
editors/hnb/patches/patch-src_ui__overlay.c | 43 ----
editors/hnb/patches/patch-src_ui__style.c | 47 -----
36 files changed, 14 insertions(+), 1970 deletions(-)
diffs (truncated from 2149 to 300 lines):
diff -r a3148b9b5d20 -r 5777675a2831 editors/hnb/Makefile
--- a/editors/hnb/Makefile Sat Oct 19 14:10:00 2019 +0000
+++ b/editors/hnb/Makefile Sat Oct 19 14:10:45 2019 +0000
@@ -1,20 +1,17 @@
-# $NetBSD: Makefile,v 1.28 2018/11/26 09:15:53 fox Exp $
-#
+# $NetBSD: Makefile,v 1.29 2019/10/19 14:10:45 fox Exp $
-DISTNAME= hnb-1.9.17
-PKGREVISION= 5
+DISTNAME= hnb-1.9.18
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hnb/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=fraggerfox/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
+EXTRACT_USING= bsdtar
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://hnb.sourceforge.net/
COMMENT= Hierarchical data organizer
LICENSE= gnu-gpl-v2
-USE_TOOLS+= gmake
-
-BUILD_DIRS= src
-BUILD_TARGET= hnb
+USE_TOOLS+= gmake
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff -r a3148b9b5d20 -r 5777675a2831 editors/hnb/distinfo
--- a/editors/hnb/distinfo Sat Oct 19 14:10:00 2019 +0000
+++ b/editors/hnb/distinfo Sat Oct 19 14:10:45 2019 +0000
@@ -1,40 +1,7 @@
-$NetBSD: distinfo,v 1.7 2018/11/26 09:15:53 fox Exp $
+$NetBSD: distinfo,v 1.8 2019/10/19 14:10:45 fox Exp $
-SHA1 (hnb-1.9.17.tar.gz) = b5204a9bda13b42ef04921e71f52e5bfe5412f13
-RMD160 (hnb-1.9.17.tar.gz) = 1363eac8a785a3bad2ac319ae38726cd826268cf
-SHA512 (hnb-1.9.17.tar.gz) = 48ca89336027b54ddec31064294595498f10927d9b69a115bfbdecf79ebc720873c0cc70dc646422f196cff7aa4fda68fc2f68f4ddacfac53d4363ed295d2e7a
-Size (hnb-1.9.17.tar.gz) = 143700 bytes
-SHA1 (patch-ac) = d750eae0a0fbb61a75fce3d427bf2afdbeb806c6
-SHA1 (patch-src_actions.c) = 5c2f340e205c982d759415385f6f0038ee7ca404
-SHA1 (patch-src_cal.c) = 162a4acfa9a388ec5a1b1e9d8b5ac69f93715745
-SHA1 (patch-src_cli__macro.c) = 593bfaf56dd083ef0da45c3f320af095cd411bd1
-SHA1 (patch-src_clipboard.c) = 4dde4765825e5362f66c8b7c63ba40c1e154c63c
-SHA1 (patch-src_evilloop.c) = 4f55e0dabdeede6f33cebeb18d5c6b64c51bfbf7
-SHA1 (patch-src_expanded.c) = 772d71db739164ce59c9fe3d3b93b862063f3ee3
-SHA1 (patch-src_file.c) = 884445d3b5a2d9590ea6e1e0a1e6df98cf69bdab
-SHA1 (patch-src_file__ascii.c) = 7b523b941791b6337a13c11ce1a70c99a170b707
-SHA1 (patch-src_file__help.c) = 7a9604126a1fb4af182a1236eb5a873b82ae1690
-SHA1 (patch-src_file__hnb.c) = c2549af8b806eaef4fc760712657860d4f7b31ca
-SHA1 (patch-src_file__html.c) = 162f68b3e417b2eeb7a889ad23836dc4c79b2049
-SHA1 (patch-src_file__opml.c) = 588e1b339f0991c105d30fe077a8fa95bbdf6f9d
-SHA1 (patch-src_file__ps.c) = 7789097bd9e5ca1950e53295903a2edcb47a983e
-SHA1 (patch-src_file__xml.c) = 1bcda1d25bd1aa22e10c7eea40c7e99c05377f75
-SHA1 (patch-src_libcli_cli.c) = baabda1de8c8e24f370d06efbd9b0bd09262224d
-SHA1 (patch-src_libcli_cli.h) = c6b2ace10000bfd176418e2ecbcd8a2abb04a1e1
-SHA1 (patch-src_libcli_cli__tokenize.c) = 503d4cdd51a40773b75fe2fa8bbbafc3d1e16941
-SHA1 (patch-src_node.c) = cd6541ab5a2da5759106126d5e36e59b8b12e600
-SHA1 (patch-src_query.c) = 8f55f91444f9691655c54163c25ccb6bbad16bd0
-SHA1 (patch-src_search.c) = c7a88b365eb489a0e27d9badb1c67477aaa39b1c
-SHA1 (patch-src_spell.c) = eb05674a5c2c48e779412ba011b76a774a8087a0
-SHA1 (patch-src_statcmds.c) = 439c85247d7c2a3622cd5e09683932aac251bef6
-SHA1 (patch-src_state.c) = 24d5c9d710c8b90447f4aa2ea9431d9f2f571bed
-SHA1 (patch-src_tree__misc.c) = e8bbc96c577d77614d37f2d73ec8373304cdd245
-SHA1 (patch-src_tree__sort.c) = 95780063a609fa7b9dd1c3230e2d23dfb96ad8b5
-SHA1 (patch-src_tree__todo.c) = 43837efeddab88b4f03caa54d983f68042bda35e
-SHA1 (patch-src_ui__binding.c) = 334b952a2851d84a2e39d7256a68a584691534ca
-SHA1 (patch-src_ui__cli.c) = aa8663c7244122aac7f92f6c73369d31f41e36ad
-SHA1 (patch-src_ui__draw.c) = 637fc52cd1c44574a7f7342d92800be40e1092d6
-SHA1 (patch-src_ui__edit.c) = 6f01ecd0c0f9eaf9b05fa679b912de2ffeafb00d
-SHA1 (patch-src_ui__menu.c) = b6a7136b364f6c8f5e1afc01876601ad4f93dbf5
-SHA1 (patch-src_ui__overlay.c) = a8684a61bb97ebe85f4c3eec76ae77bcaa3c70b7
-SHA1 (patch-src_ui__style.c) = 0dbe1533587cb2bda9e077884a16df275269746e
+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
diff -r a3148b9b5d20 -r 5777675a2831 editors/hnb/patches/patch-ac
--- a/editors/hnb/patches/patch-ac Sat Oct 19 14:10:00 2019 +0000
+++ b/editors/hnb/patches/patch-ac Sat Oct 19 14:10:45 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2018/11/26 09:15:53 fox Exp $
+$NetBSD: patch-ac,v 1.3 2019/10/19 14:10:45 fox Exp $
Added the curses library path for pkgsrc.
@@ -7,6 +7,6 @@
@@ -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
+ CFLAGS+=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
CFILES=$(wildcard *.c)
diff -r a3148b9b5d20 -r 5777675a2831 editors/hnb/patches/patch-src_actions.c
--- a/editors/hnb/patches/patch-src_actions.c Sat Oct 19 14:10:00 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-$NetBSD: patch-src_actions.c,v 1.1 2018/11/26 09:15:53 fox Exp $
-
-1. Replaced int with uint64_t to avoid truncating pointer to (32bit)
- int by using a wider type.
-2. Replaced pointer to int type cast with a macro PTR_TO_UINT64(x) to
- help convert the pointer to uint64_t.
-
-This prevents the segfault on startup in amd64 systems.
-
---- src/actions.c.orig 2003-03-14 01:06:36.000000000 +0000
-+++ src/actions.c
-@@ -32,7 +32,7 @@
- static char web_command[255] = "galeon -n *";
- static char mail_command[255] = "rxvt -rv +sb -e mutt *";
-
--static int cmd_system(int argc, char **argv, void *data){
-+static uint64_t cmd_system(int argc, char **argv, void *data){
- Node *pos=(Node *)data;
- int ui_was_inited = ui_inited;
- if (argc>1) {
-@@ -42,7 +42,7 @@
- if (ui_was_inited)
- ui_init ();
- }
-- return (int)pos;
-+ return PTR_TO_UINT64(pos);
- }
-
- static int action_node (Node *node)
-@@ -136,21 +136,21 @@
- * url/email address substring,.. and launches an app based on that?
- *
- */
--static int cmd_action (int argc, char **argv, void *data)
-+static uint64_t cmd_action (int argc, char **argv, void *data)
- {
- Node *pos = (Node *) data;
- Node *node = node_right (pos);
-
- while (node) {
- if (!action_node (node))
-- return (int) pos;
-+ return PTR_TO_UINT64(pos);
- node = node_down (node);
- }
- if (!action_node (pos)) {
-- return (int) pos;
-+ return PTR_TO_UINT64(pos);
- } else {
- cli_outfunf ("nothing to do");
-- return (int) pos;
-+ return PTR_TO_UINT64(pos);
- }
-
- /***
diff -r a3148b9b5d20 -r 5777675a2831 editors/hnb/patches/patch-src_cal.c
--- a/editors/hnb/patches/patch-src_cal.c Sat Oct 19 14:10:00 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$NetBSD: patch-src_cal.c,v 1.1 2018/11/26 09:15:53 fox Exp $
-
-In NetBSD-1.6.2, the <stdlib.h> header uses the word bufsize as a
-parameter name in a function prototype. The "file.h" header #defines
-bufsize to 4096, which leads to a parser error.
-
-Above fix made by rilling on 2005/03/11
-
-1. Replaced int with uint64_t to avoid truncating pointer to (32bit)
- int by using a wider type.
-2. Replaced pointer to int type cast with a macro PTR_TO_UINT64(x) to
- help convert the pointer to uint64_t.
-
-This prevents the segfault on startup in amd64 systems.
-
---- src/cal.c.orig 2003-03-14 01:06:36.000000000 +0000
-+++ src/cal.c
-@@ -19,15 +19,15 @@
- */
-
- /**************/
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <time.h>
-+
- #include "tree.h"
- #include "cli.h"
- #include "ui.h"
- #include "file.h"
-
--#include <stdlib.h>
--#include <stdio.h>
--#include <time.h>
--
- static char *const wday[] =
- { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", " "};
-
-@@ -35,7 +35,7 @@
- "", "January", "February", "March", "April", "May" ,"June", "July",
- "August", "September", "October", "November" , "December"};
-
--static int insert_cal(int argc, char **argv, void *data){
-+static uint64_t insert_cal(int argc, char **argv, void *data){
- Node *pos=(void *)data;
-
- int year;
-@@ -44,7 +44,7 @@
-
- if( (argc!=3) || (atoi(argv[1])>12 )){
- cli_outfunf("usage: %s <month> <year>", argv[0]);
-- return (int)data;
-+ return PTR_TO_UINT64(data);
- }
-
- month=atoi(argv[1]);
-@@ -96,7 +96,7 @@
- }
- }
-
-- return (int)pos;
-+ return PTR_TO_UINT64(pos);
- }
-
- /*
diff -r a3148b9b5d20 -r 5777675a2831 editors/hnb/patches/patch-src_cli__macro.c
--- a/editors/hnb/patches/patch-src_cli__macro.c Sat Oct 19 14:10:00 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-$NetBSD: patch-src_cli__macro.c,v 1.1 2018/11/26 09:15:53 fox Exp $
-
-1. Replaced int with uint64_t to avoid truncating pointer to (32bit)
- int by using a wider type.
-2. Replaced pointer to int type cast with a macro PTR_TO_UINT64(x) to
- help convert the pointer to uint64_t.
-
-This prevents the segfault on startup in amd64 systems.
-
---- src/cli_macro.c.orig 2003-03-09 20:44:27.000000000 +0000
-+++ src/cli_macro.c
-@@ -80,7 +80,7 @@
- return pos;
- }
-
--static int cmd_macro (int argc, char **argv, void *data)
-+static uint64_t cmd_macro (int argc, char **argv, void *data)
- {
- Node *pos=(Node *)data;
- if(argc==1){
-@@ -88,7 +88,7 @@
- } else if(argc==2){
- MacroT *tmacro=lookup_macro(argv[1]);
- if(tmacro){
-- return (int)do_macro(tmacro,pos);
-+ return PTR_TO_UINT64(do_macro(tmacro,pos));
- } else {
- cli_outfunf("no such macro defined '%s'",argv[1]);
- }
-@@ -97,7 +97,7 @@
- if(!strcmp(argv[1],"define") ){
- if(lookup_macro(argv[2])){
- cli_outfunf("error macro %s already exist,.. this might turn out badly,.. " ,argv[2]);
-- return (int) pos;
-+ return PTR_TO_UINT64(pos);
- } else {
- MacroT *tmacro;
- if(!macro){
-@@ -119,7 +119,7 @@
-
- }
- }
-- return (int) pos;
-+ return PTR_TO_UINT64(pos);
- }
-
-
diff -r a3148b9b5d20 -r 5777675a2831 editors/hnb/patches/patch-src_clipboard.c
--- a/editors/hnb/patches/patch-src_clipboard.c Sat Oct 19 14:10:00 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-$NetBSD: patch-src_clipboard.c,v 1.1 2018/11/26 09:15:53 fox Exp $
-
-1. Replaced int with uint64_t to avoid truncating pointer to (32bit)
- int by using a wider type.
-2. Replaced pointer to int type cast with a macro PTR_TO_UINT64(x) to
- help convert the pointer to uint64_t.
-
-This prevents the segfault on startup in amd64 systems.
-
---- src/clipboard.c.orig 2003-03-09 17:42:20.000000000 +0000
-+++ src/clipboard.c
-@@ -29,7 +29,7 @@
-
- static Node *clipboard = NULL;
-
--static int copy_cmd (int argc,char **argv, void *data)
-+static uint64_t copy_cmd (int argc,char **argv, void *data)
- {
- Node *pos = (Node *) data;
-
-@@ -39,10 +39,10 @@ static int copy_cmd (int argc,char **arg
Home |
Main Index |
Thread Index |
Old Index