Update w3m to 0.3.1 and w3m-m17n to 0.3.1+20020717.

8 files changed, 46 insertions, 202 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 784a0c5..5982cfc 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -16,15 +16,15 @@ MAINTAINER?=	nobutaka@FreeBSD.org
 
 LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
 
-W3M_VERSION=			0.3
-M17N_VERSION=			20020311
-M17N_BASE_W3M_VERSION=		0.3
+W3M_VERSION=			0.3.1
+M17N_VERSION=			20020717
+M17N_BASE_W3M_VERSION=		0.3.1
 
 HAS_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ARGS=	-nonstop --prefix=${PREFIX} \
 			--libdir=${PREFIX}/libexec/w3m \
 			--helpdir=${PREFIX}/share/doc/w3m \
-			--helpdir-ja=${PREFIX}/share/doc/ja/w3m \
 			--gc-includedir=${LOCALBASE}/include \
 			--gc-libdir=${LOCALBASE}/lib \
 			-cflags="${CFLAGS}"
@@ -35,16 +35,12 @@ SCRIPTS_ENV=	HOSTNAME=${HOSTNAME} WRKSRC=${WRKSRC} PREFIX=${PREFIX} \
 		SSL_LIBS="${SSL_LIBS}" EXTRA_SSL_LIBS="${EXTRA_SSL_LIBS}" \
 		INLINE_IMAGE=${INLINE_IMAGE} M17N=${M17N}
 
-MAN1=		w3m.1
-MANLANG=	""
-CFLAGS+=	-pipe
+MAN1=		w3m.1 w3mman.1
+MANLANG=	"" ja
 
-CONFIG_H=	${WRKSRC}/config.h
 DOCS=		FAQ.html HISTORY MANUAL.html README \
 		README.dict README.func STORY.html keymap.default \
 		keymap.lynx menu.default menu.submenu
-SED_CMD=	-e "s,%%PREFIX%%,${PREFIX},g" \
-		-e "s,%%LOCALBASE%%,${LOCALBASE},g"
 
 .if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
 USE_OPENSSL=	yes
@@ -58,24 +54,20 @@ MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
 DISTNAME=	${PORTNAME}-${M17N_BASE_W3M_VERSION}-m17n-${M17N_VERSION}
 CONFIGURE_ARGS+=	--suffix=""
 
-PLIST_SUB+=	M17N_ONLY="" NO_M17N="@comment "
+PLIST_SUB+=	M17N="" NO_M17N="@comment "
 .else
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-configure-no-m17n \
-		${PATCHDIR}/extra-patch-etc.c-no-m17n
-PLIST_SUB+=	M17N_ONLY="@comment " NO_M17N=""
+PLIST_SUB+=	M17N="@comment " NO_M17N=""
 .endif
 
 .if defined(JAPANESE)
 RUN_DEPENDS=	migemo:${PORTSDIR}/japanese/migemo
 
-MANLANG+=	ja
-DOCS_JP=	${DOCS} README.SSL README.cookie \
-		README.keymap README.mailcap README.menu
+DOCS_JP=	${DOCS} README.SSL README.cookie README.keymap README.mailcap \
+		README.menu README.migemo
 
-PLIST_SUB+=	JAPANESE_ONLY=""
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-search.c-japanese
+PLIST_SUB+=	JAPANESE=""
 .else
-PLIST_SUB+=	JAPANESE_ONLY="@comment "
+PLIST_SUB+=	JAPANESE="@comment "
 .endif
 
 .if defined(USE_OPENSSL)
@@ -93,13 +85,11 @@ USE_IMLIB=	yes
 
 DOCS+=		README.img
 DOCS_JP+=	README.img
-PLIST_SUB+=	INLINE_IMAGE_ONLY=""
-
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-image.c-img
+PLIST_SUB+=	INLINE_IMAGE=""
 
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 .else
-PLIST_SUB+=	INLINE_IMAGE_ONLY="@comment "
+PLIST_SUB+=	INLINE_IMAGE="@comment "
 
 # Don't use pkg-message
 PKGMESSAGE=	${NONEXISTENT}
