o add w3m-image, w3m with Imlib-based inline image browsing capability.

o remove w3m-ssl, w3m has SSL support by default now.

PR:		28996, 28997, 28998
Submitted by:	maintainer

14 files changed, 167 insertions, 59 deletions

diff --git a/www/w3m-ssl/Makefile b/www/w3m-image/Makefile
index f4b2c7638d7f..fd98429703da 100644
--- a/www/w3m-ssl/Makefile
+++ b/www/w3m-image/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:   w3m-ssl
-# Date Created:                12 Oct 1999
+# New ports collection makefile for:   w3m-image
+# Date Created:                22 July 2001
 # Whom:                        MANTANI Nobutaka <nobutaka@nobutaka.com>
 #
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-ssl
+PKGNAMESUFFIX=	-image
 
 MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-USE_OPENSSL=	yes
+INLINE_IMAGE=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/w3m-image/pkg-comment b/www/w3m-image/pkg-comment
new file mode 100644
index 000000000000..2af128035aa9
--- /dev/null
+++ b/www/w3m-image/pkg-comment
@@ -0,0 +1 @@
+A pager/text-based WWW browser with inline image support
diff --git a/www/w3m-ssl/pkg-descr b/www/w3m-image/pkg-descr
index 076f238deccb..076f238deccb 100644
--- a/www/w3m-ssl/pkg-descr
+++ b/www/w3m-image/pkg-descr
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
new file mode 100644
index 000000000000..fd98429703da
--- /dev/null
+++ b/www/w3m-img/Makefile
@@ -0,0 +1,16 @@
+# 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-img/pkg-comment b/www/w3m-img/pkg-comment
new file mode 100644
index 000000000000..2af128035aa9
--- /dev/null
+++ b/www/w3m-img/pkg-comment
@@ -0,0 +1 @@
+A pager/text-based WWW browser with inline image support
diff --git a/www/w3m-img/pkg-descr b/www/w3m-img/pkg-descr
new file mode 100644
index 000000000000..076f238deccb
--- /dev/null
+++ b/www/w3m-img/pkg-descr
@@ -0,0 +1,14 @@
+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-ssl/pkg-comment b/www/w3m-ssl/pkg-comment
deleted file mode 100644
index 01e12b183d2d..000000000000
--- a/www/w3m-ssl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pager/text-based WWW browser with SSL support
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index ec56206c2750..2cfa3413223f 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	w3m
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	www ipv6
 MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
 		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
@@ -31,6 +31,10 @@ DOCS=		FAQ.html HISTORY MANUAL.html README \
 SED_CMD=	-e "s,%%PREFIX%%,${PREFIX},g" \
 		-e "s,%%LOCALBASE%%,${LOCALBASE},g"
 
+.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+USE_OPENSSL=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 400014
@@ -42,6 +46,10 @@ SED_CMD+=	-e "s,undef JAPANESE,define JAPANESE,g"
 MANLANG+=	ja
 DOCS_JP=	${DOCS} HISTORY.kokb README.SSL README.cookie \
 		README.keymap README.mailcap README.menu
+
+PLIST_SUB=	JAPANESE_ONLY=""
+.else
+PLIST_SUB=	JAPANESE_ONLY="@comment "
 .endif
 
 .if defined(USE_OPENSSL)
@@ -56,6 +64,30 @@ MAKE_FLAGS+=	DEFS="${SSL_CFLAGS} -I${LOCALBASE}/include" \
 MAKE_FLAGS+=	DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 .endif
 
+.if defined(INLINE_IMAGE)
+PATCH_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+PATCHFILES=	w3m-0.2.1-img-1.3.patch
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile
+
+USE_IMLIB=	yes
+
+DOCS_JP+=	README.img
+PLIST_SUB+=	INLINE_IMAGE_ONLY=""
+.else
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile.noimg
+PLIST_SUB+=	INLINE_IMAGE_ONLY="@comment "
+.endif
+
+pre-extract:
+.if !defined(WITHOUT_SSL)
+	@${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}
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 9af15a1026e8..b9b43f55bd30 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1 +1,2 @@
 MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
