update base and image flavor to 0.2.1-inu-4

www/w3m/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2001/10/06 18:33:50 naddy Exp $
+# $OpenBSD: Makefile,v 1.28 2001/10/24 12:23:32 naddy Exp $
 
 ONLY_FOR_ARCHS=	i386 sparc m68k
 
@@ -9,14 +9,16 @@ COMMENT-m17n=		"multi-script text-based web browser/pager"
 COMMENT-kanji-m17n=	"Japanese multi-script text-based web browser/pager"
 COMMENT-kanji-image=	"Japanese text-based web browser/pager with image support"
 
-V_BASE=		0.2.1
-V_IMG=		1.10
-V_M17N=		0.19
+V_AITO=		0.2.1	# aito's official release
+V_INU=		1.4	# inu branch
+V_IMG=		1.11	# image extension
+V_M17N=		0.19	# multilingualization extension
+
+AITO_DISTNAME=	w3m-${V_AITO}
+INU_DISTNAME=	w3m-${V_AITO}-inu-${V_INU}
 
-DISTNAME=	w3m-${V_BASE}
-PKGNAME=	${DISTNAME}p3
 CATEGORIES=	www
-NEED_VERSION=	1.427
+NEED_VERSION=	1.474
 HOMEPAGE=	http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/eng/
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
@@ -30,12 +32,15 @@ MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
 		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
 		http://www.instinct.org/w3m/ \
 		ftp://ftp.wiretapped.net/pub/w3m/
-MASTER_SITES0=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+MASTER_SITES0=	http://mi.med.tohoku.ac.jp/~satodai/w3m/inusrc/200109/
+MASTER_SITES1=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
 
-IMG_PATCH=	w3m-${V_BASE}-img-${V_IMG}.patch:0
-M17N_PATCH=	w3m-${V_BASE}-m17n-${V_M17N}.patch.gz:0
+INU_DISTFILE=	${INU_DISTNAME}${EXTRACT_SUFX}:0
+IMG_PATCH=	w3m-${V_AITO}-inu-${V_INU}-img-${V_IMG}.patch:1
+M17N_PATCH=	w3m-${V_AITO}-m17n-${V_M17N}.patch.gz:1
 PATCH_DIST_STRIP= -p1
-SUPDISTFILES=	${DISTFILES} ${IMG_PATCH} ${M17N_PATCH}
+SUPDISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${INU_DISTFILE} \
+		${IMG_PATCH} ${M17N_PATCH}
 
 FLAVORS=	kanji image m17n
 FLAVOR?=
@@ -60,15 +65,17 @@ ERRORS+=	"Fatal: Flavors 'image' and 'm17n' are mutually exclusive."
 
 .if  ${FLAVOR:L:Mimage}
 
-PKGNAME=	${DISTNAME}.${V_IMG}p1
+DISTNAME=	${INU_DISTNAME}
+PKGNAME=	w3m-${V_AITO}.inu.${V_INU}.${V_IMG}
+DISTFILES=	${INU_DISTFILE}
 PATCHFILES=	${IMG_PATCH}
 HOMEPAGE=	http://www2u.biglobe.ne.jp/~hsaka/w3m/
 DOCS+=		README.img
-PATCH_LIST+=	base-mimehead_c base-url_c
 LIB_DEPENDS+=	Imlib.19::graphics/imlib
 
 .elif ${FLAVOR:L:Mm17n}
 
+DISTNAME=	${AITO_DISTNAME}
 PKGNAME=	${DISTNAME}.${V_M17N}p1
 PATCHFILES=	${M17N_PATCH}
 HOMEPAGE=	http://www2u.biglobe.ne.jp/~hsaka/w3m/
@@ -78,7 +85,9 @@ PATCH_LIST+=	m17n-*
 
 .else
 
-PATCH_LIST+=	base-*
+DISTNAME=	${INU_DISTNAME}
+PKGNAME=	w3m-${V_AITO}.inu.${V_INU}
+DISTFILES=	${INU_DISTFILE}
 
 .endif
 

