5 files changed, 17 insertions, 61 deletions

diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index 31a82dad101a..0f38c7d9191e 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hnb
-PORTVERSION=	1.9.8
+PORTVERSION=	1.9.17
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,13 +15,24 @@ MAINTAINER=	pat@FreeBSD.org
 COMMENT=	Hierarchical NoteBook a data organizer
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=
 
 MAN1=		hnb.1
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS+=|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^CFLAGS/d' ${WRKSRC}/libcli/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hnb ${PREFIX}/bin
 	${INSTALL_MAN}	${WRKSRC}/../doc/hnb.1 ${MANPREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for FILE in Documentation.hnb Documentation.html hnbrc
+	${INSTALL_DATA} ${WRKSRC}/../doc/${FILE} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/editors/hnb/distinfo b/editors/hnb/distinfo
index a85834d72134..1c9c96fcf92a 100644
--- a/editors/hnb/distinfo
+++ b/editors/hnb/distinfo
@@ -1 +1 @@
-MD5 (hnb-1.9.8.tar.gz) = f571f61a0c4f65d9f8a3669234490f42
+MD5 (hnb-1.9.17.tar.gz) = c73b5f63d8ffe1976c915c1f8265951d
diff --git a/editors/hnb/files/patch-Makefile b/editors/hnb/files/patch-Makefile
deleted file mode 100644
index 40b266867b6e..000000000000
--- a/editors/hnb/files/patch-Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	Fri Feb 14 13:28:40 2003
-+++ Makefile	Fri Feb 14 13:28:26 2003
-@@ -1,5 +1,5 @@
- LIBS=-lncurses libcli/libcli.a
--CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -O2
-+CFLAGS+=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall
- 
- OBJS= ui_cli.o hnb.o node.o path.o prefs.o tokenizer.o tree.o tree_sort.o tree_todo.o\
- 	ui.o ui_binding.o ui_draw.o ui_overlay.o evilloop.o ui_edit.o \
-@@ -10,12 +10,12 @@
- 
- 
- hnb: libcli/libcli.a $(OBJS) Makefile
--	cc -o hnb $(OBJS) $(LIBS)
-+	$(CC) -o hnb $(OBJS) $(LIBS)
- 
- ui_cli.c: cli_entries.inc cli_decls.inc
- 
- xml_debug: xml_tok.o xml_debug.o
--	cc -o xml_debug xml_tok.o xml_debug.o
-+	$(CC) -o xml_debug xml_tok.o xml_debug.o
- 
- libcli/libcli.a: libcli/*.c
- 	(cd libcli;make)
-@@ -32,7 +32,7 @@
- 	rm -f xml_debug hnb $(OBJS) *~ cli_*.inc
- 	(cd libcli;make clean)
- hnb_p: *.c libcli/libcli_p.a
--	cc -o hnb_p *.c -pg -lncurses_p libcli/libcli_p.a -I.. -Ilibcli -DHAVE_CONFIG_H
-+	$(CC) -o hnb_p *.c -pg $(LIBS) $(CFLAGS)
- 
- ps:
- 	dot -Tps xml.dot > xml_states.ps
diff --git a/editors/hnb/files/patch-libcli::Makefile b/editors/hnb/files/patch-libcli::Makefile
deleted file mode 100644
index c2322afbf6ac..000000000000
--- a/editors/hnb/files/patch-libcli::Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- libcli/Makefile.orig	Fri Feb 14 13:29:46 2003
-+++ libcli/Makefile	Fri Feb 14 13:30:11 2003
-@@ -1,5 +1,3 @@
--CFLAGS = -Wall -O3
--
- OBJS = cli.o cli_history.o 
- 
- all: libcli.a libcli.so test-static test-shared 
-@@ -9,12 +7,12 @@
- libcli.a: $(OBJS)
- 	ar rcs libcli.a cli*.o
- libcli_p.a: 
--	cc -pg -c cli.c
--	cc -pg -c cli_history.c
-+	$(CC) -pg -c cli.c
-+	$(CC) -pg -c cli_history.c
- 	ar rcs libcli_p.a cli*.o
- libcli.so: $(OBJS)
--	cc -shared cli*.o -o libcli.so $(CFLAGS) $(LIBS)
-+	$(CC) -shared cli*.o -o libcli.so $(CFLAGS) $(LIBS)
- test-static: test.o libcli.a
--	cc -o test-static test.o libcli.a $(CFLAGS) $(LIBS) 
-+	$(CC) -o test-static test.o libcli.a $(CFLAGS) $(LIBS) 
- test-shared: test.o libcli.so
--	cc -o test-shared test.o -L. -lcli $(CFLAGS) $(LIBS) 
-+	$(CC) -o test-shared test.o -L. -lcli $(CFLAGS) $(LIBS) 
diff --git a/editors/hnb/pkg-plist b/editors/hnb/pkg-plist
index ce46f7e376df..e2aa64ecc803 100644
--- a/editors/hnb/pkg-plist
+++ b/editors/hnb/pkg-plist
@@ -1 +1,5 @@
 bin/hnb
+%%PORTDOCS%%share/doc/hnb/Documentation.hnb
+%%PORTDOCS%%share/doc/hnb/Documentation.html
+%%PORTDOCS%%share/doc/hnb/hnbrc
+%%PORTDOCS%%@dirrm share/doc/hnb/