update to w3m(-0.2.4)-m17n-20020108

2002-01-07 20:40:15 +00:00 · 2002-01-07 20:40:15 +00:00 · 4e76620bf2
commit 4e76620bf2
parent 64fb9cbe8d
8 changed files with 45 additions and 141 deletions
--- a/www/w3m-m17n/Makefile
+++ b/www/w3m-m17n/Makefile
@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/11/17 02:46:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.2 2002/01/07 20:40:15 naddy Exp $

 ONLY_FOR_ARCHS=	i386 sparc m68k

 COMMENT=		"multi-script text-based web browser/pager"
 COMMENT-japanese=	"Japanese multi-script text-based web browser/pager"

-DISTNAME=	w3m-m17n-0.19
+PKGNAME=	w3m-m17n-20020108
+DISTNAME=	w3m-0.2.4-m17n-20020108
 CATEGORIES=	www
 NEED_VERSION=	1.498
 HOMEPAGE=	http://www2u.biglobe.ne.jp/~hsaka/w3m/index.html#m17n
@ -23,13 +24,15 @@ FLAVORS=	japanese
 FLAVOR?=

 CONFIGURE_STYLE= simple
-CONFIGURE_ARGS= -nonstop -prefix="${PREFIX}" -cflags="${CFLAGS}" \
-		-model=monster -charset=UTF-8
-CONFIGURE_ENV=	use_nntp=y use_ssl_verify=y \
-		dmail=mail ded=vi dbrowser=lynx dcc="${CC}" \
-		dtermlib="${TERMLIB}" def_helpdir="${PREFIX}/share/w3m-m17n" \
-		def_libdir="${PREFIX}/libexec/w3m-m17n" \
-		MIME_TYPES="/var/www/conf/mime.types"
+CONFIGURE_ARGS=	--nonstop \
+		--prefix="${PREFIX}" \
+		--sysconfdir="${SYSCONFDIR}/w3m-m17n" \
+		--model=monster \
+		--mimetypes=/var/www/mime.types \
+		--charset=UTF-8
+CONFIGURE_ENV=	use_ssl_verify=y \
+		dmail=mail ded=vi dbrowser=lynx dcc="${CC}"
+
 NO_REGRESS=	Yes

 DOCS=	FAQ.html HISTORY MANUAL.html \
@ -40,15 +43,15 @@ DOCS=	FAQ.html HISTORY MANUAL.html \

 FULLPKGNAME=		ja-${PKGNAME}
 CATEGORIES+=		japanese
-CONFIGURE_ARGS+=	-lang=ja
-CONFIGURE_ARGS+=	-code=n
+CONFIGURE_ARGS+=	--lang=ja
+CONFIGURE_ARGS+=	--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
--- a/www/w3m-m17n/distinfo
+++ b/www/w3m-m17n/distinfo
@ -1,3 +1,3 @@
-MD5 (w3m-m17n-0.19.tar.gz) = 96243978524a7b8fba6cbb413026eeff
-RMD160 (w3m-m17n-0.19.tar.gz) = 49edaf9f712166fb013e93f30bbb491d8c9a3d91
-SHA1 (w3m-m17n-0.19.tar.gz) = 50d4f73440a1ea9886294421e6fee8e1480e583f
+MD5 (w3m-0.2.4-m17n-20020108.tar.gz) = 1e84bd8397c0aafaec2092e9db8002a4
+RMD160 (w3m-0.2.4-m17n-20020108.tar.gz) = 0aa9db6b31973d64324e2a4cf1c3265739c5e44a
+SHA1 (w3m-0.2.4-m17n-20020108.tar.gz) = 78d4480919b58833e4f1389a6f9468425333dbfe
--- a/www/w3m-m17n/patches/patch-configure
+++ b/www/w3m-m17n/patches/patch-configure
@ -1,20 +1,19 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2001/11/17 02:46:02 naddy Exp $
--- configure.orig	Sat Nov 17 02:55:46 2001
-+++ configure	Sat Nov 17 02:56:34 2001
-@@ -1043,7 +1043,7 @@ echo "dldflags='$ldflags'" >> config.par
- echo "Checking machine dependency."
- 
- ###### mime.types
-MIME_TYPES=""
-+if [ -z "$MIME_TYPES" ]; then
- for d in /usr/lib /usr/local/lib /usr/local/lib/mosaic /usr/local/mosaic /usr/local/netscape /usr/local/lib/netscape
- do
-   if [ -f $d/mime.types ]; then
-@@ -1053,6 +1053,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
+$OpenBSD: patch-configure,v 1.2 2002/01/07 20:40:15 naddy Exp $
+--- configure.orig	Thu Dec 20 16:42:49 2001
+++ configure	Thu Dec 20 23:58:54 2001
+@@ -1024,6 +1024,7 @@ else
+   inflate=
 fi
 