@@ -122,6 +112,11 @@ pre-extract:
 	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|\`\(expr\) \(.*\) : \(.*\)`|`\1 \\( \2 : \3 \\)`|' \
+		${WRKSRC}/configure
+
 post-install:
 .if !defined(NOPORTDOCS)
 .if defined(JAPANESE)
@@ -140,10 +135,7 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/doc/README.m17n ${PREFIX}/share/doc/w3m
 .endif
 .endif
-	@${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1
-.if defined(JAPANESE)
-	@${INSTALL_MAN} ${WRKSRC}/doc-jp/w3m.1 ${PREFIX}/man/ja/man1
-.endif
+	@${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${PREFIX}/man/ja/man1
 .if defined(INLINE_IMAGE)
 	@${CAT} ${PKGMESSAGE}
 .endif
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index f9fe628..03bc693 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,2 +1,2 @@
-MD5 (w3m-0.3.tar.gz) = d1dab828926801901276fbe1bbfedd5a
-MD5 (w3m-0.3-m17n-20020311.tar.gz) = f1ae157d1172d0985218b14058df24a1
+MD5 (w3m-0.3.1-m17n-20020717.tar.gz) = b93d1f8caa780b7128e0a9b10e9fcae0
+MD5 (w3m-0.3.1.tar.gz) = 825f792dfda9416ffa24e3ac30bdd268
diff --git a/www/w3m/files/extra-patch-configure-no-m17n b/www/w3m/files/extra-patch-configure-no-m17n
deleted file mode 100644
index 0c2c51ea..0000000
--- a/www/w3m/files/extra-patch-configure-no-m17n
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun Mar 31 22:20:25 2002
-+++ configure	Sun Mar 31 22:16:46 2002
-@@ -1821,7 +1821,7 @@
-   then
-     echo "You have setpgrp( pid, pgrp )."
-     def_have_setpgrp='#define HAVE_SETPGRP'
--    def_setpgrp='#define setpgrp() setpgrp( 0, 0 )'
-+    def_setpgrp='#define SETPGRP() setpgrp( 0, 0 )'
-   else
-     def_have_setpgrp=''
-   fi
diff --git a/www/w3m/files/extra-patch-etc.c-no-m17n b/www/w3m/files/extra-patch-etc.c-no-m17n
deleted file mode 100644
index 14bdaf2..0000000
--- a/www/w3m/files/extra-patch-etc.c-no-m17n
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc.c.orig	Sun Mar 31 19:42:53 2002
-+++ etc.c	Sun Mar 31 19:43:48 2002
-@@ -1075,7 +1075,7 @@
- 	flush_tty();
- 	if ((pid = fork()) == 0) {
- 	    reset_signals();
--	    setpgrp();
-+	    SETPGRP();
- 	    close_tty();
- 	    fclose(stdout);
- 	    fclose(stderr);
diff --git a/www/w3m/files/extra-patch-image.c-img b/www/w3m/files/extra-patch-image.c-img
deleted file mode 100644
index 7ac5f4b..0000000
--- a/www/w3m/files/extra-patch-image.c-img
+++ /dev/null
@@ -1,11 +0,0 @@
---- image.c.orig	Sun Mar 31 19:43:11 2002
-+++ image.c	Sun Mar 31 19:43:37 2002
-@@ -106,7 +106,7 @@
- 	reset_signals();
- 	signal(SIGINT, SIG_IGN);
- #ifdef HAVE_SETPGRP
--	setpgrp();
-+	SETPGRP();
- #endif
- 	close_tty();
- 	close(fdr[0]);
diff --git a/www/w3m/files/extra-patch-search.c-japanese b/www/w3m/files/extra-patch-search.c-japanese
deleted file mode 100644
index 07f66c7..0000000
--- a/www/w3m/files/extra-patch-search.c-japanese
+++ /dev/null
@@ -1,11 +0,0 @@
---- search.c.orig	Sun Mar 31 19:43:19 2002
-+++ search.c	Sun Mar 31 19:43:56 2002
-@@ -52,7 +52,7 @@
- 	/* child */
- 	reset_signals();
- #ifdef HAVE_SETPGRP
--	setpgrp();
-+	SETPGRP();
- #endif
- 	close_tty();
- 	close(fdr[0]);
diff --git a/www/w3m/files/patch-configure b/www/w3m/files/patch-configure
deleted file mode 100644
index 4ed12f1..0000000
--- a/www/w3m/files/patch-configure
+++ /dev/null
@@ -1,106 +0,0 @@
---- configure.orig	Sun Mar 31 22:17:49 2002
-+++ configure	Sun Mar 31 22:16:46 2002
-@@ -53,19 +53,22 @@
-     shift
-     ;;
-   -prefix=*|--prefix=*)
--    prefix=`expr "$1" : "-*prefix=\(.*\)"`
-+    prefix=`expr \( "$1" : "-*prefix=\(.*\)" \)`
-     ;;
-   -bindir=*|--bindir=*)
--    bindir=`expr "$1" : "-*bindir=\(.*\)"`
-+    bindir=`expr \( "$1" : "-*bindir=\(.*\)" \)`
-     ;;
-   -libdir=*|--libdir=*)
--    libdir=`expr "$1" : "-*libdir=\(.*\)"`
-+    libdir=`expr \( "$1" : "-*libdir=\(.*\)" \)`
-     ;;
-   -helpdir=*|--helpdir=*)
--    helpdir=`expr "$1" : "-*helpdir=\(.*\)"`
-+    helpdir=`expr \( "$1" : "-*helpdir=\(.*\)" \)`
-+    ;;
-+  -helpdir-ja=*|--helpdir-ja=*)
-+    helpdir_ja=`expr \( "$1" : "-*helpdir-ja=\(.*\)" \)`
-     ;;
-   -sysconfdir=*|--sysconfdir=*)
--    sysconfdir=`expr "$1" : "-*sysconfdir=\(.*\)"`
-+    sysconfdir=`expr \( "$1" : "-*sysconfdir=\(.*\)" \)`
-     ;;
-   -lang=en|--lang=en|-lang=EN|--lang=EN)
-     lang=EN
-@@ -101,19 +104,19 @@
-     dldflags=`echo $1 | sed -e 's/-*ldflags=//'`
-     ;;
-   --ssl-includedir=*)
--    ssl_includedir=`expr "$1" : "--ssl-includedir=\(.*\)"`
-+    ssl_includedir=`expr \( "$1" : "--ssl-includedir=\(.*\)" \)`
-     ;;
-   --ssl-libdir=*)
--    ssl_libdir=`expr "$1" : "--ssl-libdir=\(.*\)"`
-+    ssl_libdir=`expr \( "$1" : "--ssl-libdir=\(.*\)" \)`
-     ;;
-   --gc-includedir=*)
--    gc_includedir=`expr "$1" : "--gc-includedir=\(.*\)"`
-+    gc_includedir=`expr \( "$1" : "--gc-includedir=\(.*\)" \)`
-     ;;
-   --gc-libdir=*)
--    gc_libdir=`expr "$1" : "--gc-libdir=\(.*\)"`
-+    gc_libdir=`expr \( "$1" : "--gc-libdir=\(.*\)" \)`
-     ;;
-   --mimetypes=*)
--    mimetypes=`expr "$1" : "--mimetypes=\(.*\)"`
-+    mimetypes=`expr \( "$1" : "--mimetypes=\(.*\)" \)`
-     ;;
- 
-   -help|--help)
-@@ -541,6 +544,16 @@
- helpdir=$_dir
- echo "helpdir='$helpdir'" >> config.param
- 
-+d_helpdir_ja=$helpdir_ja
-+if [ -z "$d_helpdir_ja" ]; then
-+  d_helpdir_ja="$topdir/share/w3m"
-+fi
-+echo "Which directory do you want to put the Japanese helpfile?"
-+Echo "(default: $d_helpdir_ja) "
-+readdir "$d_helpdir_ja"
-+helpdir_ja=$_dir
-+echo "helpdir_ja='$helpdir_ja'" >> config.param
-+
- d_sysconfdir=$sysconfdir
- if [ -z "$d_sysconfdir" ]; then
-   d_sysconfdir="$topdir/etc/w3m"
-@@ -1189,7 +1202,7 @@
- 
- ####### perl
- perl=`./which perl`
--if [ `expr "$perl" : 'not found'` != 0 ]; then
-+if [ `expr \( "$perl" : 'not found' \)` != 0 ]; then
-   echo "You don't have perl."
-   perl=/usr/local/bin/perl
-   have_perl=n
-@@ -1976,7 +1989,7 @@
- cur_ver=`sed -n 's/^#define CURRENT_VERSION *"w3m\/\([^"]*\)".*$/\1/p' version.c`
- for h_in in w3mhelp-*_*.html.in
- do
--  h=`expr "$h_in" : '\(.*\)\.in'`
-+  h=`expr \( "$h_in" : '\(.*\)\.in' \)`
-   sed -e 's/@CURRENT_VERSION@/'$cur_ver'/' $h_in > $h
- done
- 
-@@ -2067,6 +2080,7 @@
- 
- BIN_DIR = $bindir
- HELP_DIR = $helpdir
-+HELP_DIR_JA = $helpdir_ja
- LIB_DIR = $libdir
- ETC_DIR = $sysconfdir
- RC_DIR = ~/.w3m
-@@ -2140,6 +2154,7 @@
- 
- #define LIB_DIR      "$libdir"
- #define HELP_DIR     "$helpdir"
-+#define HELP_DIR_JA  "$helpdir_ja"
- #define ETC_DIR	     "$sysconfdir"
- #define HELP_FILE    "w3mhelp.html"
- #define HELP_CGI     "w3mhelp"
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index 2bc1e77..96dcca0 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -8,33 +8,35 @@ libexec/w3m/w3mhelp.cgi
 libexec/w3m/w3mmail.cgi
 libexec/w3m/w3mman2html.cgi
 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/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
