summaryrefslogtreecommitdiff
path: root/www/w3m/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/w3m/files')
-rw-r--r--www/w3m/files/extra-patch-XMakefile45
-rw-r--r--www/w3m/files/extra-patch-XMakefile.m17n (renamed from www/w3m/files/extra-patch-XMakefile.noimg)37
-rw-r--r--www/w3m/files/patch-aa92
-rw-r--r--www/w3m/files/patch-ak11
-rw-r--r--www/w3m/files/patch-ao19
-rw-r--r--www/w3m/files/patch-configure57
-rw-r--r--www/w3m/files/patch-mimehead.c28
7 files changed, 74 insertions, 215 deletions
diff --git a/www/w3m/files/extra-patch-XMakefile b/www/w3m/files/extra-patch-XMakefile
index ed4f27a937bf..2d8efe6a9113 100644
--- a/www/w3m/files/extra-patch-XMakefile
+++ b/www/w3m/files/extra-patch-XMakefile
@@ -1,27 +1,6 @@
---- XMakefile.orig Mon Aug 13 00:52:11 2001
-+++ XMakefile Mon Aug 13 00:53:15 2001
-@@ -22,16 +22,16 @@
-
- INCLUDES=-I.
-
--DEFS=$(INCLUDES) # -DDEBUG
--CFLAGS=$(MYCFLAGS) $(DEFS)
--LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
-+DEFS+=$(INCLUDES) # -DDEBUG
-+CFLAGS+=$(DEFS)
-+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
- INSTALL=sh install.sh
- INSTALL2=sh ../install.sh
- AR=ar
-
- all: $(TARGETS)
-
--$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
-+$(TARGET): $(ALLOBJS) $(ALIB)
- $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
-
- $(ALIB): $(ALIBOBJS)
-@@ -86,24 +86,25 @@
+--- XMakefile.orig Thu Sep 27 21:30:08 2001
++++ XMakefile Sun Oct 7 14:42:43 2001
+@@ -80,22 +80,23 @@
install: $(TARGETS)
-$(MKDIR) $(DESTDIR)$(BIN_DIR)
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
@@ -33,16 +12,16 @@
- $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
- $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
- $(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
-- for d in $(BOOKMARKER) $(HELPER) $(IMGTARGET); \
-- do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
+- for d in $(EXT_TARGETS); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
- (cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
+ $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
+ $(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
+ $(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
+ $(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
+ $(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
-+ for d in $(BOOKMARKER) $(HELPER) $(IMGDISPLAY) $(IMGSIZE); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
-+ cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
++ $(BSD_INSTALL_DATA) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
++ for d in $(EXT_TARGETS); do $(BSD_INSTALL_SCRIPT) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
++ (cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
uninstall:
-$(RM) $(BIN_DIR)/$(TARGET)
@@ -51,11 +30,7 @@
+ -$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html
- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html
-- -$(RM) $(HELP_DIR)/w3mhelp.html
+ -$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html
-+ -$(RM) $(LIB_DIR)/$(BOOKMARKER)
-+ -$(RM) $(LIB_DIR)/$(HELPER)
-+
-
- clean: sweep
- rm -f *.o *.a $(TARGETS) mktable$(EXT)
+ -$(RM) $(HELP_DIR)/w3mhelp.html
+ -$(RM) $(LIB_DIR)/$(BOOKMARKER)
+ -$(RM) $(LIB_DIR)/$(HELPER)
diff --git a/www/w3m/files/extra-patch-XMakefile.noimg b/www/w3m/files/extra-patch-XMakefile.m17n
index 0fc2a7566d2c..da5ba4c68f88 100644
--- a/www/w3m/files/extra-patch-XMakefile.noimg
+++ b/www/w3m/files/extra-patch-XMakefile.m17n
@@ -1,27 +1,6 @@
---- XMakefile.orig Fri Apr 21 13:35:48 2000
-+++ XMakefile Sat Apr 22 06:51:43 2000
-@@ -18,16 +18,16 @@
-
- INCLUDES=-I.
-
--DEFS=$(INCLUDES) # -DDEBUG
--CFLAGS=$(MYCFLAGS) $(DEFS)
--LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
-+DEFS+=$(INCLUDES) # -DDEBUG
-+CFLAGS+=$(DEFS)
-+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
- INSTALL=sh install.sh
- INSTALL2=sh ../install.sh
- AR=ar
-
- all: $(TARGETS)
-
--$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
-+$(TARGET): $(ALLOBJS) $(ALIB)
- $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
-
- $(ALIB): $(ALIBOBJS)
-@@ -67,23 +67,24 @@
+--- XMakefile.orig Mon Oct 8 13:08:11 2001
++++ XMakefile Mon Oct 8 13:11:26 2001
+@@ -87,22 +87,23 @@
install: $(TARGETS)
-$(MKDIR) $(DESTDIR)$(BIN_DIR)
-$(MKDIR) $(DESTDIR)$(HELP_DIR)
@@ -40,8 +19,9 @@
+ $(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
+ $(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
+ $(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
-+ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
-+ cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
++ $(BSD_INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
++ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_SCRIPT) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
++ (cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
uninstall:
-$(RM) $(BIN_DIR)/$(TARGET)
@@ -50,10 +30,7 @@
+ -$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html
- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html
-- -$(RM) $(HELP_DIR)/w3mhelp.html
+ -$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html
-+ -$(RM) $(LIB_DIR)/$(BOOKMARKER)
-+ -$(RM) $(LIB_DIR)/$(HELPER)
+ -$(RM) $(HELP_DIR)/w3mhelp.html
clean: sweep
- rm -f *.o *.a $(TARGETS) mktable
diff --git a/www/w3m/files/patch-aa b/www/w3m/files/patch-aa
deleted file mode 100644
index 674330e205be..000000000000
--- a/www/w3m/files/patch-aa
+++ /dev/null
@@ -1,92 +0,0 @@
---- config.h.orig Fri Mar 23 11:49:44 2001
-+++ config.h Mon Aug 27 15:16:50 2001
-@@ -20,3 +20,3 @@
- */
--#undef USE_MARK
-+#define USE_MARK
-
-@@ -36,3 +36,3 @@
- */
--#undef VIEW_UNSEENOBJECTS
-+#define VIEW_UNSEENOBJECTS
-
-@@ -51,3 +51,3 @@
- */
--#undef USE_GOPHER
-+#define USE_GOPHER
-
-@@ -86,3 +86,3 @@
- */
--#undef EMACS_LIKE_LINEEDIT
-+#define EMACS_LIKE_LINEEDIT
-
-@@ -96,11 +96,10 @@
-
--BIN_DIR = /usr/local/bin
--HELP_DIR = /usr/local/lib/w3m
--LIB_DIR = /usr/local/lib/w3m
-+PREFIX = %%PREFIX%%
-+BIN_DIR = %%PREFIX%%/bin
-+HELP_DIR = %%PREFIX%%/share/doc/w3m
-+HELP_DIR_JA = %%PREFIX%%/share/doc/ja/w3m
-+LIB_DIR = %%PREFIX%%/libexec/w3m
- HELP_FILE = w3mhelp-w3m_ja.html
--SYS_LIBRARIES = -lgpm -lbsd -lnsl -ltermcap -L/usr/local/ssl/lib -lssl -lcrypto
-+SYS_LIBRARIES = -lncurses
- LOCAL_LIBRARIES =
--CC = gcc
--MYCFLAGS = -g -Wall -I./gc/include -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
--GCCFLAGS = -g -Wall -I./gc/include -DATOMIC_UNCOLLECTABLE -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT -DNO_DEBUGGING #-DNO_SIGNALS
- KEYBIND_SRC = keybind.c
-@@ -109,4 +108,2 @@
- MATHLIB=-lm
--GCLIB=gc/gc.a
--GCTARGET=gc/gc.a
- RANLIB=ranlib
-@@ -122,12 +119,19 @@
- #define EN 1
-+#undef JAPANESE
-+#ifdef JAPANESE
- #define LANG JA
- #define KANJI_SYMBOLS
-+#else
-+#define LANG EN
-+#undef KANJI_SYMBOLS
-+#endif
-+
- #define COLOR
- #define MOUSE
--#define USE_GPM
--#undef USE_SYSMOUSE
-+#undef USE_GPM
-+#define USE_SYSMOUSE
- #define MENU
- #define USE_COOKIE
--#define USE_SSL
--#define USE_SSL_VERIFY
-+#undef USE_SSL
-+#undef USE_SSL_VERIFY
- #define FTPPASS_HOSTNAMEGEN
-@@ -135,9 +139,15 @@
-
--#define DEF_EDITOR "/bin/vi"
--#define DEF_MAILER "/bin/mail"
--#define DEF_EXT_BROWSER "/usr/X11R6/bin/netscape"
--
--#define LIB_DIR "/usr/local/lib/w3m"
--#define HELP_DIR "/usr/local/lib/w3m"
--#define HELP_FILE "w3mhelp.html"
-+#define DEF_EDITOR "/usr/bin/vi"
-+#define DEF_MAILER "/usr/bin/mail"
-+#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"
-+
-+#define IMGSIZE "w3mimgsize"
-+#define IMGDISPLAY "w3mimgdisplay"
-+
-+#define LIB_DIR "%%PREFIX%%/libexec/w3m"
-+#ifdef JAPANESE
-+#define HELP_FILE "%%PREFIX%%/share/doc/ja/w3m/w3mhelp-w3m_ja.html"
-+#else
-+#define HELP_FILE "%%PREFIX%%/share/doc/w3m/w3mhelp-w3m_en.html"
-+#endif
- #define W3MCONFIG "w3mconfig"
diff --git a/www/w3m/files/patch-ak b/www/w3m/files/patch-ak
deleted file mode 100644
index 9f1e5a2221b0..000000000000
--- a/www/w3m/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.c.orig Fri Apr 21 12:45:53 2000
-+++ main.c Sat Apr 22 06:35:44 2000
-@@ -1139,7 +1139,7 @@
- void
- ldhelp(void)
- {
-- cmd_loadURL(helpFile(HELP_FILE), NULL);
-+ cmd_loadURL(HELP_FILE, NULL);
- }
-
- static void
diff --git a/www/w3m/files/patch-ao b/www/w3m/files/patch-ao
deleted file mode 100644
index 594673af2bdc..000000000000
--- a/www/w3m/files/patch-ao
+++ /dev/null
@@ -1,19 +0,0 @@
---- rc.c.orig Fri Jun 9 04:55:18 2000
-+++ rc.c Fri Jun 9 04:55:26 2000
-@@ -990,16 +990,3 @@
- Strcat_charp(file, base);
- return expandName(file->ptr);
- }
--
--char *
--helpFile(char *base)
--{
--#ifdef __EMX__
-- Str file = Strnew_charp(get_os2_dft("W3M_HELP_DIR", HELP_DIR));
--#else /* not __EMX__ */
-- Str file = Strnew_charp(HELP_DIR);
--#endif /* not __EMX__ */
-- Strcat_char(file, '/');
-- Strcat_charp(file, base);
-- return expandName(file->ptr);
--}
diff --git a/www/w3m/files/patch-configure b/www/w3m/files/patch-configure
new file mode 100644
index 000000000000..f30e30de70fe
--- /dev/null
+++ b/www/w3m/files/patch-configure
@@ -0,0 +1,57 @@
+--- configure.orig Thu Sep 27 21:30:08 2001
++++ configure Sun Oct 7 14:33:20 2001
+@@ -33,7 +33,9 @@
+
+ # parameters:
+
+-prefix=/usr/local
++if [ -z "$prefix" ]; then
++ prefix=/usr/local
++fi
+ all_yes=0
+ while [ $# -gt 0 ]
+ do
+@@ -332,6 +334,9 @@
+ readdir "$def_helpdir"
+ helpdir=$_dir
+ echo "def_helpdir='$helpdir'" >> config.param
++readdir "$def_helpdir_ja"
++helpdir_ja=$_dir
++echo "def_helpdir_ja='$helpdir_ja'" >> config.param
+
+ echo "Which language do you prefer?"
+ echo " 1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)"
+@@ -1686,7 +1691,7 @@
+ VIEW_UNSEENOBJECTS enables w3m to make a link to unseen objects.
+ e.g. background image.
+ */
+-#undef VIEW_UNSEENOBJECTS
++#define VIEW_UNSEENOBJECTS
+
+ /*
+ VI_PREC_NUM enables vi-like behavior for '2 SPC' or '2 b'
+@@ -1731,7 +1736,7 @@
+ /*
+ * Use Emacs-like key binding for file name completion
+ */
+-#undef EMACS_LIKE_LINEEDIT
++#define EMACS_LIKE_LINEEDIT
+
+ /*
+ * Remove line trailing spaces in html buffer.
+@@ -1753,6 +1758,7 @@
+
+ BIN_DIR = $bindir
+ HELP_DIR = $helpdir
++HELP_DIR_JA = $helpdir_ja
+ LIB_DIR = $suplibdir
+ HELP_FILE = $helpfile
+ SYS_LIBRARIES = $gpmlib $extlib $termlib $ssllib $v6lib
+@@ -1801,6 +1807,7 @@
+
+ #define LIB_DIR "$suplibdir"
+ #define HELP_DIR "$helpdir"
++#define HELP_DIR_JA "$helpdir_ja"
+ #define HELP_FILE "w3mhelp.html"
+ #define W3MCONFIG "w3mconfig"
+
diff --git a/www/w3m/files/patch-mimehead.c b/www/w3m/files/patch-mimehead.c
deleted file mode 100644
index 1d1a81c3cb3b..000000000000
--- a/www/w3m/files/patch-mimehead.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- mimehead.c.orig Fri Mar 23 10:49:53 2001
-+++ mimehead.c Tue Jun 19 21:46:21 2001
-@@ -166,21 +166,20 @@
- Str
- decodeWord(char **ow)
- {
-- char charset[32];
- char *p, *w = *ow;
- char method;
- Str a = Strnew();
-+ Str charset = Strnew();
-
- if (*w != '=' || *(w + 1) != '?')
- goto convert_fail;
- w += 2;
-- for (p = charset; *w != '?'; w++) {
-+ for (; *w != '?'; w++) {
- if (*w == '\0')
- goto convert_fail;
-- *(p++) = *w;
-+ Strcat_char(charset,*w);
- }
-- *p = '\0';
-- if (strcasecmp(charset, J_CHARSET) != 0) {
-+ if (Strcasecmp_charp(charset, J_CHARSET) != 0) {
- /* NOT ISO-2022-JP encoding ... don't convert */
- goto convert_fail;
- }