diff options
author | kei <kei> | 2001-05-01 00:31:24 +0000 |
---|---|---|
committer | kei <kei> | 2001-05-01 00:31:24 +0000 |
commit | 47f7a8d044b2c34945f6f5754e81c691a0012fbf (patch) | |
tree | 38e47f3a084cd9214306090e3fc7c4aad3e57fdd /www/w3m/patches | |
parent | 072400bbebd6ca92847cf15203bccd5440f24dac (diff) | |
download | pkgsrc-47f7a8d044b2c34945f6f5754e81c691a0012fbf.tar.gz |
As per request of itojun and hubertf, rename w3m-m17n as w3m. It reduces our
maintenance cost. Approved by agc.
Diffstat (limited to 'www/w3m/patches')
-rw-r--r-- | www/w3m/patches/patch-aa | 44 | ||||
-rw-r--r-- | www/w3m/patches/patch-ab | 2 | ||||
-rw-r--r-- | www/w3m/patches/patch-ac | 38 | ||||
-rw-r--r-- | www/w3m/patches/patch-ad | 49 | ||||
-rw-r--r-- | www/w3m/patches/patch-ae | 13 | ||||
-rw-r--r-- | www/w3m/patches/patch-af | 38 |
6 files changed, 46 insertions, 138 deletions
diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa index 9a7b41716e3..41fd95dd22c 100644 --- a/www/w3m/patches/patch-aa +++ b/www/w3m/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $ +$NetBSD: patch-aa,v 1.9 2001/05/01 00:31:25 kei Exp $ ---- configure.orig Fri Mar 23 11:18:40 2001 -+++ configure Fri Mar 30 21:11:58 2001 -@@ -188,7 +188,7 @@ +--- configure.orig Sat Apr 21 13:43:38 2001 ++++ configure Sat Apr 21 13:44:34 2001 +@@ -194,7 +194,7 @@ find_ssl() { sslinclude="" @@ -11,37 +11,7 @@ $NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $ do for i2 in /openssl /ssl / do -@@ -312,13 +312,13 @@ - echo "Which language do you prefer?" - echo " 1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)" - echo " 2 - English (charset US_ASCII, ISO-8859-1, etc.)" --if [ "$pref_lang" = 2 ]; then -- Echo '[2]? ' -- def_lg=2 --else -- Echo '[1]? ' -- def_lg=1 --fi -+#if [ "$pref_lang" = 2 ]; then -+# Echo '[2]? ' -+# def_lg=2 -+#else -+# Echo '[1]? ' -+# def_lg=1 -+#fi - while : - do - readanswer lg_ans "$def_lg" -@@ -469,7 +469,7 @@ - case "$ans" in - 1) - use_color=n; def_color="#undef COLOR" -- use_menu=n; def_menu="#undef MENU" -+ use_menu=y; def_menu="#undef MENU" - use_mouse=n; def_mouse="#undef MOUSE" - use_cookie=n; def_cookie="#undef USE_COOKIE" - use_ssl=n; def_ssl="#undef USE_SSL" -@@ -796,7 +796,7 @@ +@@ -907,7 +907,7 @@ gclib='' gcinclude='' gctarget='' @@ -50,7 +20,7 @@ $NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $ do if [ -f $libdir/libgc.a -o -f $libdir/libgc.so ] ; then echo "$libdir/libgc found" -@@ -804,7 +804,7 @@ +@@ -915,7 +915,7 @@ break fi done @@ -59,7 +29,7 @@ $NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $ do if [ -f $inc/gc.h ]; then echo "$inc/gc.h found" -@@ -1699,6 +1699,7 @@ +@@ -1600,6 +1600,7 @@ if [ `expr "$perl" : 'not found'` != 0 ]; then perl=/usr/local/bin/perl fi diff --git a/www/w3m/patches/patch-ab b/www/w3m/patches/patch-ab index b1f5a713454..9eee5c0a173 100644 --- a/www/w3m/patches/patch-ab +++ b/www/w3m/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 2001/03/31 09:21:17 itojun Exp $ +$NetBSD: patch-ab,v 1.8 2001/05/01 00:31:25 kei Exp $ --- main.c.orig Fri Mar 23 11:14:58 2001 +++ main.c Fri Mar 30 21:02:12 2001 diff --git a/www/w3m/patches/patch-ac b/www/w3m/patches/patch-ac deleted file mode 100644 index 7e5741f1311..00000000000 --- a/www/w3m/patches/patch-ac +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2001/03/31 09:21:17 itojun Exp $ - -*** display.c.orig Fri Mar 23 10:49:53 2001 ---- display.c Fri Mar 30 21:02:31 2001 -*************** -*** 251,257 **** - - #ifdef MOUSE - if (use_mouse) -! #if LANG == JA - msg = Strnew_charp("≪↑↓"); - #else /* LANG != JA */ - msg = Strnew_charp("<=UpDn "); ---- 251,257 ---- - - #ifdef MOUSE - if (use_mouse) -! #if KANJI_SYMBOL - msg = Strnew_charp("≪↑↓"); - #else /* LANG != JA */ - msg = Strnew_charp("<=UpDn "); -*************** -*** 273,279 **** - if (s->length > l) { - if (l >= 4) { - msg = Strsubstr(s, 0, (l - 2) / 2); -! #if LANG == JA - Strcat_charp(msg, "…"); - #else /* LANG != JA */ - Strcat_charp(msg, ".."); ---- 273,279 ---- - if (s->length > l) { - if (l >= 4) { - msg = Strsubstr(s, 0, (l - 2) / 2); -! #if KANJI_SYMBOL - Strcat_charp(msg, "…"); - #else /* LANG != JA */ - Strcat_charp(msg, ".."); diff --git a/www/w3m/patches/patch-ad b/www/w3m/patches/patch-ad deleted file mode 100644 index d800d64b8d1..00000000000 --- a/www/w3m/patches/patch-ad +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2001/03/31 09:21:17 itojun Exp $ - ---- rc.c.orig Fri Mar 23 10:51:04 2001 -+++ rc.c Fri Mar 30 21:07:29 2001 -@@ -51,7 +51,7 @@ - #endif - #define P_PIXELS 8 - --#if LANG == JA -+#if KANJI_SYMBOL - #define CMT_HELPER "外部ビューアの編集" - #define CMT_TABSTOP "タブ幅" - #define CMT_PIXEL_PER_CHAR "文字幅 (4.0...32.0)" -@@ -146,7 +146,7 @@ - #define CMT_PAGERLINE "# of reserved line when w3m is used as a pager" - #define CMT_HISTSIZE "# of reserved URL" - #define CMT_SAVEHIST "Save URL history" --/* #define CMT_KANJICODE "Display Kanji Code" */ -+#define CMT_KANJICODE "Display Kanji Code" - #define CMT_FRAME "Automatic rendering of frame" - #define CMT_TSELF "use _self as default target" - #define CMT_DISPLINK "Automatic display of link URL" -@@ -184,7 +184,7 @@ - #define CMT_FTPPASS "Password for FTP(use your mail address)" - #define CMT_USERAGENT "User-Agent" - #define CMT_ACCEPTLANG "Accept-Language" --/* #define CMT_DOCUMENTCODE "Document Charset" */ -+#define CMT_DOCUMENTCODE "Document Charset" - #define CMT_WRAP "Wrap search" - #define CMT_VIEW_UNSEENOBJECTS "Display unseenobjects (e.g. bgimage) tag" - #ifdef __EMX__ -@@ -260,7 +260,7 @@ - #ifdef COLOR - static struct sel_c colorstr[] = - { --#if LANG == JA -+#if KANJI_SYMBOL - {0, "black", "黒"}, - {1, "red", "赤"}, - {2, "green", "緑"}, -@@ -442,7 +442,7 @@ - - struct param_section sections[] = - { --#if LANG == JA -+#if KANJI_SYMBOL - {"表示関係", params1}, - #ifdef COLOR - {"表示色", params2}, diff --git a/www/w3m/patches/patch-ae b/www/w3m/patches/patch-ae deleted file mode 100644 index 06fc426f0d5..00000000000 --- a/www/w3m/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2001/04/02 04:24:14 itojun Exp $ - ---- w3mhelperpanel.c- Mon Apr 2 13:22:06 2001 -+++ w3mhelperpanel.c Mon Apr 2 13:22:18 2001 -@@ -10,7 +10,7 @@ - - #include "gcmain.c" - --#if LANG == JA -+#if KANJI_SYMBOL - #define MSG_TITLE "外部ビューアの編集" - #define MSG_NEW_ENTRY "新規登録" - #define MSG_TYPE "データタイプ" diff --git a/www/w3m/patches/patch-af b/www/w3m/patches/patch-af new file mode 100644 index 00000000000..2e127501689 --- /dev/null +++ b/www/w3m/patches/patch-af @@ -0,0 +1,38 @@ +$NetBSD: patch-af,v 1.3 2001/05/01 00:31:26 kei Exp $ + +--- libwc/Makefile.orig Sat Apr 21 16:23:53 2001 ++++ libwc/Makefile Sat Apr 21 16:32:43 2001 +@@ -1,10 +1,10 @@ + + LIBRARY = libwc.a +-GCLIB = ../gc/gc.a +-CC = cc -O -g -Wall -DUSE_UNICODE +-CFLAGS = -I. -I.. -I../gc/include -I../gc +-AR = ar +-RANLIB = ranlib ++GCLIB = ${PREFIX}/lib/libgc.a ++CC = ${CC} -O -g -Wall -DUSE_UNICODE ++CFLAGS = -I. -I.. -I${PREFIX}/include ++AR = ${AR} ++RANLIB = ${RANLIB} + + SRCS = big5.c \ + ces.c \ +@@ -90,7 +90,7 @@ + ces.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h sjis.h hz.h \ + big5.h johab.h gbk.h gb18030.h uhc.h viet.h utf8.h + char_conv.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h +-charset.o: ../gc/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \ ++charset.o: ${PREFIX}/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \ + priv.h + combining.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h \ + map/iso88596_combining.map map/iso885911_combining.map \ +@@ -117,7 +117,7 @@ + search.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h + sjis.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h sjis.h jis.h \ + wtf.h ucs.h map/jisx02132_sjis.map +-status.o: ../gc/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \ ++status.o: ${PREFIX}/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \ + priv.h ucs.h + test.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h + ucs.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h search.h \ |