Update to 0.3 and m17n-20020311.

This commit is contained in:
naddy 2002-03-11 18:36:42 +00:00
parent 47fa1df517
commit 5d4f4c933b
6 changed files with 47 additions and 49 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.41 2002/03/10 15:20:05 naddy Exp $
# $OpenBSD: Makefile,v 1.42 2002/03/11 18:36:42 naddy Exp $
ONLY_FOR_ARCHS= i386 sparc m68k powerpc
COMMENT= "pager/text-based web browser"
VERSION= 0.2.5
M17N_VERSION= 20020202
VERSION= 0.3
M17N_VERSION= 20020311
DISTNAME= w3m-${VERSION}
CATEGORIES= www
@ -22,11 +22,9 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= w3m
MASTER_SITES0= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
MASTER_SITES1= http://sites.inka.de/mips/unix/distfiles/
SUPDISTFILES= w3m-${VERSION}${EXTRACT_SUFX} \
w3m-${VERSION}-m17n-${M17N_VERSION}${EXTRACT_SUFX}:0 \
w3m-0.2.5-img-2.2.patch.gz:1
w3m-${VERSION}-m17n-${M17N_VERSION}${EXTRACT_SUFX}:0
FLAVORS= image japanese m17n
FLAVOR?=
@ -46,18 +44,10 @@ DOCS= FAQ.html HISTORY MANUAL.html \
README README.dict README.func STORY.html \
keymap.default keymap.lynx menu.default menu.submenu
PATCH_LIST= patch-configure \
patch-etc_c \
patch-search_c \
patch-gc_include_private_gcconfig_h \
patch-gc_dyn_load_c
PATCH_LIST= patch-gc_dyn_load_c \
patch-gc_include_private_gcconfig_h
.if ${FLAVOR:L:Mimage}
. if !${FLAVOR:L:Mm17n}
PATCHFILES= w3m-0.2.5-img-2.2.patch.gz:1
PATCH_DIST_STRIP= -p1
. endif
PATCH_LIST+= patch-image_c
LIB_DEPENDS= Imlib.19::graphics/imlib
CONFIGURE_ENV+= use_image=y
DOCS+= README.img
@ -80,8 +70,12 @@ DISTNAME= w3m-${VERSION}-m17n-${M17N_VERSION}
PKGNAME= w3m-${VERSION}.${M17N_VERSION}
CONFIGURE_ARGS+= --suffix="" --charset=UTF-8
DOCS+= README.m17n
PATCH_LIST+= patch-m17n-configure
.else
PATCH_LIST+= patch-file_c
PATCH_LIST+= patch-configure \
patch-etc_c \
patch-image_c \
patch-search_c
.endif
post-install:

View File

