From 7e96f65e45a52891e687bf509b8c4eea1d5b2b64 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 24 Mar 2001 12:56:14 +0000
Subject: [PATCH] - Take over maintainership; okay dugsong@ - Update to
 w3m-0.2.1. - Replace post-bsd.port.mk fumbling with FULLPKGNAME and PFRAGs. -
 Install Japanese docs for respective flavor. - Pull COMMENT* into Makefile. -
 Remove useless/obsolete verbiage from DESCR. - Miscellaneous cleanups.

---
 www/w3m/Makefile                    | 58 +++++++++++++++--------------
 www/w3m/files/md5                   |  6 +--
 www/w3m/patches/patch-display.c     | 13 -------
 www/w3m/patches/patch-gc_gcconfig.h |  1 +
 www/w3m/pkg/COMMENT                 |  1 -
 www/w3m/pkg/COMMENT-kanji           |  1 -
 www/w3m/pkg/DESCR                   | 46 +++--------------------
 www/w3m/pkg/PFRAG.kanji             |  7 ++++
 www/w3m/pkg/PFRAG.no-kanji          |  2 +
 www/w3m/pkg/PLIST                   |  5 ++-
 www/w3m/pkg/SECURITY                |  8 ++--
 11 files changed, 56 insertions(+), 92 deletions(-)
 delete mode 100644 www/w3m/patches/patch-display.c
 delete mode 100644 www/w3m/pkg/COMMENT
 delete mode 100644 www/w3m/pkg/COMMENT-kanji
 create mode 100644 www/w3m/pkg/PFRAG.kanji
 create mode 100644 www/w3m/pkg/PFRAG.no-kanji

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index f5c4a250aac..b12676aa57c 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,23 +1,26 @@
-# $OpenBSD: Makefile,v 1.14 2000/10/22 14:03:54 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2001/03/24 12:56:14 naddy Exp $
 
-DISTNAME=	w3m-0.1.10
+COMMENT=	"text-based web browser/pager"
+COMMENT-kanji=	"text-based web browser/pager, japanese flavor"
+
+DISTNAME=	w3m-0.2.1
 CATEGORIES=	www
-NEED_VERSION=	1.310
-MASTER_SITES=	ftp://ftp.firedrake.org/w3m/ \
-		ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
-		http://www.instinct.org/w3m/
-
+NEED_VERSION=	1.363
 HOMEPAGE=	http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/eng/
 
-MAINTAINER=	Dug Song <dugsong@monkey.org>
+MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
+		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
+		http://www.instinct.org/w3m/
+
 CONFIGURE_STYLE= simple
-CONFIGURE_ARGS= -nonstop -prefix="${PREFIX}" -cflags="${CFLAGS} -Wall" \
+CONFIGURE_ARGS= -nonstop -prefix="${PREFIX}" -cflags="${CFLAGS}" \
 		-model=monster
 CONFIGURE_ENV=	use_nntp=y dmail=mail ded=vi dbrowser=lynx dcc="${CC}" \
 		dtermlib="${TERMLIB}" def_helpdir="${PREFIX}/share/w3m" \
@@ -26,29 +29,30 @@ CONFIGURE_ENV=	use_nntp=y dmail=mail ded=vi dbrowser=lynx dcc="${CC}" \
 FLAVORS=	kanji
 FLAVOR?=
 
-.if ${FLAVOR:L:Mkanji}
-CATEGORIES+=		japanese
-CONFIGURE_ARGS+=	-lang=ja
-# XXX w3m resets kterm to jis before displaying a page anyway.
-CONFIGURE_ARGS+=	-code=n
-.else
-CONFIGURE_ARGS+=	-lang=en
-.endif
-
 DOCS=	FAQ.html HISTORY MANUAL.html \
-	README README.cygwin README.dict README.func STORY.html \
+	README README.dict README.func STORY.html \
 	keymap.default keymap.lynx menu.default menu.submenu
 
