From 0c27a9897ca8c057855a730950e3457f303c465c Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 20 Jan 2002 22:17:51 +0000
Subject: [PATCH] Resurrect image flavor now that Hironori Sakamoto's patch
 tracks the w3m head version again.

---
 www/w3m/Makefile        | 27 ++++++++++++++++++++++++---
 www/w3m/distinfo        |  3 +++
 www/w3m/pkg/DESCR       |  6 ++++--
 www/w3m/pkg/PFRAG.image |  4 ++++
 www/w3m/pkg/PLIST       |  3 ++-
 5 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 www/w3m/pkg/PFRAG.image

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 5e4ea1430fd..d8bc5d44f73 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,11 +1,16 @@
-# $OpenBSD: Makefile,v 1.35 2002/01/07 18:16:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.36 2002/01/20 22:17:51 naddy Exp $
 
 ONLY_FOR_ARCHS=	i386 sparc m68k
 
 COMMENT=		"text-based web browser/pager"
 COMMENT-japanese=	"Japanese text-based web browser/pager"
+COMMENT-image=		"text-based web browser/pager with inline image support"
+COMMENT-japanese-image=	"Japanese text-based web browser/pager with image support"
 
-DISTNAME=	w3m-0.2.4
+VERSION=	0.2.4
+IMG_VERSION=	1.18
+
+DISTNAME=	w3m-${VERSION}
 CATEGORIES=	www
 NEED_VERSION=	1.498
 HOMEPAGE=	http://w3m.sourceforge.net/
@@ -19,8 +24,12 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	w3m
+MASTER_SITES0=		http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+SUPDISTFILES=		${DISTFILES} ${IMG_PATCH}
+IMG_PATCH=		w3m-${VERSION}-img-${IMG_VERSION}.patch.gz:0
+PATCH_DIST_STRIP=	-p1
 
-FLAVORS=	japanese
+FLAVORS=	japanese image
 FLAVOR?=
 
 CONFIGURE_STYLE= simple
@@ -38,9 +47,21 @@ DOCS=	FAQ.html HISTORY MANUAL.html \
 	README README.dict README.func STORY.html \
 	keymap.default keymap.lynx menu.default menu.submenu
 
+.if ${FLAVOR:L:Mimage}
+PKGNAME=	w3m-${VERSION}.${IMG_VERSION}
+PATCHFILES=	${IMG_PATCH}
+LIB_DEPENDS=	Imlib.19::graphics/imlib
+CONFIGURE_ENV+=	use_image=y
+DOCS+=		README.img
+.endif
+
 .if ${FLAVOR:L:Mjapanese}
 
+.  if ${FLAVOR:L:Mimage}
+FULLPKGNAME=	ja-${PKGNAME}-image
+.  else
 FULLPKGNAME=	ja-${PKGNAME}
+.  endif
 CATEGORIES+=	japanese
 CONFIGURE_ARGS+= --lang=ja --code=n
 DOCS+=		README.SSL README.cookie README.keymap \
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 939b16cc797..810aea3d89f 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,3 +1,6 @@
+MD5 (w3m-0.2.4-img-1.18.patch.gz) = 06651becf01b9c9fc43b203c58b14310
 MD5 (w3m-0.2.4.tar.gz) = 36407b35c7520092d00dd996c08d9645
+RMD160 (w3m-0.2.4-img-1.18.patch.gz) = 64536c4474f0944eec0c6330d5fa6fd0bd161419
 RMD160 (w3m-0.2.4.tar.gz) = 75a7be99f7eb7fafd4029b0e07ed9028c6d2d7e7
+SHA1 (w3m-0.2.4-img-1.18.patch.gz) = 7fedb9fe3e750d6d5c6c49ed5c1895c003eef302
 SHA1 (w3m-0.2.4.tar.gz) = 4bc929f8515f0f33fb47b71c8f670e45afd16dfa
diff --git a/www/w3m/pkg/DESCR b/www/w3m/pkg/DESCR
index 6f3ac0fdf4e..aba7ee06fd3 100644
--- a/www/w3m/pkg/DESCR
+++ b/www/w3m/pkg/DESCR
@@ -7,7 +7,9 @@ it has several features Lynx doesn't have:
 * w3m is small
 
 Available flavors:
-  japanese      - Provide Japanese menus and documentation, and
-	          properly display Japanese characters in kterm.
+  japanese  - Provide Japanese menus and documentation, and properly
+              display Japanese characters in kterm.
+  image     - Supports displaying inline images when run from an X11
+              terminal emulator.
 
 WWW: ${HOMEPAGE}
diff --git a/www/w3m/pkg/PFRAG.image b/www/w3m/pkg/PFRAG.image
new file mode 100644
index 00000000000..9f1235fabcf
--- /dev/null
+++ b/www/w3m/pkg/PFRAG.image
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PFRAG.image,v 1.3 2002/01/20 22:17:51 naddy Exp $
+libexec/w3m/w3mimgdisplay
+libexec/w3m/w3mimgsize
+share/doc/w3m/README.img
diff --git a/www/w3m/pkg/PLIST b/www/w3m/pkg/PLIST
index 55bb5ec261e..fe49354044d 100644
--- a/www/w3m/pkg/PLIST
+++ b/www/w3m/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.10 2001/12/20 22:36:10 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.11 2002/01/20 22:17:51 naddy Exp $
 %%japanese%%
 !%%japanese%%
+%%image%%
 bin/w3m
 bin/w3mman
 libexec/w3m/dirlist.cgi