www/w3m/files/md5

@@ -1,9 +1,12 @@
-MD5 (w3m-0.2.1-img-1.10.patch) = 8cd810eb925fd5da17d04ffcb2b22b1a
+MD5 (w3m-0.2.1-inu-1.4-img-1.11.patch) = 8440e8ec39e028e176054eb348584348
+MD5 (w3m-0.2.1-inu-1.4.tar.gz) = 0524de2794aa2562f92e06ab1a631d5e
 MD5 (w3m-0.2.1-m17n-0.19.patch.gz) = 1d6fc2f1f273ed87ae9df1922fff4733
 MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
-RMD160 (w3m-0.2.1-img-1.10.patch) = 085b2d7c32964f0b74b557ab175375ea0dd76a5a
+RMD160 (w3m-0.2.1-inu-1.4-img-1.11.patch) = fb33ba1fbb4fb3eb1f8d2c8e696eb7b7b8766d46
+RMD160 (w3m-0.2.1-inu-1.4.tar.gz) = 6abbe9fa792fc95cb19b3f271a6affe4ae0a4295
 RMD160 (w3m-0.2.1-m17n-0.19.patch.gz) = 86435439b9a22cc46fb920d6280045298a6ae877
 RMD160 (w3m-0.2.1.tar.gz) = 0571973bb1e3fc9073aa4c97dff7fac6b6a47f56
-SHA1 (w3m-0.2.1-img-1.10.patch) = d20c67a0506da6bbb4c961b48188a1ba0db8fa4f
+SHA1 (w3m-0.2.1-inu-1.4-img-1.11.patch) = 1b9085351e612913fe8ef3206d8995c8c3c75ab1
+SHA1 (w3m-0.2.1-inu-1.4.tar.gz) = 3ecbb68e732f6ae3e06e88ad16f4f2fe4c86e979
 SHA1 (w3m-0.2.1-m17n-0.19.patch.gz) = fad1119054d27bff8683176ff0c02ba906535448
 SHA1 (w3m-0.2.1.tar.gz) = 3ae98283f02f4faf05af76ee0b022f01c1301d29

www/w3m/patches/base-file_c