+.if ${FLAVOR:L:Mkanji}
+
+FULLPKGNAME=	ja-${PKGNAME}
+CATEGORIES+=	japanese
+CONFIGURE_ARGS+= -lang=ja
+# XXX w3m resets kterm to jis before displaying a page anyway.
+CONFIGURE_ARGS+= -code=n
+DOCS+=	README.SSL README.cookie README.keymap README.mailcap README.menu
+DOCDIR=	${WRKSRC}/doc-jp
+
+.else
+
+CONFIGURE_ARGS+= -lang=en
+DOCDIR=	${WRKSRC}/doc
+
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/w3m
 	${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/w3m
+	cd ${DOCDIR} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/w3m
 
 .include <bsd.port.mk>
-# XXX Tweak PKGNAME
-.if ${FLAVOR:L:Mkanji}
-PKGNAME:=	ja-${PKGNAME:S/-kanji//}
-PKG_ARGS+=	-C 'w3m-*'
-.else
-PKG_ARGS+=	-C 'ja-w3m-*'
-.endif
diff --git a/www/w3m/files/md5 b/www/w3m/files/md5
index 3bd26112a3a..498b4719c55 100644
--- a/www/w3m/files/md5
+++ b/www/w3m/files/md5
@@ -1,3 +1,3 @@
-MD5 (w3m-0.1.10.tar.gz) = 2e0ed5e8db8ac8d7eb1e6996b74ace1d
-RMD160 (w3m-0.1.10.tar.gz) = 97f91ac762d0ce2c7bce8b2502c1cc71484ddbf8
-SHA1 (w3m-0.1.10.tar.gz) = 7b4df57e9ff6e9b7955ed7f91cf3abc8fa1c64c9
+MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
+RMD160 (w3m-0.2.1.tar.gz) = 0571973bb1e3fc9073aa4c97dff7fac6b6a47f56
+SHA1 (w3m-0.2.1.tar.gz) = 3ae98283f02f4faf05af76ee0b022f01c1301d29
diff --git a/www/w3m/patches/patch-display.c b/www/w3m/patches/patch-display.c
deleted file mode 100644
index fa8ce1ddf68..00000000000
--- a/www/w3m/patches/patch-display.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- display.c.orig	Thu Jul  6 15:43:29 2000
-+++ display.c	Thu Jul  6 15:43:53 2000
-@@ -717,8 +717,10 @@
-     }
-     else {
-         buf->pos = l->len -1;
-+#ifdef JP_CHARSET
-         if (CharType(p[buf->pos]) == PC_KANJI2)
-             buf->pos--;
-+#endif                          /* JP_CHARSET */
-     }
-     cpos = COLPOS(l, buf->pos);
-     buf->visualpos = cpos - buf->currentColumn;
diff --git a/www/w3m/patches/patch-gc_gcconfig.h b/www/w3m/patches/patch-gc_gcconfig.h
index 3c9c5003ac2..795a5680235 100644
--- a/www/w3m/patches/patch-gc_gcconfig.h
+++ b/www/w3m/patches/patch-gc_gcconfig.h
@@ -1,3 +1,4 @@
+$OpenBSD: patch-gc_gcconfig.h,v 1.2 2001/03/24 12:56:16 naddy Exp $
 --- gc/gcconfig.h.orig	Thu Jul  6 15:46:53 2000
 +++ gc/gcconfig.h	Thu Jul  6 15:49:15 2000
 @@ -22,6 +22,25 @@
diff --git a/www/w3m/pkg/COMMENT b/www/w3m/pkg/COMMENT
deleted file mode 100644
index 99a9da40b22..00000000000
--- a/www/w3m/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-text-based web browser/pager
diff --git a/www/w3m/pkg/COMMENT-kanji b/www/w3m/pkg/COMMENT-kanji
deleted file mode 100644
index c8ddf215148..00000000000
--- a/www/w3m/pkg/COMMENT-kanji
+++ /dev/null
@@ -1 +0,0 @@
-text-based web browser/pager, japanese flavor
diff --git a/www/w3m/pkg/DESCR b/www/w3m/pkg/DESCR
index 5b4caef406b..0a845184b2c 100644
--- a/www/w3m/pkg/DESCR
+++ b/www/w3m/pkg/DESCR
@@ -1,43 +1,9 @@
-w3m is a lightweight text-mode pager that doubles as a WWW browser.
+w3m is a pager/text-based WWW browser.  It is similar to Lynx, but
+it has several features Lynx doesn't have:
 
-It's main features (over lynx) are:
-
-	* HTML tables
-	* HTML frames
-	* HTML from stdin
-	* horizontal scrolling
-
-While it may not be as strictly accurate as lynx, w3m seems to render
-HTML pages more intelligently and more compactly. 
-
-The following notes come from the README:
-------------------------------------------------------------
-
-     w3m is a pager with WWW capability. It IS a pager, but it can be
-used as a text-mode WWW browser.
-
-     The features of w3m are as follows:
-
-* When reading HTML document, you can follow links and view images
-  (using external image viewer).
-* It has 'internet message mode', which determines the type of document
-  from header. If the Content-Type: field of the document is text/html,
-  that document is displayed as HTML document.
-* You can change URL description like 'http://hogege.net' in plain text
-  into link to that URL.
-
-Current problems are: 
-
-* Resize behaviour is incomplete.
-* It can't show images inline. (It seems to be impossible as far as using
-  xterm)
-* It doesn't decode MIME-body of the document.
-* Online manuals are poor.
-
-Feel free to send your opinion to the author.
-
-        Akinori Ito
-        Faculty of Engineering, Yamagata University
-        aito@ei5sun.yz.yamagata-u.ac.jp
+* w3m can render tables
+* w3m can render frames (by converting frames into tables)
+* w3m can display documents from standard input
+* w3m is small
 
 WWW: ${HOMEPAGE}
