3 files changed, 64 insertions, 35 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 0ecf09208601..27c1e27b6d88 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -6,29 +6,18 @@
 #
 
 PORTNAME=	w3m
-PORTVERSION=	${W3M_VERSION}.p.${W3M_PATCHLEVEL}
+PORTVERSION=	0.2.1
 CATEGORIES+=	www ipv6
-MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/dev/ \
-		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/dev/ \
-		ftp://ftp.firedrake.org/w3m/dev/ \
-		ftp://ftp.umlauf.de/pub/w3m/dev/ \
-		http://www.instinct.org/w3m/dev/ \
-		http://grilli.net/mirrors/w3m/download/dev/
-DISTNAME=	${PORTNAME}-${W3M_VERSION}-pre
-
-PATCH_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-PATCHFILES=	${PORTNAME}-${W3M_VERSION}-pre-hsaka${W3M_PATCHLEVEL}.patch.gz
-PATCH_DIST_STRIP=	-p1
+MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
+		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
+		ftp://ftp.firedrake.org/w3m/ \
+		ftp://ftp.umlauf.de/pub/w3m/ \
+		http://www.instinct.org/w3m/ \
+		http://grilli.net/mirrors/w3m/download/
 
 MAINTAINER=	nobutaka@nobutaka.com
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc \
-		${PATCH}:${PORTSDIR}/devel/patch
-
-PATCH=		${LOCALBASE}/bin/gpatch
-
-W3M_VERSION=	0.1.11
-W3M_PATCHLEVEL=	24
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
 
 MAN1=		w3m.1
 MANLANG=	""
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 70ae045486b1..9af15a1026e8 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,2 +1 @@
-MD5 (w3m-0.1.11-pre.tar.gz) = d9fb24700ecde78624280467dda1aee5
-MD5 (w3m-0.1.11-pre-hsaka24.patch.gz) = 5a4ca6407a28c1b8dec4706d07015a1d
+MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
diff --git a/www/w3m/files/patch-aa b/www/w3m/files/patch-aa
index 4fbbaa465173..96befedc4673 100644
--- a/www/w3m/files/patch-aa
+++ b/www/w3m/files/patch-aa
@@ -1,6 +1,42 @@
---- config.h.orig	Wed Jun 14 19:49:48 2000
-+++ config.h	Fri Jul  7 18:59:48 2000
-@@ -69,20 +69,16 @@
+--- config.h.orig	Fri Mar 23 11:49:44 2001
++++ config.h	Fri Mar 23 15:20:22 2001
+@@ -18,7 +18,7 @@
+    goto-next-mark (ESC p), goto-next-mark (ESC n) and
+    mark-by-regexp (").
+ */
+-#undef USE_MARK
++#define USE_MARK
+ 
+ /*
+    If you want to load and save URL history.
+@@ -34,7 +34,7 @@
+    VIEW_UNSEENOBJECTS enables w3m to make a link to unseen objects.
+    e.g. background image.
+  */
+-#undef VIEW_UNSEENOBJECTS
++#define VIEW_UNSEENOBJECTS
+ 
+ /*
+    VI_PREC_NUM enables vi-like behavior for '2 SPC' or '2 b'
+@@ -49,7 +49,7 @@
+ /*
+  * Support Gopher protocol
+  */
+-#undef USE_GOPHER
++#define USE_GOPHER
+ 
+ /*
+  * Support NNTP
+@@ -84,7 +84,7 @@
+ /*
+  * Use Emacs-like key binding for file name completion
+  */
+-#undef EMACS_LIKE_LINEEDIT
++#define EMACS_LIKE_LINEEDIT
+ 
+ /*
+  * Remove line trailing spaces in html buffer.
+@@ -94,21 +94,16 @@
  /**********************************************************/
  #ifdef makefile_parameter
  
@@ -8,7 +44,7 @@
 -HELP_DIR = /usr/local/lib/w3m
 -LIB_DIR = /usr/local/lib/w3m
 -HELP_FILE = w3mhelp-w3m_ja.html
--SYS_LIBRARIES = -lgpm  -lbsd -lnsl -lncurses  -L/usr/local/ssl/lib -lssl -lcrypto 
+-SYS_LIBRARIES = -lgpm  -lbsd -lnsl -ltermcap  -L/usr/local/ssl/lib -lssl -lcrypto 
 +BIN_DIR = %%PREFIX%%/bin
 +HELP_DIR = %%PREFIX%%/share/doc/w3m
 +HELP_DIR_JA = %%PREFIX%%/share/doc/ja/w3m
@@ -16,7 +52,8 @@
 +SYS_LIBRARIES = -lncurses
  LOCAL_LIBRARIES = 
 -CC = gcc
--MYCFLAGS = -O -I./gc  -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
+-MYCFLAGS = -g -Wall -I./gc/include  -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
+-GCCFLAGS = -g -Wall -I./gc/include -DATOMIC_UNCOLLECTABLE -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT -DNO_DEBUGGING #-DNO_SIGNALS
  KEYBIND_SRC = keybind.c
  KEYBIND_OBJ = keybind.o
  EXT=
@@ -25,8 +62,8 @@
 -GCTARGET=gc/gc.a
  RANLIB=ranlib
  MKDIR=mkdir -p
- VERSION=0.1.11-pre
-@@ -94,26 +90,34 @@
+ VERSION=0.2.1
+@@ -120,26 +115,36 @@
  
  #define JA 0
  #define EN 1
@@ -36,7 +73,9 @@
  #define KANJI_SYMBOLS
 +#else
 +#define LANG EN
++#undef KANJI_SYMBOLS
 +#endif
++
  #define COLOR
  #define MOUSE
 -#define USE_GPM
@@ -46,21 +85,23 @@
  #define MENU
  #define USE_COOKIE
 -#define USE_SSL
+-#define USE_SSL_VERIFY
 +#undef USE_SSL
- #undef USE_SSL_VERIFY
- #undef FTPPASS_HOSTNAMEGEN
- #undef SHOW_PARAMS
++#undef USE_SSL_VERIFY
+ #define FTPPASS_HOSTNAMEGEN
+ #define SHOW_PARAMS
  
 -#define DEF_EDITOR "/bin/vi"
 -#define DEF_MAILER "/bin/mail"
 -#define DEF_EXT_BROWSER "/usr/X11R6/bin/netscape"
-+#define DEF_EDITOR "/usr/bin/vi"
-+#define DEF_MAILER "/usr/bin/mail"
-+#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"
- 
+-
 -#define LIB_DIR      "/usr/local/lib/w3m"
 -#define HELP_DIR     "/usr/local/lib/w3m"
 -#define HELP_FILE    "w3mhelp.html"
++#define DEF_EDITOR "/usr/bin/vi"
++#define DEF_MAILER "/usr/bin/mail"
++#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"
++
 +#define LIB_DIR      "%%PREFIX%%/libexec/w3m"
 +#ifdef JAPANESE
 +#define HELP_FILE    "%%PREFIX%%/share/doc/ja/w3m/w3mhelp-w3m_ja.html"