+MD5 (w3m-0.2.1-img-1.3.patch) = 33c68defc24791ac3439ddae4f8a7c47
diff --git a/www/w3m/files/extra-patch-XMakefile b/www/w3m/files/extra-patch-XMakefile
new file mode 100644
index 000000000000..1181ea69d3cd
--- /dev/null
+++ b/www/w3m/files/extra-patch-XMakefile
@@ -0,0 +1,60 @@
+--- XMakefile.orig	Mon Jul 16 11:14:38 2001
++++ XMakefile	Mon Jul 16 11:14:47 2001
+@@ -22,16 +22,16 @@
+ 
+ INCLUDES=-I.
+ 
+-DEFS=$(INCLUDES) # -DDEBUG
+-CFLAGS=$(MYCFLAGS) $(DEFS) 
+-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
++DEFS+=$(INCLUDES) # -DDEBUG
++CFLAGS+=$(DEFS) 
++LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
+ INSTALL=sh install.sh
+ INSTALL2=sh ../install.sh
+ AR=ar
+ 
+ all: $(TARGETS)
+ 
+-$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
++$(TARGET): $(ALLOBJS) $(ALIB)
+ 	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
+ 
+ $(ALIB): $(ALIBOBJS)
+@@ -86,24 +86,24 @@
+ install: $(TARGETS)
+ 	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
+ 	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
++	-$(MKDIR) $(DESTDIR)$(HELP_DIR_JA)
+ 	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
+-	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
+-	$(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
+-	$(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html
+-	$(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); \
+-		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)
++	$(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
++	$(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
++	$(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
++	$(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
++	for d in $(BOOKMARKER) $(HELPER) $(IMGDISPLAY) $(IMGSIZE); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
++	cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
+ 
+ uninstall:
+ 	-$(RM) $(BIN_DIR)/$(TARGET)
+ 	-$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html
+-	-$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html
++	-$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
+ 	-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html 
+-	-$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html 
+-	-$(RM) $(HELP_DIR)/w3mhelp.html
++	-$(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-ae b/www/w3m/files/extra-patch-XMakefile.noimg
index 0fc2a7566d2c..0fc2a7566d2c 100644
--- a/www/w3m/files/patch-ae
+++ b/www/w3m/files/extra-patch-XMakefile.noimg
diff --git a/www/w3m/files/patch-aa b/www/w3m/files/patch-aa
index 96befedc4673..48db944a9961 100644
--- a/www/w3m/files/patch-aa
+++ b/www/w3m/files/patch-aa
@@ -1,5 +1,5 @@
---- config.h.orig	Fri Mar 23 11:49:44 2001
-+++ config.h	Fri Mar 23 15:20:22 2001
+--- 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 (").
@@ -63,7 +63,7 @@
  RANLIB=ranlib
  MKDIR=mkdir -p
  VERSION=0.2.1
-@@ -120,26 +115,36 @@
+@@ -120,26 +115,39 @@
  
  #define JA 0
  #define EN 1
@@ -102,6 +102,9 @@
 +#define DEF_MAILER "/usr/bin/mail"
 +#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"
 +
++#define IMGSIZE "w3mimgsize"
++#define IMGDISPLAY "w3mimgdisplay"
++
 +#define LIB_DIR      "%%PREFIX%%/libexec/w3m"
 +#ifdef JAPANESE
 +#define HELP_FILE    "%%PREFIX%%/share/doc/ja/w3m/w3mhelp-w3m_ja.html"
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index a68ca3638050..446fd6d13579 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -2,19 +2,39 @@ bin/w3m
 libexec/w3m/dirlist.cgi
 libexec/w3m/w3mbookmark
 libexec/w3m/w3mhelperpanel
+%%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgdisplay
+%%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgsize
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/FAQ.html
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/HISTORY
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/HISTORY.kokb
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/MANUAL.html
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.SSL
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.cookie
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.dict
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.func
+%%PORTDOCS%%%%JAPANESE_ONLY%%%%INLINE_IMAGE_ONLY%%share/doc/ja/w3m/README.img
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.keymap
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.mailcap
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.menu
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/STORY.html
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/keymap.default
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/keymap.lynx
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/menu.default
+%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/menu.submenu
 share/doc/ja/w3m/w3mhelp-lynx_ja.html
 share/doc/ja/w3m/w3mhelp-w3m_ja.html
-share/doc/w3m/FAQ.html
-share/doc/w3m/HISTORY
-share/doc/w3m/MANUAL.html
-share/doc/w3m/README
-share/doc/w3m/README.dict
-share/doc/w3m/README.func
-share/doc/w3m/STORY.html
-share/doc/w3m/keymap.default
-share/doc/w3m/keymap.lynx
-share/doc/w3m/menu.default
-share/doc/w3m/menu.submenu
+%%PORTDOCS%%share/doc/w3m/FAQ.html
+%%PORTDOCS%%share/doc/w3m/HISTORY
+%%PORTDOCS%%share/doc/w3m/MANUAL.html
+%%PORTDOCS%%share/doc/w3m/README
+%%PORTDOCS%%share/doc/w3m/README.dict
+%%PORTDOCS%%share/doc/w3m/README.func
+%%PORTDOCS%%share/doc/w3m/STORY.html
+%%PORTDOCS%%share/doc/w3m/keymap.default
+%%PORTDOCS%%share/doc/w3m/keymap.lynx
+%%PORTDOCS%%share/doc/w3m/menu.default
+%%PORTDOCS%%share/doc/w3m/menu.submenu
 share/doc/w3m/w3mhelp-lynx_en.html
 share/doc/w3m/w3mhelp-w3m_en.html
 @dirrm libexec/w3m
diff --git a/www/w3m/pkg-plist.ja b/www/w3m/pkg-plist.ja
deleted file mode 100644
index 7f88ca42e9a1..000000000000
--- a/www/w3m/pkg-plist.ja
+++ /dev/null
@@ -1,39 +0,0 @@
-bin/w3m
-libexec/w3m/dirlist.cgi
-libexec/w3m/w3mbookmark
-libexec/w3m/w3mhelperpanel
-share/doc/ja/w3m/FAQ.html
-share/doc/ja/w3m/HISTORY
-share/doc/ja/w3m/HISTORY.kokb
-share/doc/ja/w3m/MANUAL.html
-share/doc/ja/w3m/README
-share/doc/ja/w3m/README.SSL
-share/doc/ja/w3m/README.cookie
-share/doc/ja/w3m/README.dict
-share/doc/ja/w3m/README.func
-share/doc/ja/w3m/README.keymap
-share/doc/ja/w3m/README.mailcap
-share/doc/ja/w3m/README.menu
-share/doc/ja/w3m/STORY.html
-share/doc/ja/w3m/keymap.default
-share/doc/ja/w3m/keymap.lynx
-share/doc/ja/w3m/menu.default
-share/doc/ja/w3m/menu.submenu
-share/doc/ja/w3m/w3mhelp-lynx_ja.html
-share/doc/ja/w3m/w3mhelp-w3m_ja.html
-share/doc/w3m/FAQ.html
-share/doc/w3m/HISTORY
-share/doc/w3m/MANUAL.html
-share/doc/w3m/README
-share/doc/w3m/README.dict
-share/doc/w3m/README.func
-share/doc/w3m/STORY.html
-share/doc/w3m/keymap.default
-share/doc/w3m/keymap.lynx
-share/doc/w3m/menu.default
-share/doc/w3m/menu.submenu
-share/doc/w3m/w3mhelp-lynx_en.html
-share/doc/w3m/w3mhelp-w3m_en.html
-@dirrm libexec/w3m
-@dirrm share/doc/ja/w3m
-@dirrm share/doc/w3m