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

16 files changed, 59 insertions, 118 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 49cd7bd5e813..dc2a493d2359 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -376,7 +376,7 @@
     SUBDIR += vje30-trial
     SUBDIR += w3
     SUBDIR += w3m
-    SUBDIR += w3m-image
+    SUBDIR += w3m-img
     SUBDIR += wdic-fpw
     SUBDIR += weather-emacs20
     SUBDIR += web1913-fpw
diff --git a/japanese/w3m-image/Makefile b/japanese/w3m-image/Makefile
deleted file mode 100644
index b711b60f3fde..000000000000
--- a/japanese/w3m-image/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:   ja-w3m-image
-# Date Created:                22 July 2001
-# Whom:                        MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-image
-CATEGORIES=	japanese
-
-MASTERDIR=	${.CURDIR}/../../www/w3m
-PKGDIR=		${.CURDIR}
-PLIST=		${MASTERDIR}/pkg-plist
-
-JAPANESE=	Yes
-INLINE_IMAGE=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/japanese/w3m-image/pkg-comment b/japanese/w3m-image/pkg-comment
deleted file mode 100644
index b381afb44a0f..000000000000
--- a/japanese/w3m-image/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pager/text-based WWW browser with Japanese and inline image support
diff --git a/japanese/w3m-image/pkg-descr b/japanese/w3m-image/pkg-descr
deleted file mode 100644
index 182f816a20e4..000000000000
--- a/japanese/w3m-image/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-w3m is a pager/text-based WWW browser.
-
-It is a similar application to Lynx, but it has several features Lynx
-doesn't have.
-
-* Rendering tables.
-* Rendering frames. (It converts frames into a table).
-* Display documents given from standard input.
-* Small binary size.
-
-WWW: http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/index.html
-
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/japanese/w3m-img/Makefile b/japanese/w3m-img/Makefile
index b711b60f3fde..5a1b1f7498cb 100644
--- a/japanese/w3m-img/Makefile
+++ b/japanese/w3m-img/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-image
+PKGNAMESUFFIX=	-img
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../www/w3m
diff --git a/www/Makefile b/www/Makefile
index 96799ab9c493..8e3e49232ae7 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -291,7 +291,7 @@
     SUBDIR += w3-4
     SUBDIR += w3c-httpd
     SUBDIR += w3m
-    SUBDIR += w3m-image
+    SUBDIR += w3m-img
     SUBDIR += w3mir
     SUBDIR += wb0
     SUBDIR += wcol
diff --git a/www/w3m-image/Makefile b/www/w3m-image/Makefile
deleted file mode 100644
index fd98429703da..000000000000
--- a/www/w3m-image/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:   w3m-image
-# Date Created:                22 July 2001
-# Whom:                        MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-image
-
-MASTERDIR=	${.CURDIR}/../../www/w3m
-PKGDIR=		${.CURDIR}
-PLIST=		${MASTERDIR}/pkg-plist
-
-INLINE_IMAGE=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/w3m-image/pkg-comment b/www/w3m-image/pkg-comment
deleted file mode 100644
index 2af128035aa9..000000000000
--- a/www/w3m-image/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pager/text-based WWW browser with inline image support
diff --git a/www/w3m-image/pkg-descr b/www/w3m-image/pkg-descr
deleted file mode 100644
index 076f238deccb..000000000000
--- a/www/w3m-image/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-w3m is a pager/text-based WWW browser.
-
-It is a similar application to Lynx, but it has several features Lynx
-doesn't have.
-
-* Rendering tables.
-* Rendering frames. (It converts frames into a table).
-* Display documents given from standard input.
-* Small binary size.
-
-WWW: http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/eng/index.html
-
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index fd98429703da..709c2bf874e3 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-image
+PKGNAMESUFFIX=	-img
 
 MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index d7d7bf920d8c..5ff41f84d275 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	w3m
-PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTVERSION=	${W3M_VERSION}
 CATEGORIES+=	www ipv6
 MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
 		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
@@ -15,11 +14,22 @@ MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
 		ftp://ftp.umlauf.de/pub/w3m/ \
 		http://www.instinct.org/w3m/ \
 		http://grilli.net/mirrors/w3m/download/