@@ -1,50 +0,0 @@
-$OpenBSD: base-file_c,v 1.1 2001/07/31 15:27:08 naddy Exp $
---- file.c.orig	Fri Mar 23 03:19:54 2001
-+++ file.c	Mon Jul 30 02:14:54 2001
-@@ -176,7 +176,8 @@ int
- currentLn(Buffer * buf)
- {
-     if (buf->currentLine)
--	return buf->currentLine->real_linenumber + 1;
-+/*	return buf->currentLine->real_linenumber + 1;	*/
-+	return buf->currentLine->linenumber + 1;
-     else
- 	return 1;
- }
-@@ -4447,7 +4448,8 @@ addnewline(Buffer * buf, char *line, Lin
- 	buf->firstLine = l;
-     l->linenumber = ++buf->allLine;
-     if (nlines < 0) {
--	l->real_linenumber = l->linenumber;
-+/*	l->real_linenumber = l->linenumber;	*/
-+	l->real_linenumber = 0;
-     }
-     else {
- 	l->real_linenumber = nlines;
-@@ -5100,7 +5102,7 @@ saveBufferDelNum(Buffer * buf, FILE * f,
-         else
- #endif
-             tmp = Strnew_charp_n(l->lineBuf, l->len);
--        if (del && (p = strchr(tmp->ptr, ':')) != NULL)
-+        if (del && l->real_linenumber && (p = strchr(tmp->ptr, ':')) != NULL)
-             Strdelete(tmp, 0, p - tmp->ptr + 1);
- #ifdef JP_CHARSET
- 	tmp = conv_str(tmp, InnerCode, DisplayCode);
-@@ -5343,13 +5345,17 @@ getNextPage(Buffer * buf, int plen)
- 	l->len = len;
- 	l->width = -1;
- 	l->prev = pl;
-+/*
- 	if (squeezeBlankLine) {
-+*/
- 	    l->real_linenumber = nlines;
- 	    l->linenumber = (pl == NULL ? nlines : pl->linenumber + 1);
-+/*
- 	}
- 	else {
- 	    l->real_linenumber = l->linenumber = nlines;
- 	}
-+*/
- 	if (pl == NULL) {
- 	    pl = l;
- 	    buf->firstLine = buf->topLine = buf->currentLine = l;

www/w3m/patches/base-mimehead_c

@@ -1,12 +0,0 @@
-$OpenBSD: base-mimehead_c,v 1.1 2001/07/31 15:27:08 naddy Exp $
---- mimehead.c.orig	Fri Jun 22 02:51:21 2001
-+++ mimehead.c	Fri Jun 22 02:51:45 2001
-@@ -174,7 +174,7 @@ decodeWord(char **ow)
-     if (*w != '=' || *(w + 1) != '?')
- 	goto convert_fail;
-     w += 2;
--    for (p = charset; *w != '?'; w++) {
-+    for (p = charset; p - charset < 31 && *w != '?'; w++) {
- 	if (*w == '\0')
- 	    goto convert_fail;
- 	*(p++) = *w;

www/w3m/patches/base-url_c

@@ -1,23 +0,0 @@
-$OpenBSD: base-url_c,v 1.1 2001/09/29 14:57:52 naddy Exp $
---- url.c.orig	Sat Sep 29 16:06:06 2001
-+++ url.c	Sat Sep 29 16:07:08 2001
-@@ -605,6 +605,19 @@ parseURL(char *url, ParsedURL * p_url, P
- 	else
- 	    p_url->scheme = SCM_LOCAL;
- 	p = url;
-+	if (!strncmp(p,"//",2)) {
-+	    /* URL begins with // */
-+	    /* it means that 'scheme:' is abbreviated */
-+#ifdef CYGWIN
-+	    /* in CYGWIN, '//C/' doesn't means 'http://C/' */
-+	    if (IS_ALPHA(p[2]) && p[3] == '/') {
-+		p_url->scheme = SCM_LOCAL;
-+		goto analyze_file;
-+	    }
-+#endif /* CYGWIN */
-+	    p += 2;
-+	    goto analyze_url;
-+	}
- 	goto analyze_file;
-     }
-     /* get host and port */

www/w3m/patches/m17n-gc_gcconfig_h

@@ -1,4 +1,4 @@
-$OpenBSD: patch-gc_gcconfig.h,v 1.2 2001/03/24 12:56:16 naddy Exp $
+$OpenBSD: m17n-gc_gcconfig_h,v 1.1 2001/10/24 12:23:32 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 @@

www/w3m/patches/patch-configure

@@ -1,19 +1,19 @@
-$OpenBSD: patch-configure,v 1.1 2001/03/30 17:19:09 naddy Exp $
---- configure.orig	Fri Mar 30 18:58:53 2001
-+++ configure	Fri Mar 30 19:00:23 2001
-@@ -796,6 +796,7 @@ fi
+$OpenBSD: patch-configure,v 1.2 2001/10/24 12:23:32 naddy Exp $
+--- configure.orig	Thu Oct 11 18:00:58 2001
++++ configure	Thu Oct 11 18:01:30 2001
+@@ -793,6 +793,7 @@ if [ -n "$extlib" ]; then
+   echo "additional library found: $extlib"
+ fi
+ 
++if false; then # always use the included gclib for now
  gclib=''
  gcinclude=''
  gctarget=''
-+if false; then	# always use the included gclib for now
- for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib
- do
-   if [ -f $libdir/libgc.a -o -f $libdir/libgc.so ] ; then 
-@@ -858,6 +859,7 @@ EOF
-     gclib="gc/gc.a"
-     gctarget=$gclib
+@@ -812,6 +813,7 @@ do
+     break
    fi
+ done
 +fi
- fi
  
- if [ -z "$gclib" -o -z "$gcinclude" ]; then
+ case $sysname in
+   linux|Linux|LINUX|aix|Aix|AIX)