diff --git a/www/w3m/pkg/PFRAG.kanji b/www/w3m/pkg/PFRAG.kanji
new file mode 100644
index 00000000000..f0d6e66b7b4
--- /dev/null
+++ b/www/w3m/pkg/PFRAG.kanji
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PFRAG.kanji,v 1.1 2001/03/24 12:56:17 naddy Exp $
+@pkgcfl w3m-*
+share/doc/w3m/README.SSL
+share/doc/w3m/README.cookie
+share/doc/w3m/README.keymap
+share/doc/w3m/README.mailcap
+share/doc/w3m/README.menu
diff --git a/www/w3m/pkg/PFRAG.no-kanji b/www/w3m/pkg/PFRAG.no-kanji
new file mode 100644
index 00000000000..33c513f4618
--- /dev/null
+++ b/www/w3m/pkg/PFRAG.no-kanji
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.no-kanji,v 1.1 2001/03/24 12:56:17 naddy Exp $
+@pkgcfl ja-w3m-*
diff --git a/www/w3m/pkg/PLIST b/www/w3m/pkg/PLIST
index 297c3a542a2..ddc21bf1efa 100644
--- a/www/w3m/pkg/PLIST
+++ b/www/w3m/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.5 2000/07/10 00:14:11 d Exp $
+@comment $OpenBSD: PLIST,v 1.6 2001/03/24 12:56:17 naddy Exp $
+%%kanji%%
+!%%kanji%%
 bin/w3m
 libexec/w3m/dirlist.cgi
 libexec/w3m/w3mbookmark
@@ -8,7 +10,6 @@ share/doc/w3m/FAQ.html
 share/doc/w3m/HISTORY
 share/doc/w3m/MANUAL.html
 share/doc/w3m/README
-share/doc/w3m/README.cygwin
 share/doc/w3m/README.dict
 share/doc/w3m/README.func
 share/doc/w3m/STORY.html
diff --git a/www/w3m/pkg/SECURITY b/www/w3m/pkg/SECURITY
index 8d361269115..b1d5e9233a9 100644
--- a/www/w3m/pkg/SECURITY
+++ b/www/w3m/pkg/SECURITY
@@ -1,9 +1,7 @@
-this code is a total nightmare.
+This code is a total nightmare.
 
-a pain to read, and lots of strcpy/strcat/sprintf's which actually
+A pain to read, and lots of strcpy/strcat/sprintf's which actually
 turn out to be okay, after adding a die-when-out-of-memory callback
 for the boehm garbage collector.
 
-there are undoubtedly other issues with this code. caveat user.
-
--d.
+There are undoubtedly other issues with this code.  Caveat user.