+DISTNAME=	${PORTNAME}-${W3M_VERSION}
 
 MAINTAINER?=	nobutaka@nobutaka.com
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
 
+W3M_VERSION=	0.2.1
+IMG_VERSION=	1.10
+PORTREVISION?=	1
+
+.if defined(INLINE_IMAGE)
+PORTVERSION:=	${PORTVERSION}+${IMG_VERSION}
+.else
+PORTREVISION=	1
+.endif
+
 MAN1=		w3m.1
 MANLANG=	""
 CFLAGS+=	-pipe
@@ -66,16 +76,23 @@ MAKE_FLAGS+=	DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
 .if defined(INLINE_IMAGE)
 PATCH_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-PATCHFILES=	w3m-0.2.1-img-1.3.patch
+PATCHFILES=	${DISTNAME}-img-${IMG_VERSION}.patch
+PATCH_DIST_STRIP=	-p1
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile
 
 USE_IMLIB=	yes
 
+DOCS+=		README.img
 DOCS_JP+=	README.img
 PLIST_SUB+=	INLINE_IMAGE_ONLY=""
+
+PKGMESSAGE=	${MASTERDIR}/pkg-message
 .else
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile.noimg
 PLIST_SUB+=	INLINE_IMAGE_ONLY="@comment "
+
+# Don't use pkg-message
+PKGMESSAGE=	${NONEXISTENT}
 .endif
 
 pre-extract:
@@ -83,11 +100,6 @@ pre-extract:
 	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
 .endif
 
-.if defined(INLINE_IMAGE)
-post-patch:
-	@${CP} ${WRKSRC}/README.img ${WRKSRC}/doc-jp/
-.endif
-
 post-configure:
 	@${CP} ${CONFIG_H} ${CONFIG_H}.in
 	@${SED} ${SED_CMD} < ${CONFIG_H}.in > ${CONFIG_H}
@@ -113,5 +125,8 @@ post-install:
 .if defined(JAPANESE)
 	@${INSTALL_MAN} ${WRKSRC}/doc-jp/w3m.1 ${PREFIX}/man/ja/man1
 .endif
+.if defined(INLINE_IMAGE)
+	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index b9b43f55bd30..6aa730f9692c 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,2 +1,2 @@
 MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
-MD5 (w3m-0.2.1-img-1.3.patch) = 33c68defc24791ac3439ddae4f8a7c47
+MD5 (w3m-0.2.1-img-1.10.patch) = 8cd810eb925fd5da17d04ffcb2b22b1a
diff --git a/www/w3m/files/extra-patch-XMakefile b/www/w3m/files/extra-patch-XMakefile
index 1181ea69d3cd..ed4f27a937bf 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 48db944a9961..674330e205be 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/"
diff --git a/www/w3m/pkg-message b/www/w3m/pkg-message
new file mode 100644
index 000000000000..5cbeb642b192
--- /dev/null
+++ b/www/w3m/pkg-message
@@ -0,0 +1,12 @@
+**********************************************************
+* To display images in proper positions,                 *
+* you should set font size of your terminal emulator to  *
+* "# of pixels per character" and "# of pixels per line" *
+* in Option Setting Panel.                               *
+*                                                        *
+* For example, if you use 14 pixel fonts, the values     *
+* should be these.                                       *
+*                                                        *
+* # of pixels per character = 7                          *
+* # of pixels per line = 14                              *
+**********************************************************
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index 446fd6d13579..33facd70cd97 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -30,6 +30,7 @@ share/doc/ja/w3m/w3mhelp-w3m_ja.html
 %%PORTDOCS%%share/doc/w3m/README
 %%PORTDOCS%%share/doc/w3m/README.dict
 %%PORTDOCS%%share/doc/w3m/README.func
+%%PORTDOCS%%%%INLINE_IMAGE_ONLY%%share/doc/w3m/README.img
 %%PORTDOCS%%share/doc/w3m/STORY.html
 %%PORTDOCS%%share/doc/w3m/keymap.default
 %%PORTDOCS%%share/doc/w3m/keymap.lynx