From: Carsten Schlote <[email protected]>

hexedit uses 'man' to display help. Code changed to use
less on ascii manpage output.

Signed-off-by: Carsten Schlote <[email protected]>
---
 patches/hexedit-1.2.12/hexedit-help-fix.diff |   44 ++++++++++++++++++++++++++
 patches/hexedit-1.2.12/series                |    1 +
 rules/hexedit.make                           |    6 +++
 3 files changed, 51 insertions(+), 0 deletions(-)
 create mode 100644 patches/hexedit-1.2.12/hexedit-help-fix.diff

diff --git a/patches/hexedit-1.2.12/hexedit-help-fix.diff 
b/patches/hexedit-1.2.12/hexedit-help-fix.diff
new file mode 100644
index 0000000..7012c89
--- /dev/null
+++ b/patches/hexedit-1.2.12/hexedit-help-fix.diff
@@ -0,0 +1,44 @@
+[hexedit] Add some help output to hexedit
+
+Still sucks, but better tha nothing. Not for upstream.
+
+---
+ Makefile.in |    5 ++++-
+ interact.c  |    4 ++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+Index: hexedit-1.2.12/Makefile.in
+===================================================================
+--- hexedit-1.2.12.orig/Makefile.in    2009-10-06 12:20:28.000000000 +0200
++++ hexedit-1.2.12/Makefile.in 2009-10-06 12:23:00.000000000 +0200
+@@ -29,11 +29,14 @@
+ .c.o:
+       $(CC) $(DEFS) $(CFLAGS) $(CPPFLAGS) -c $<
+ 
+-all: $(PRODUCT)
++all: $(PRODUCT) $(PRODUCT).ascii
+ 
+ $(PRODUCT): $(OBJS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
++$(PRODUCT).ascii: $(PRODUCT).1
++      groff -T ascii -a $(PRODUCT).1 > $(PRODUCT).ascii
++
+ clean:
+       rm -rf *~ *.o core *.cache config.status config.log $(PRODUCT)
+ 
+Index: hexedit-1.2.12/interact.c
+===================================================================
+--- hexedit-1.2.12.orig/interact.c     2005-11-08 17:16:47.000000000 +0100
++++ hexedit-1.2.12/interact.c  2009-10-06 12:21:24.000000000 +0200
+@@ -309,8 +309,8 @@
+   char *args[3];
+   int status;
+ 
+-  args[0] = "man";
+-  args[1] = "hexedit";
++  args[0] = "less";
++  args[1] = "/usr/share/hexedit/hexedit.ascii";
+   args[2] = NULL;
+   endwin();
+   if (fork() == 0) {
diff --git a/patches/hexedit-1.2.12/series b/patches/hexedit-1.2.12/series
index 299a9d8..c4aee85 100644
--- a/patches/hexedit-1.2.12/series
+++ b/patches/hexedit-1.2.12/series
@@ -1,2 +1,3 @@
 0001-Makefile.in-use-CPPFLAGS.patch
 0002-Makefile.in-add-DESTDIR-support.patch
+hexedit-help-fix.diff
diff --git a/rules/hexedit.make b/rules/hexedit.make
index f8e1dd1..e7cd35d 100644
--- a/rules/hexedit.make
+++ b/rules/hexedit.make
@@ -73,9 +73,15 @@ $(STATEDIR)/hexedit.targetinstall:
        @$(call install_fixup, hexedit,DEPENDS,)
        @$(call install_fixup, hexedit,DESCRIPTION,missing)
 
+
        @$(call install_copy, hexedit, 0, 0, 0755, -, \
                /usr/bin/hexedit)
 
+#      @$(call install_copy, hexedit, 0, 0, 0755, $(HEXEDIT_DIR)/hexedit, 
/usr/bin/hexedit)
+       @$(call install_copy, hexedit, 0, 0, 0755, /usr/share/)
+       @$(call install_copy, hexedit, 0, 0, 0755, /usr/share/hexedit/)
+       @$(call install_copy, hexedit, 0, 0, 0755, 
$(HEXEDIT_DIR)/hexedit.ascii, /usr/share/hexedit/hexedit.ascii)
+
        @$(call install_finish, hexedit)
 
        @$(call touch)
-- 
1.6.5.6.gb3118


--
ptxdist mailing list
[email protected]

Reply via email to