- ####### ranlib
+if false; then # always use the included gclib for now
+ gclib=''
+ gcinclude=''
+ gctarget=''
+@@ -1043,6 +1044,7 @@ do
+     break
+   fi
+ done
+fi
+ 
+ case $sysname in
+   linux|Linux|LINUX|aix|Aix|AIX)
--- a/www/w3m-m17n/patches/patch-gc_gcconfig_h
+++ b/www/w3m-m17n/patches/patch-gc_gcconfig_h
@ -1,29 +0,0 @@
-$OpenBSD: patch-gc_gcconfig_h,v 1.1.1.1 2001/11/17 02:46:02 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 @@
- 
- /* Machine specific parts contributed by various people.  See README file. */
- 
-+#if defined(__unix__) && !defined(unix)
-+#    define unix
-+#endif
-+#if defined(__i386__) && !defined(i386)
-+#    define i386
-+#endif
-+#if defined(__sparc__) && !defined(sparc)
-+#    define sparc
-+#endif
-+#if defined(__m68k__) && !defined(m68k)
-+#    define m68k
-+#endif
-+#if defined(__m88k__) && !defined(m88k)
-+#    define m88k
-+#endif
-+#if defined(__alpha__) && !defined(alpha)
-+#    define alpha
-+#endif
-+
- /* First a unified test for Linux: */
- # if defined(linux) || defined(__linux__)
- #    define LINUX
--- a/www/w3m-m17n/patches/patch-indep_c
+++ b/www/w3m-m17n/patches/patch-indep_c
@ -1,20 +0,0 @@
-$OpenBSD: patch-indep_c,v 1.1.1.1 2001/11/17 02:46:02 naddy Exp $
--- indep.c.orig	Sat Sep 29 03:02:38 2001
-+++ indep.c	Sat Sep 29 03:03:32 2001
-@@ -74,14 +74,14 @@ currentdir()
- #endif				/* __EMX__ */
- 
- char *
-cleanupName(char *name)
-+cleanupName2(char *name, int flag)
- {
-     char *buf, *p, *q;
- 
-     buf = allocStr(name, 0);
-     p = buf;
-     q = name;
-    while (*q != '\0' && *q != '?') {
-+    while (*q != '\0' && (*q != '?' || ! flag)) {
- 	if (strncmp(p, "/../", 4) == 0) {	/* foo/bar/../FOO */
- 	    if (p - 2 == buf && strncmp(p - 2, "..", 2) == 0) {
- 		/* ../../       */
--- a/www/w3m-m17n/patches/patch-indep_h
+++ b/www/w3m-m17n/patches/patch-indep_h
@ -1,13 +0,0 @@
-$OpenBSD: patch-indep_h,v 1.1.1.1 2001/11/17 02:46:02 naddy Exp $
--- indep.h.orig	Sat Sep 29 03:03:43 2001
-+++ indep.h	Sat Sep 29 03:04:10 2001
-@@ -20,7 +20,8 @@ extern char *getescapecmd(char **s);
- extern char *allocStr(const char *s, int len);
- extern int strCmp(const void *s1, const void *s2);
- extern char *currentdir(void);
-extern char *cleanupName(char *name);
-+extern char *cleanupName2(char *name, int flag);
-+#define cleanupName(name) cleanupName2((name), TRUE)
- extern char *expandPath(char *name);
- extern char *strcasestr(char *s1, char *s2);
- extern int strcasemstr(char *str, char *srch[], char **ret_ptr);
--- a/www/w3m-m17n/patches/patch-url_c
+++ b/www/w3m-m17n/patches/patch-url_c
@ -1,39 +0,0 @@
-$OpenBSD: patch-url_c,v 1.1.1.1 2001/11/17 02:46:02 naddy Exp $
--- url.c.orig	Sat Sep 29 03:04:23 2001
-+++ url.c	Sat Sep 29 03:07:39 2001
-@@ -949,7 +949,7 @@ parseURL2(char *url, ParsedURL * pu, Par
- 	    pu->file = cleanupName(pu->file);
- 	}
- 	if (pu->scheme == SCM_LOCAL)
-	    pu->real_file = file_unquote(pu->file);
-+	    pu->real_file = cleanupName2(file_unquote(pu->file), FALSE);
-     }
- }
- 
-@@ -1247,7 +1247,7 @@ openURL(char *url, ParsedURL * pu, Parse
- 	    Str tmp2 = Strnew_charp("#");
- 	    Strcat_charp(tmp2, pu->label);
- 	    pu->file = tmp2->ptr;
-	    pu->real_file = file_unquote(pu->file);
-+	    pu->real_file = cleanupName2(file_unquote(pu->file), FALSE);
- 	    pu->label = NULL;
- 	}
- 	else {
-@@ -1284,7 +1284,7 @@ openURL(char *url, ParsedURL * pu, Parse
- 	else if ((q = strchr(pu->file, '?')) != NULL) {
- 	    /* local CGI: GET */
- 	    p = Strnew_charp_n(pu->file, (int)(q - pu->file))->ptr;
-	    pu->real_file = file_unquote(p);
-+	    pu->real_file = cleanupName2(file_unquote(p), FALSE);
- 	    uf.stream = newFileStream(localcgi_get(pu->real_file, q + 1, option->referer),
- 				      (void (*)()) pclose);
- 	    if (uf.stream != NULL) {
-@@ -1606,7 +1606,7 @@ add_index_file(ParsedURL * pu, URLFile *
-     }
-     p = Strnew_m_charp(pu->file, "/", file_quote(index_file), NULL)->ptr;
-     p = cleanupName(p);
-    q = file_unquote(p);
-+    q = cleanupName2(file_unquote(p), FALSE);
-     examineFile(q, uf);
-     if (uf->stream == NULL)
- 	return;
--- a/www/w3m-m17n/pkg/PLIST
+++ b/www/w3m-m17n/pkg/PLIST
@ -1,10 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/11/17 02:46:02 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.2 2002/01/07 20:40:15 naddy Exp $
 %%japanese%%
 !%%japanese%%
 bin/w3m-m17n
 libexec/w3m-m17n/dirlist.cgi
+libexec/w3m-m17n/inflate
+libexec/w3m-m17n/multipart.cgi
 libexec/w3m-m17n/w3mbookmark
+libexec/w3m-m17n/w3mhelp.cgi
 libexec/w3m-m17n/w3mhelperpanel
+libexec/w3m-m17n/w3mman2html.cgi
 man/man1/w3m-m17n.1
 share/doc/w3m-m17n/FAQ.html
 share/doc/w3m-m17n/HISTORY
@ -18,11 +22,10 @@ share/doc/w3m-m17n/keymap.default
 share/doc/w3m-m17n/keymap.lynx
 share/doc/w3m-m17n/menu.default
 share/doc/w3m-m17n/menu.submenu
-share/w3m-m17n/w3mhelp-lynx_en.html
-share/w3m-m17n/w3mhelp-lynx_ja.html
-share/w3m-m17n/w3mhelp-w3m_en.html
-share/w3m-m17n/w3mhelp-w3m_ja.html
+share/w3m-m17n/w3mhelp-funcdesc.en.pl
+share/w3m-m17n/w3mhelp-funcdesc.ja.pl
+share/w3m-m17n/w3mhelp-funcname.pl
 share/w3m-m17n/w3mhelp.html
-@dirrm libexec/w3m-m17n
-@dirrm share/doc/w3m-m17n
@dirrm share/w3m-m17n
+@dirrm share/doc/w3m-m17n
+@dirrm libexec/w3m-m17n