o rename w3m-image -> w3m-img after repository copy by the author's request.

o update w3m-img to 1.10.
o make PORTREVISION overridable from slave ports.
o change PORTVERSION style for w3m-img. (suggedted by knu)

PR:		29226
Submitted by:	maintainer

2 files changed, 18 insertions, 41 deletions

diff --git a/www/w3m/files/extra-patch-XMakefile b/www/w3m/files/extra-patch-XMakefile
index 1181ea6..ed4f27a 100644
--- a/www/w3m/files/extra-patch-XMakefile
+++ b/www/w3m/files/extra-patch-XMakefile
@@ -1,5 +1,5 @@
---- XMakefile.orig	Mon Jul 16 11:14:38 2001
-+++ XMakefile	Mon Jul 16 11:14:47 2001
+--- XMakefile.orig	Mon Aug 13 00:52:11 2001
++++ XMakefile	Mon Aug 13 00:53:15 2001
 @@ -22,16 +22,16 @@
  
  INCLUDES=-I.
@@ -21,7 +21,7 @@
  	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
  
  $(ALIB): $(ALIBOBJS)
-@@ -86,24 +86,24 @@
+@@ -86,24 +86,25 @@
  install: $(TARGETS)
  	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
  	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
@@ -33,7 +33,7 @@
 -	$(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
 -	$(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
 -	$(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
--	for d in $(BOOKMARKER) $(HELPER) $(IMGDISPLAY) $(IMGSIZE); \
+-	for d in $(BOOKMARKER) $(HELPER) $(IMGTARGET); \
 -		do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
 -	(cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
 +	$(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
@@ -55,6 +55,7 @@
 +	-$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html 
 +	-$(RM) $(LIB_DIR)/$(BOOKMARKER)
 +	-$(RM) $(LIB_DIR)/$(HELPER)
++
  
  clean: sweep
  	rm -f *.o *.a $(TARGETS) mktable$(EXT)
diff --git a/www/w3m/files/patch-aa b/www/w3m/files/patch-aa
index 48db944..674330e 100644
--- a/www/w3m/files/patch-aa
+++ b/www/w3m/files/patch-aa
@@ -1,71 +1,49 @@
---- config.h.orig	Mon Jul 16 11:23:48 2001
-+++ config.h	Mon Jul 16 11:24:21 2001
-@@ -18,7 +18,7 @@
-    goto-next-mark (ESC p), goto-next-mark (ESC n) and
-    mark-by-regexp (").
+--- config.h.orig	Fri Mar 23 11:49:44 2001
++++ config.h	Mon Aug 27 15:16:50 2001
+@@ -20,3 +20,3 @@
  */
 -#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.
+@@ -36,3 +36,3 @@
   */
 -#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
+@@ -51,3 +51,3 @@
   */
 -#undef USE_GOPHER
 +#define USE_GOPHER
  
- /*
-  * Support NNTP
-@@ -84,7 +84,7 @@
- /*
-  * Use Emacs-like key binding for file name completion
+@@ -86,3 +86,3 @@
   */
 -#undef EMACS_LIKE_LINEEDIT
 +#define EMACS_LIKE_LINEEDIT
  
- /*
-  * Remove line trailing spaces in html buffer.
-@@ -94,21 +94,16 @@
- /**********************************************************/
- #ifdef makefile_parameter
+@@ -96,11 +96,10 @@
  
 -BIN_DIR = /usr/local/bin
 -HELP_DIR = /usr/local/lib/w3m
 -LIB_DIR = /usr/local/lib/w3m
--HELP_FILE = w3mhelp-w3m_ja.html
--SYS_LIBRARIES = -lgpm  -lbsd -lnsl -ltermcap  -L/usr/local/ssl/lib -lssl -lcrypto 
++PREFIX = %%PREFIX%%
 +BIN_DIR = %%PREFIX%%/bin
 +HELP_DIR = %%PREFIX%%/share/doc/w3m
 +HELP_DIR_JA = %%PREFIX%%/share/doc/ja/w3m
 +LIB_DIR = %%PREFIX%%/libexec/w3m
+ HELP_FILE = w3mhelp-w3m_ja.html
+-SYS_LIBRARIES = -lgpm  -lbsd -lnsl -ltermcap  -L/usr/local/ssl/lib -lssl -lcrypto 
 +SYS_LIBRARIES = -lncurses
  LOCAL_LIBRARIES = 
 -CC = gcc
 -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=
+@@ -109,4 +108,2 @@
  MATHLIB=-lm
 -GCLIB=gc/gc.a
 -GCTARGET=gc/gc.a
  RANLIB=ranlib
- MKDIR=mkdir -p
- VERSION=0.2.1
-@@ -120,26 +115,39 @@
- 
- #define JA 0
+@@ -122,12 +119,19 @@
  #define EN 1
 +#undef JAPANESE
 +#ifdef JAPANESE
@@ -89,7 +67,7 @@
 +#undef USE_SSL
 +#undef USE_SSL_VERIFY
  #define FTPPASS_HOSTNAMEGEN
- #define SHOW_PARAMS
+@@ -135,9 +139,15 @@
  
 -#define DEF_EDITOR "/bin/vi"
 -#define DEF_MAILER "/bin/mail"
@@ -112,5 +90,3 @@
 +#define HELP_FILE    "%%PREFIX%%/share/doc/w3m/w3mhelp-w3m_en.html"
 +#endif
  #define W3MCONFIG    "w3mconfig"
- 
- #define RC_DIR       "~/.w3m/"