splitted w3m package into w3m and w3m-img, which disables/enables inline

image support, respectively.

inline image support requires glib, which is so large for such as light-
weight text-based browser w3m especially on slower ports.

it's based on the diffs supplied by uebayashi.  This also addresses
pkg/16495.

6 files changed, 236 insertions, 171 deletions

diff --git a/www/w3m-img/DESCR b/www/w3m-img/DESCR
new file mode 100644
index 00000000000..5994d869427
--- /dev/null
+++ b/www/w3m-img/DESCR
@@ -0,0 +1,25 @@
+W3m is a termial-based WWW browser which supports HTML tables and frames.
+It's small, so faster than other WWW browsers.  It also supports following
+URL by clicking mouse button on the anchor in xterm and its variants from
+990526 version.  Additionally, this package enables inline-image support
+which is added in version 0.3.
+
+It uses Boehm-GC to implement the table/frame parser.
+
+Quoted from README.m17n:
+
+Muntilingualizaion of w3m 
+                                                              2002/02/16
+                                                              H. Sakamoto
+
+Introduction
+
+  I have tried the muntilingualization of w3m (w3m-m17n).
+  The patch for w3m-0.2.1 is available on the following site.
+
+    http://www2u.biglobe.ne.jp/~hsaka/w3m/index.html#m17n
+                                          patch/w3m-0.3-m17n-20020316.tar.gz
+                                          patch/README.m17n
+
+  It is a development version. And enough test is not preformed because
+  I can understand Japanese only. Please use, test, and report bugs.
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
new file mode 100644
index 00000000000..d0876d7b30e
--- /dev/null
+++ b/www/w3m-img/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/05/10 06:29:39 kei Exp $
+#
+
+PKGNAME=	w3m-img-${W3M_BASE_VERS}
+COMMENT=	multilingualized version of a pager/text-based browser w3m with inline image support
+
+CONFLICTS+=	w3m-[0-9]*
+
+# enable image support
+W3M_USE_IMAGE=	YES
+
+PLIST_SRC=	${.CURDIR}/../../www/w3m/PLIST
+
+.include "../../www/w3m/Makefile.common"
diff --git a/www/w3m-img/distinfo b/www/w3m-img/distinfo
new file mode 100644
index 00000000000..22d9e306e5b
--- /dev/null
+++ b/www/w3m-img/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/05/10 06:29:39 kei Exp $
+
+SHA1 (w3m-0.3-m17n-20020316.tar.gz) = 680f46e46d24fe39f1cd47c8cdde6d4c70253b39
+Size (w3m-0.3-m17n-20020316.tar.gz) = 2245689 bytes
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index df84503c322..06ff9157c19 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,174 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2002/04/24 13:48:48 martti Exp $
+# $NetBSD: Makefile,v 1.36 2002/05/10 06:27:22 kei Exp $
 #
 
-DISTNAME=	w3m-${W3M_VERS}
 PKGNAME=	w3m-${W3M_BASE_VERS}
-PKGREVISION=	# null
-CATEGORIES=	www
-MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-
-MAINTAINER=	kei@netbsd.org
-HOMEPAGE=	http://www2u.biglobe.ne.jp/~hsaka/w3m/
+PKGREVISION=	1
 COMMENT=	multilingualized version of a pager/text-based browser w3m
 
