5 files changed, 135 insertions, 0 deletions
diff --git a/package/w3m/Makefile b/package/w3m/Makefile
new file mode 100644
index 000000000..cd0ae7913
--- /dev/null
+++ b/package/w3m/Makefile
@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		w3m
+PKG_VERSION:=		0.5.3
+PKG_RELEASE:=		3
+PKG_MD5SUM:=		1b845a983a50b8dec0169ac48479eacc
+PKG_DESCR:=		console web browser
+PKG_SECTION:=		browser
+PKG_DEPENDS:=		libgc libncurses
+PKG_BUILDDEP:=		libgc-host libgc ncurses
+PKG_URL:=		http://w3m.sourceforge.net/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=w3m/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,W3M,w3m,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+TARGET_LDFLAGS+=	-lncurses -ltinfo
+CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
+CONFIGURE_ARGS+=	--with-termlib=ncurses \
+			--enable-image=no
+
+w3m-install:
+	$(INSTALL_DIR) $(IDIR_W3M)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/w3m \
+		$(IDIR_W3M)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/w3m/patches/patch-Makefile_in b/package/w3m/patches/patch-Makefile_in
new file mode 100644
index 000000000..d8058d0e9
--- /dev/null
+++ b/package/w3m/patches/patch-Makefile_in
@@ -0,0 +1,35 @@
+--- w3m-0.5.3.orig/Makefile.in	2011-01-04 10:22:18.000000000 +0100
++++ w3m-0.5.3/Makefile.in	2014-04-08 21:21:10.000000000 +0200
+@@ -176,8 +176,20 @@ functable.c: funcname.tab mktable$(EXT)
+ 	./mktable$(EXT) 100 functable.tab > $@
+ 	-rm -f functable.tab
+ 
+-mktable$(EXT): mktable.o dummy.o Str.o hash.o myctype.o
+-	$(CC) $(CFLAGS) -o mktable mktable.o dummy.o Str.o hash.o myctype.o $(LDFLAGS) $(LIBS) $(GC_LIBS)
++Str-host.o:
++	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o $@ $(srcdir)/Str.c
++
++hash-host.o:
++	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o $@ $(srcdir)/hash.c
++
++myctype-host.o:
++	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o $@ $(srcdir)/myctype.c
++
++mktable-host.o:
++	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o $@ $(srcdir)/mktable.c
++
++mktable$(EXT): mktable-host.o dummy-host.o Str-host.o hash-host.o myctype-host.o
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o mktable mktable-host.o dummy-host.o Str-host.o hash-host.o myctype-host.o $(LDFLAGS_FOR_BUILD) $(LIBS) $(GC_LIBS)
+ 
+ $(BOOKMARKER): w3mbookmark.o dummy.o $(ALIB)
+ 	$(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o dummy.o $(LDFLAGS) $(LIBS) $(EXT_LIBS)
+@@ -194,6 +206,9 @@ inflate.o: inflate.c
+ libwc/libwc.a: libwc
+ libwc:
+ 	(cd libwc && $(MAKE) CC='$(CC0)' OPTS='$(OPTS)')
++
++dummy-host.o: entity.c
++	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DDUMMY -c -o $@ $?
+  
+ dummy.o: entity.c
+ 	$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
diff --git a/package/w3m/patches/patch-istream_c b/package/w3m/patches/patch-istream_c
new file mode 100644
index 000000000..83743eda0
--- /dev/null
+++ b/package/w3m/patches/patch-istream_c
@@ -0,0 +1,38 @@
+--- w3m-0.5.3.orig/istream.c	2011-01-04 10:22:22.000000000 +0100
++++ w3m-0.5.3/istream.c	2014-04-08 19:58:01.000000000 +0200
+@@ -22,8 +22,8 @@
+ static void basic_close(int *handle);
+ static int basic_read(int *handle, char *buf, int len);
+ 
+-static void file_close(struct file_handle *handle);
+-static int file_read(struct file_handle *handle, char *buf, int len);
++static void file_close(struct wfile_handle *handle);
++static int file_read(struct wfile_handle *handle, char *buf, int len);
+ 
+ static int str_read(Str handle, char *buf, int len);
+ 
+@@ -114,7 +114,7 @@ newFileStream(FILE * f, void (*closep) (
+     stream = New(union input_stream);
+     init_base_stream(&stream->base, STREAM_BUF_SIZE);
+     stream->file.type = IST_FILE;
+-    stream->file.handle = New(struct file_handle);
++    stream->file.handle = New(struct wfile_handle);
+     stream->file.handle->f = f;
+     if (closep)
+ 	stream->file.handle->close = closep;
+@@ -658,13 +658,13 @@ basic_read(int *handle, char *buf, int l
+ }
+ 
+ static void
+-file_close(struct file_handle *handle)
++file_close(struct wfile_handle *handle)
+ {
+     handle->close(handle->f);
+ }
+ 
+ static int
+-file_read(struct file_handle *handle, char *buf, int len)
++file_read(struct wfile_handle *handle, char *buf, int len)
+ {
+     return fread(buf, 1, len, handle->f);
+ }
diff --git a/package/w3m/patches/patch-istream_h b/package/w3m/patches/patch-istream_h
new file mode 100644
index 000000000..b6a6a867b
--- /dev/null
+++ b/package/w3m/patches/patch-istream_h
@@ -0,0 +1,20 @@
+--- w3m-0.5.3.orig/istream.h	2003-10-20 18:41:56.000000000 +0200
++++ w3m-0.5.3/istream.h	2014-04-08 19:57:31.000000000 +0200
+@@ -20,7 +20,7 @@ struct stream_buffer {
+ 
+ typedef struct stream_buffer *StreamBuffer;
+ 
+-struct file_handle {
++struct wfile_handle {
+     FILE *f;
+     void (*close) ();
+ };
+@@ -53,7 +53,7 @@ struct base_stream {
+ 
+ struct file_stream {
+     struct stream_buffer stream;
+-    struct file_handle *handle;
++    struct wfile_handle *handle;
+     char type;
+     char iseos;
+     int (*read) ();
diff --git a/package/w3m/patches/patch-main_c b/package/w3m/patches/patch-main_c
new file mode 100644
index 000000000..9f14ab1c1
--- /dev/null
+++ b/package/w3m/patches/patch-main_c
@@ -0,0 +1,11 @@
+--- w3m-0.5.3.orig/main.c	2011-01-04 10:42:19.000000000 +0100
++++ w3m-0.5.3/main.c	2014-04-08 19:59:04.000000000 +0200
+@@ -833,7 +833,7 @@ main(int argc, char **argv, char **envp)
+     mySignal(SIGPIPE, SigPipe);
+ #endif
+ 
+-    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++    GC_set_warn_proc(wrap_GC_warn_proc);
+     err_msg = Strnew();
+     if (load_argc == 0) {
+ 	/* no URL specified */