Update to 0.2.3.1.

www/w3m/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.32 2001/11/17 02:36:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.33 2001/12/20 22:36:10 naddy Exp $
 
 ONLY_FOR_ARCHS=	i386 sparc m68k
 
 COMMENT=		"text-based web browser/pager"
 COMMENT-japanese=	"Japanese text-based web browser/pager"
 
-DISTNAME=	w3m-0.2.2
+DISTNAME=	w3m-0.2.3.1
 CATEGORIES=	www
 NEED_VERSION=	1.498
 HOMEPAGE=	http://w3m.sourceforge.net/
@@ -24,13 +24,16 @@ FLAVORS=	japanese
 FLAVOR?=
 
 CONFIGURE_STYLE= simple
-CONFIGURE_ARGS= -nonstop -prefix="${PREFIX}" -cflags="${CFLAGS}" \
-		-model=monster
-CONFIGURE_ENV=	use_nntp=y use_ssl_verify=y \
-		dmail=mail ded=vi dbrowser=lynx dcc="${CC}" \
-		dtermlib="${TERMLIB}" def_helpdir="${PREFIX}/share/w3m" \
-		def_libdir="${PREFIX}/libexec/w3m" \
-		MIME_TYPES="/var/www/conf/mime.types"
+CONFIGURE_ARGS=	--nonstop \
+		--prefix="${PREFIX}" \
+		--libdir="${PREFIX}/libexec/w3m" \
+		--helpdir="${PREFIX}/share/w3m" \
+		--sysconfdir="${SYSCONFDIR}/w3m" \
+		--model=monster \
+		--mimetypes=/var/www/mime.types
+CONFIGURE_ENV=	use_ssl_verify=y \
+		dmail=mail ded=vi dbrowser=lynx
+
 NO_REGRESS=	Yes
 
 DOCS=	FAQ.html HISTORY MANUAL.html \
@@ -41,21 +44,18 @@ DOCS=	FAQ.html HISTORY MANUAL.html \
 
 FULLPKGNAME=	ja-${PKGNAME}
 CATEGORIES+=	japanese
-CONFIGURE_ARGS+= -lang=ja -code=n
+CONFIGURE_ARGS+= --lang=ja --code=n
 DOCS+=		README.SSL README.cookie README.keymap \
 		README.mailcap README.menu
 DOCSRC=		${WRKSRC}/doc-jp
 
 .else
 
-CONFIGURE_ARGS+= -lang=en
+CONFIGURE_ARGS+= --lang=en
 DOCSRC=		${WRKSRC}/doc
 
 .endif
 
-pre-build:
-	@cd ${WRKBUILD}/gc; ${MAKE_PROGRAM} clean
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/w3m
 	${INSTALL_MAN} ${DOCSRC}/w3m.1 ${PREFIX}/man/man1

www/w3m/distinfo

@@ -1,3 +1,3 @@
-MD5 (w3m-0.2.2.tar.gz) = 5c7f93827471fa86080a742b4bbaf51d
-RMD160 (w3m-0.2.2.tar.gz) = 3281b083e1a16d83a0957db8af98d0ab4e7bef0a
-SHA1 (w3m-0.2.2.tar.gz) = 93757dc398cf93306705ac56a424613bd31cc3d6
+MD5 (w3m-0.2.3.1.tar.gz) = 515dca4e5069c5e94a71d11c221dca90
+RMD160 (w3m-0.2.3.1.tar.gz) = bf5ab3bf14a19e1e1b2cf5f14c3de3b9bc279371
+SHA1 (w3m-0.2.3.1.tar.gz) = ec8454be329a338f5c9ba78eed13e5d51308be15

www/w3m/patches/patch-configure

@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.4 2001/11/17 02:36:41 naddy Exp $
+$OpenBSD: patch-configure,v 1.5 2001/12/20 22:36:10 naddy Exp $
 --- configure.orig	Thu Nov 15 01:32:13 2001
 +++ configure	Sat Nov 17 03:01:53 2001
 @@ -859,6 +859,7 @@ else
@@ -17,19 +17,3 @@ $OpenBSD: patch-configure,v 1.4 2001/11/17 02:36:41 naddy Exp $
  
  case $sysname in
    linux|Linux|LINUX|aix|Aix|AIX)
-@@ -967,6 +969,7 @@ echo "dldflags='$ldflags'" >> config.par
- echo "Checking machine dependency."
- 
- ###### mime.types
-+if [ -z "$MIME_TYPES" ]; then
- MIME_TYPES=""
- for d in /usr/lib /usr/local/lib $prefix/lib /usr/local/lib/mosaic /usr/local/mosaic /usr/local/netscape /usr/local/lib/netscape
- do
-@@ -977,6 +980,7 @@ done
- if [ -z "$MIME_TYPES" ]; then
-   echo "Global mime.types not found; Hope /usr/local/lib/mime.types works."
-   MIME_TYPES=/usr/local/lib/mime.types
-+fi
- fi
- 
- ####### ranlib

www/w3m/pkg/PLIST

@@ -1,10 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.9 2001/11/16 21:35:45 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.10 2001/12/20 22:36:10 naddy Exp $
 %%japanese%%
 !%%japanese%%
 bin/w3m
+bin/w3mman
 libexec/w3m/dirlist.cgi
+libexec/w3m/inflate
+libexec/w3m/multipart.cgi
 libexec/w3m/w3mbookmark
+libexec/w3m/w3mhelp.cgi
 libexec/w3m/w3mhelperpanel
+libexec/w3m/w3mman2html.cgi
 man/man1/w3m.1
 share/doc/w3m/FAQ.html
 share/doc/w3m/HISTORY
@@ -17,11 +22,10 @@ share/doc/w3m/keymap.default
 share/doc/w3m/keymap.lynx
 share/doc/w3m/menu.default
 share/doc/w3m/menu.submenu
-share/w3m/w3mhelp-lynx_en.html
-share/w3m/w3mhelp-lynx_ja.html
-share/w3m/w3mhelp-w3m_en.html
-share/w3m/w3mhelp-w3m_ja.html
+share/w3m/w3mhelp-funcdesc.en.pl
+share/w3m/w3mhelp-funcdesc.ja.pl
+share/w3m/w3mhelp-funcname.pl
 share/w3m/w3mhelp.html
-@dirrm libexec/w3m
-@dirrm share/doc/w3m
 @dirrm share/w3m
+@dirrm share/doc/w3m
+@dirrm libexec/w3m