-CONFLICTS+=	w3m-m17n-[0-9]*
-
-USE_BUILDLINK_ONLY=	yes
-
-W3M_VERS=	${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS}
-W3M_BASE_VERS=	0.3
-W3M_M17N_VERS=	20020316
-
-# w3m source with m17n patch applied.
-W3M_SRC=	${DISTNAME}${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}/w3m-${W3M_VERS}
-DISTFILES+=	${W3M_SRC}
-EXTRACT_ONLY=	${W3M_SRC}
-
-# multibyte/wide character support was split into libwc in latest version of
-# w3m-m17n.
-#LIBWC_SRC=	libwc-latest.tar.gz
-#LIBWC_WRKSRC=	${WRKDIR}/w3m-${W3M_VERS}
-#DISTFILES+=	${LIBWC_SRC}
-#EXTRACT_ONLY+=	${LIBWC_SRC}
-
-HELPDIR=        share/doc/w3m
-HELPERDIR=      lib/w3m
-
-# configure will check IPv6 readiness automatically
-BUILD_DEFS+=	USE_INET6
-
-.include "../../mk/bsd.prefs.mk"
-.if defined(EXTRACT_USING_PAX)
-EXTRACT_ELEMENTS=	-c ${DISTNAME}/gc/\*
-.else
-EXTRACT_ELEMENTS=	--exclude ${DISTNAME}/gc/\*
-.endif
-
-# Always enable multiligualization.
-W3M_USE_M17N=			YES
-# Set this to YES if you want unicode support.
-W3M_USE_UNICODE?=		YES
-# set this to YES to use Japanese messages.
-W3M_USE_JAPANESE_MESSAGES?=	NO
-# Set this to YES to use lynx like key binding.
-W3M_USE_LYNX_KEY?=		NO
-# set this to YES if you want HTTPS support.
-W3M_USE_SSL?=			YES
-# set this to YES if you want HTTP cookie support.
-W3M_USE_COOKIE?=        	YES
-# set this to YES if you want mouse support.
-W3M_USE_MOUSE?=			YES
-# set this to YES if you want color support.
-W3M_USE_COLOR?=			YES
-
-CONFIGURE_ENV+=	use_m17n=y
-.if ${W3M_USE_UNICODE} == YES
-CONFIGURE_ENV+=	use_unicode=y
-.else
-CONFIGURE_ENV+=	use_unicode=n
-.endif
-CONFIGURE_ENV+=	charset=ISO-2022-JP-2
-.if ${W3M_USE_JAPANESE_MESSAGES} == YES
-CONFIGURE_ARGS+=	--lang=ja
-HELP_LANG=			_ja
-.else
-CONFIGURE_ARGS+=	--lang=en
-HELP_LANG=			_en
-.endif
-.if ${W3M_USE_COLOR} == YES
-CONFIGURE_ENV+=	use_color=y
-.else
-CONFIGURE_ENV+=	use_color=n
-.endif
-.if ${W3M_USE_MOUSE} == YES
-CONFIGURE_ENV+=	use_mouse=y
-.else
-CONFIGURE_ENV+=	use_mouse=n
-.endif
-.if ${W3M_USE_COOKIE} == YES
-CONFIGURE_ENV+=	use_cookie=y
-.else
-CONFIGURE_ENV+=	use_cookie=n
-.endif
-.if ${W3M_USE_SSL} == YES
-USE_SSL=			YES
-CONFIGURE_ENV+=	use_ssl=y use_ssl_verify=n
-CONFIGURE_ARGS+=	--ssl-includedir=${BUILDLINK_DIR}/include/openssl
-CONFIGURE_ARGS+=	--ssl-libdir=${BUILDLINK_DIR}/lib
-.include "../../security/openssl/buildlink.mk"
-.else
-CONFIGURE_ENV+=	use_ssl=n use_ssl_verify=n
-.endif
-.if ${W3M_USE_LYNX_KEY} == YES
-CONFIGURE_ENV+=	lynx_key=y
-HELP_W3M=			-lynx
-.else
-CONFIGURE_ENV+=	lynx_key=n
-HELP_W3M=			-w3m
-.endif
-CONFIGURE_ENV+= use_menu=y use_matrix=n use_image=y use_ansi_color=y
-CONFIGURE_ENV+= use_help_cgi=n use_migemo=n
-CONFIGURE_ENV+= ded=vi dmail=Mail dbrowser=
-CONFIGURE_ENV+= dcc="${CC}" dtermlib="-ltermcap"
-CONFIGURE_ENV+= dmodel=6
-CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
-CONFIGURE_ARGS+= --yes
-CONFIGURE_ARGS+= --suffix=
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --bindir=${PREFIX}/bin
-CONFIGURE_ARGS+= --libdir=${PREFIX}/${HELPERDIR}
-CONFIGURE_ARGS+= --helpdir=${PREFIX}/${HELPDIR}
-CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_DIR}/lib
-
-post-extract:
-	@(cd ${WRKSRC}/doc; ${RM} -fr CVS)
-	@(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS)
-#	@${LN} ${LIBWC_WRKSRC} ${WRKSRC}/libwc
-
-post-patch:
-	${FIND} ${WRKSRC} -type f -name '*.orig' | ${XARGS} ${RM}
-
-# do not look at previous configuration
-do-configure:
-	@(cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \
-	    INSTALL="${INSTALL_SCRIPT}"                             \
-	    CFLAGS="${CFLAGS}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	    ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
-
-pre-build:
-	@(cd ${WRKSRC}; \
-	 ${MAKE} XXMakefile; \
-	 ${MV} XXMakefile XXMakefile.gen; \
-	 ${SED} -e '/^GCLIB/s|gc/gc.a|-lgc|' -e '/^GCTARGET/s|gc/gc.a||' \
-		XXMakefile.gen > XXMakefile)
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/w3m ${LOCALBASE}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${LOCALBASE}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc-jp/w3m.1 ${LOCALBASE}/man/ja_JP.EUC/man1
-	${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPDIR}
-	${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_en.html ${LOCALBASE}/${HELPDIR}
-	${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_ja.html ${LOCALBASE}/${HELPDIR}
-	${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_en.html ${LOCALBASE}/${HELPDIR}
-	${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_ja.html ${LOCALBASE}/${HELPDIR}
-	# Use ${PAX} to discard uid/gid
-	(cd ${WRKSRC}; ${PAX} -w doc doc-jp) | \
-	    (cd ${LOCALBASE}/${HELPDIR}; ${PAX} -r)
-	${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPERDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/inflate ${LOCALBASE}/${HELPERDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/w3mbookmark ${LOCALBASE}/${HELPERDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/w3mhelperpanel ${LOCALBASE}/${HELPERDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/w3mimgdisplay ${LOCALBASE}/${HELPERDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/w3mimgsize ${LOCALBASE}/${HELPERDIR}
-
-post-install:
-	(cd ${LOCALBASE}/${HELPDIR}; \
-	    ${RM} -f w3mhelp.html; \
-	    ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html)
+CONFLICTS+=	w3m-img-[0-9]*
 
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../devel/boehm-gc/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "../../www/w3m/Makefile.common"
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
new file mode 100644
index 00000000000..b865a40ec9e
--- /dev/null
+++ b/www/w3m/Makefile.common
@@ -0,0 +1,186 @@
+# $NetBSD: Makefile.common,v 1.1 2002/05/10 06:27:22 kei Exp $
+#
+
+DISTNAME=	w3m-${W3M_VERS}
+CATEGORIES=	www
+MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+
+MAINTAINER=	kei@netbsd.org
+HOMEPAGE=	http://www2u.biglobe.ne.jp/~hsaka/w3m/
+
+USE_BUILDLINK_ONLY=	yes
+
+W3M_VERS=	${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS}
+W3M_BASE_VERS=	0.3
+W3M_M17N_VERS=	20020316
+
+# w3m source with m17n patch applied.
+W3M_SRC=	${DISTNAME}${EXTRACT_SUFX}
+WRKSRC=		${WRKDIR}/w3m-${W3M_VERS}
+DISTFILES+=	${W3M_SRC}
+EXTRACT_ONLY=	${W3M_SRC}
+
+# multibyte/wide character support was split into libwc in latest version of
+# w3m-m17n.
+#LIBWC_SRC=	libwc-latest.tar.gz
+#LIBWC_WRKSRC=	${WRKDIR}/w3m-${W3M_VERS}
+#DISTFILES+=	${LIBWC_SRC}
+#EXTRACT_ONLY+=	${LIBWC_SRC}
+
+HELPDIR=        share/doc/w3m
+HELPERDIR=      lib/w3m
+
+# configure will check IPv6 readiness automatically
+BUILD_DEFS+=	USE_INET6
+
+.include "../../mk/bsd.prefs.mk"
+.if defined(EXTRACT_USING_PAX)
+EXTRACT_ELEMENTS=	-c ${DISTNAME}/gc/\*
+.else
+EXTRACT_ELEMENTS=	--exclude ${DISTNAME}/gc/\*
+.endif
+
+# Always enable multiligualization.
+W3M_USE_M17N=			YES
+# Set this to YES if you want unicode support.
+W3M_USE_UNICODE?=		YES
+# set this to YES to use Japanese messages.
+W3M_USE_JAPANESE_MESSAGES?=	NO
+# Set this to YES to use lynx like key binding.
+W3M_USE_LYNX_KEY?=		NO
+# set this to YES if you want HTTPS support.
+W3M_USE_SSL?=			YES
+# set this to YES if you want HTTP cookie support.
+W3M_USE_COOKIE?=        	YES
+# set this to YES if you want mouse support.
+W3M_USE_MOUSE?=			YES
+# set this to YES if you want color support.
+W3M_USE_COLOR?=			YES
+# set this to YES if you want image support.
+W3M_USE_IMAGE?=			NO
+
+CONFIGURE_ENV+=	use_m17n=y
+.if ${W3M_USE_UNICODE} == YES
+CONFIGURE_ENV+=	use_unicode=y
+.else
+CONFIGURE_ENV+=	use_unicode=n
+.endif
+CONFIGURE_ENV+=	charset=ISO-2022-JP-2
+.if ${W3M_USE_JAPANESE_MESSAGES} == YES
+CONFIGURE_ARGS+=	--lang=ja
+HELP_LANG=			_ja
+.else
+CONFIGURE_ARGS+=	--lang=en
+HELP_LANG=			_en
+.endif
+.if ${W3M_USE_COLOR} == YES
+CONFIGURE_ENV+=	use_color=y
+.else
+CONFIGURE_ENV+=	use_color=n
+.endif
+.if ${W3M_USE_MOUSE} == YES
+CONFIGURE_ENV+=	use_mouse=y
+.else
+CONFIGURE_ENV+=	use_mouse=n
+.endif
+.if ${W3M_USE_COOKIE} == YES
+CONFIGURE_ENV+=	use_cookie=y
+.else
+CONFIGURE_ENV+=	use_cookie=n
+.endif
+.if ${W3M_USE_SSL} == YES
+USE_SSL=			YES
+CONFIGURE_ENV+=	use_ssl=y use_ssl_verify=n
+CONFIGURE_ARGS+=	--ssl-includedir=${BUILDLINK_DIR}/include/openssl
+CONFIGURE_ARGS+=	--ssl-libdir=${BUILDLINK_DIR}/lib
+.include "../../security/openssl/buildlink.mk"
+.else
+CONFIGURE_ENV+=	use_ssl=n use_ssl_verify=n
+.endif
+.if ${W3M_USE_LYNX_KEY} == YES
+CONFIGURE_ENV+=	lynx_key=y
+HELP_W3M=			-lynx
+.else
+CONFIGURE_ENV+=	lynx_key=n
+HELP_W3M=			-w3m
+.endif
+.if ${W3M_USE_IMAGE} == YES
+CONFIGURE_ENV+= use_image=y 
+.else
+CONFIGURE_ENV+= use_image=n 
+.endif
+CONFIGURE_ENV+= use_menu=y use_matrix=n use_ansi_color=y
+CONFIGURE_ENV+= use_help_cgi=n use_migemo=n
+CONFIGURE_ENV+= ded=vi dmail=Mail dbrowser=
+CONFIGURE_ENV+= dcc="${CC}" dtermlib="-ltermcap"
+CONFIGURE_ENV+= dmodel=6
+CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
+CONFIGURE_ARGS+= --yes
+CONFIGURE_ARGS+= --suffix=
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --bindir=${PREFIX}/bin
+CONFIGURE_ARGS+= --libdir=${PREFIX}/${HELPERDIR}
+CONFIGURE_ARGS+= --helpdir=${PREFIX}/${HELPDIR}
+CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_DIR}/lib
+
+.if ${W3M_USE_IMAGE} == YES
+PLIST_SUBST+=	USE_IMAGE=''
+.else
+PLIST_SUBST+=	USE_IMAGE='@comment '
+.endif
+
+post-extract:
+	@(cd ${WRKSRC}/doc; ${RM} -fr CVS)
+	@(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS)
+#	@${LN} ${LIBWC_WRKSRC} ${WRKSRC}/libwc
+
+post-patch:
+	${FIND} ${WRKSRC} -type f -name '*.orig' | ${XARGS} ${RM}
+
+# do not look at previous configuration
+do-configure:
+	@(cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \
+	    INSTALL="${INSTALL_SCRIPT}"                             \
+	    CFLAGS="${CFLAGS}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+	    ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
+
+pre-build:
+	@(cd ${WRKSRC}; \
+	 ${MAKE} XXMakefile; \
+	 ${MV} XXMakefile XXMakefile.gen; \
+	 ${SED} -e '/^GCLIB/s|gc/gc.a|-lgc|' -e '/^GCTARGET/s|gc/gc.a||' \
+		XXMakefile.gen > XXMakefile)
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/w3m ${LOCALBASE}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${LOCALBASE}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc-jp/w3m.1 ${LOCALBASE}/man/ja_JP.EUC/man1
+	${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPDIR}
+	${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_en.html ${LOCALBASE}/${HELPDIR}
+	${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_ja.html ${LOCALBASE}/${HELPDIR}
+	${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_en.html ${LOCALBASE}/${HELPDIR}
+	${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_ja.html ${LOCALBASE}/${HELPDIR}
+	# Use ${PAX} to discard uid/gid
+	(cd ${WRKSRC}; ${PAX} -w doc doc-jp) | \
+	    (cd ${LOCALBASE}/${HELPDIR}; ${PAX} -r)
+	${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPERDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/inflate ${LOCALBASE}/${HELPERDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/w3mbookmark ${LOCALBASE}/${HELPERDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/w3mhelperpanel ${LOCALBASE}/${HELPERDIR}
+.if ${W3M_USE_IMAGE} == YES
+	${INSTALL_PROGRAM} ${WRKSRC}/w3mimgdisplay ${LOCALBASE}/${HELPERDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/w3mimgsize ${LOCALBASE}/${HELPERDIR}
+.endif
+
+post-install:
+	(cd ${LOCALBASE}/${HELPDIR}; \
+	    ${RM} -f w3mhelp.html; \
+	    ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html)
+
+.include "../../graphics/jpeg/buildlink.mk"
+.if ${W3M_USE_IMAGE} == YES
+.include "../../graphics/imlib/buildlink.mk"
+.endif
+.include "../../devel/boehm-gc/buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/w3m/PLIST b/www/w3m/PLIST
index b552a35e745..fde92532c96 100644
--- a/www/w3m/PLIST
+++ b/www/w3m/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/21 23:34:32 kei Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/05/10 06:27:22 kei Exp $
 bin/w3m
 man/man1/w3m.1
 man/ja_JP.EUC/man1/w3m.1
@@ -51,6 +51,6 @@ share/doc/w3m/doc-jp/w3m.1
 lib/w3m/inflate
 lib/w3m/w3mbookmark
 lib/w3m/w3mhelperpanel
-lib/w3m/w3mimgdisplay
-lib/w3m/w3mimgsize
+${USE_IMAGE}lib/w3m/w3mimgdisplay
+${USE_IMAGE}lib/w3m/w3mimgsize
 @dirrm lib/w3m