+libexec/w3m/xface2xpm
+%%INLINE_IMAGE%%libexec/w3m/w3mimgdisplay
+%%INLINE_IMAGE%%libexec/w3m/w3mimgsize
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/FAQ.html
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/HISTORY
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/MANUAL.html
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.SSL
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.cookie
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.dict
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.func
+%%PORTDOCS%%%%JAPANESE%%%%INLINE_IMAGE%%share/doc/ja/w3m/README.img
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.keymap
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.mailcap
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.menu
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.migemo
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/STORY.html
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/keymap.default
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/keymap.lynx
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/menu.default
+%%PORTDOCS%%%%JAPANESE%%share/doc/ja/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%%%%INLINE_IMAGE_ONLY%%share/doc/w3m/README.img
-%%PORTDOCS%%%%M17N_ONLY%%share/doc/w3m/README.m17n
+%%PORTDOCS%%%%INLINE_IMAGE%%share/doc/w3m/README.img
+%%PORTDOCS%%%%M17N%%share/doc/w3m/README.m17n
 %%PORTDOCS%%share/doc/w3m/STORY.html
 %%PORTDOCS%%share/doc/w3m/keymap.default
 %%PORTDOCS%%share/doc/w3m/keymap.lynx
@@ -46,4 +48,4 @@ share/doc/w3m/w3mhelp-funcdesc.ja.pl
 share/doc/w3m/w3mhelp-funcname.pl
 @dirrm libexec/w3m
 @dirrm share/doc/w3m
-%%PORTDOCS%%%%JAPANESE_ONLY%%@dirrm share/doc/ja/w3m
+%%PORTDOCS%%%%JAPANESE%%@dirrm share/doc/ja/w3m