@ -1,9 +1,6 @@
MD5 (w3m-0.2.5-img-2.2.patch.gz) = 181e4da95f9fbe45b8177c28efa16aae
MD5 (w3m-0.2.5-m17n-20020202.tar.gz) = 285f75c30ecec364b3bedd512f39b241
MD5 (w3m-0.2.5.tar.gz) = 9a1b4846d9672ae87d561a2eda94f46c
RMD160 (w3m-0.2.5-img-2.2.patch.gz) = 0d028d4a14fd3f5d4eacee49b2bb5766deb63884
RMD160 (w3m-0.2.5-m17n-20020202.tar.gz) = 052273eb0e0b387b62fc8d7f8d81ef3487e8d93b
RMD160 (w3m-0.2.5.tar.gz) = 4a9b9371fdb551a951935ce794fd74451d02e986
SHA1 (w3m-0.2.5-img-2.2.patch.gz) = 399b3103d9bb617403c6277181e47d58f6cdf6a3
SHA1 (w3m-0.2.5-m17n-20020202.tar.gz) = 15b7234da0f5392bc904636b9997d8ff65e6658c
SHA1 (w3m-0.2.5.tar.gz) = 2fb557bac49776600ecc88982a6d75ccea2db4d4
MD5 (w3m-0.3-m17n-20020311.tar.gz) = f1ae157d1172d0985218b14058df24a1
MD5 (w3m-0.3.tar.gz) = d1dab828926801901276fbe1bbfedd5a
RMD160 (w3m-0.3-m17n-20020311.tar.gz) = ebfddbd86675b66c4021ba9081d202ce31ee6bdf
RMD160 (w3m-0.3.tar.gz) = 559b5c64285b84737febc488a5f26c03d9eb4013
SHA1 (w3m-0.3-m17n-20020311.tar.gz) = 7c1d6f377cd1d259c95d17aba31e12f2268a97f1
SHA1 (w3m-0.3.tar.gz) = b661d411c3bc1c885bf8a64e639465a20631bf0b

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2002/03/10 15:20:05 naddy Exp $
--- configure.orig Tue Jan 29 20:08:49 2002
+++ configure Sun Mar 10 14:58:23 2002
@@ -980,6 +980,7 @@ Linux|linux|LINUX)
$OpenBSD: patch-configure,v 1.8 2002/03/11 18:36:42 naddy Exp $
--- configure.orig Tue Feb 12 09:52:58 2002
+++ configure Mon Mar 11 18:20:41 2002
@@ -1005,6 +1005,7 @@ Linux|linux|LINUX)
;;
esac
@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.7 2002/03/10 15:20:05 naddy Exp $
gclib=''
gcinclude=''
gctarget=''
@@ -999,6 +1000,7 @@ do
@@ -1024,6 +1025,7 @@ do
break
fi
done
@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.7 2002/03/10 15:20:05 naddy Exp $
case $sysname in
linux|Linux|LINUX|aix|Aix|AIX)
@@ -1733,6 +1735,7 @@ if $cc $cflags -o _zmachdep _zmachdep.c
@@ -1795,6 +1797,7 @@ if $cc $cflags -o _zmachdep _zmachdep.c
then
echo "You have setpgrp()."
def_have_setpgrp='#define HAVE_SETPGRP'
@ -25,7 +25,7 @@ $OpenBSD: patch-configure,v 1.7 2002/03/10 15:20:05 naddy Exp $
else
cat > _zmachdep.c << EOF
#include <unistd.h>
@@ -1746,7 +1749,7 @@ EOF
@@ -1808,7 +1811,7 @@ EOF
then
echo "You have setpgrp( pid, pgrp )."
def_have_setpgrp='#define HAVE_SETPGRP'

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-etc_c,v 1.1 2002/03/10 15:20:05 naddy Exp $
--- etc.c.orig Mon Jan 21 18:57:27 2002
+++ etc.c Sun Mar 10 14:58:23 2002
@@ -1069,7 +1069,7 @@ mySystem(char *command, int background)
$OpenBSD: patch-etc_c,v 1.2 2002/03/11 18:36:42 naddy Exp $
--- etc.c.orig Wed Mar 6 00:54:55 2002
+++ etc.c Wed Mar 6 00:55:27 2002
@@ -1075,7 +1075,7 @@ mySystem(char *command, int background)
flush_tty();
if ((pid = fork()) == 0) {
reset_signals();

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-file_c,v 1.1 2002/02/02 03:19:01 naddy Exp $
--- file.c.orig Sat Feb 2 03:41:14 2002
+++ file.c Sat Feb 2 03:41:43 2002
@@ -1238,7 +1238,7 @@ findAuthentication(struct http_auth *hau
SKIP_BLANKS(p);
p0 = p;
for (ha = &www_auth[0]; ha->scheme != NULL; ha++) {
- if (strncmp(p, ha->scheme, strlen(ha->scheme)) == 0) {
+ if (strncasecmp(p, ha->scheme, strlen(ha->scheme)) == 0) {
if (hauth->pri < ha->pri) {
*hauth = *ha;
p += strlen(ha->scheme);

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-m17n-configure,v 1.1 2002/03/11 18:36:42 naddy Exp $
--- configure.orig Mon Mar 11 14:55:08 2002
+++ configure Mon Mar 11 18:17:05 2002
@@ -1081,6 +1081,7 @@ Linux|linux|LINUX)
;;
esac
+if false; then # always use the included gclib for now
gclib=''
gcinclude=''
gctarget=''
@@ -1100,6 +1101,7 @@ do
break
fi
done
+fi
case $sysname in
linux|Linux|LINUX|aix|Aix|AIX)