diff options
Diffstat (limited to 'www/w3m/files')
-rw-r--r-- | www/w3m/files/extra-patch-XMakefile | 36 | ||||
-rw-r--r-- | www/w3m/files/extra-patch-XMakefile.m17n | 36 | ||||
-rw-r--r-- | www/w3m/files/extra-patch-terms.c.m17n | 16 | ||||
-rw-r--r-- | www/w3m/files/patch-ag | 11 | ||||
-rw-r--r-- | www/w3m/files/patch-ah | 11 | ||||
-rw-r--r-- | www/w3m/files/patch-ai | 11 | ||||
-rw-r--r-- | www/w3m/files/patch-aj | 11 | ||||
-rw-r--r-- | www/w3m/files/patch-au | 23 | ||||
-rw-r--r-- | www/w3m/files/patch-configure | 78 | ||||
-rw-r--r-- | www/w3m/files/patch-indep.c | 11 | ||||
-rw-r--r-- | www/w3m/files/patch-indep.h | 11 |
11 files changed, 33 insertions, 222 deletions
diff --git a/www/w3m/files/extra-patch-XMakefile b/www/w3m/files/extra-patch-XMakefile deleted file mode 100644 index 2d8efe6..0000000 --- a/www/w3m/files/extra-patch-XMakefile +++ /dev/null @@ -1,36 +0,0 @@ ---- 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) -+ -$(MKDIR) $(DESTDIR)$(HELP_DIR_JA) - -$(MKDIR) $(DESTDIR)$(LIB_DIR) -- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET) -- $(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html -- $(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html -- $(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 $(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 -+ $(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) - -$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html -- -$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html -+ -$(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_JA)/w3mhelp-w3m_ja.html - -$(RM) $(HELP_DIR)/w3mhelp.html - -$(RM) $(LIB_DIR)/$(BOOKMARKER) - -$(RM) $(LIB_DIR)/$(HELPER) diff --git a/www/w3m/files/extra-patch-XMakefile.m17n b/www/w3m/files/extra-patch-XMakefile.m17n deleted file mode 100644 index da5ba4c..0000000 --- a/www/w3m/files/extra-patch-XMakefile.m17n +++ /dev/null @@ -1,36 +0,0 @@ ---- 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) -+ -$(MKDIR) $(DESTDIR)$(HELP_DIR_JA) - -$(MKDIR) $(DESTDIR)$(LIB_DIR) -- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET) -- $(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html -- $(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html -- $(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); 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 -+ $(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) - -$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html -- -$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html -+ -$(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_JA)/w3mhelp-w3m_ja.html - -$(RM) $(HELP_DIR)/w3mhelp.html - - clean: sweep diff --git a/www/w3m/files/extra-patch-terms.c.m17n b/www/w3m/files/extra-patch-terms.c.m17n deleted file mode 100644 index d061e70..0000000 --- a/www/w3m/files/extra-patch-terms.c.m17n +++ /dev/null @@ -1,16 +0,0 @@ ---- terms.c.orig Sun Oct 22 00:46:08 2000 -+++ terms.c Sun Oct 22 01:23:53 2000 -@@ -17,7 +17,13 @@ - #include <gpm.h> - #endif /* USE_GPM */ - #ifdef USE_SYSMOUSE -+#include <osreldate.h> -+#if (__FreeBSD_version >= 400017) -+#include <sys/consio.h> -+#include <sys/fbio.h> -+#else - #include <machine/console.h> -+#endif - int (*sysm_handler) (int x, int y, int nbs, int obs); - static int cwidth = 8, cheight = 16; - static int xpix, ypix, nbs, obs = 0; diff --git a/www/w3m/files/patch-ag b/www/w3m/files/patch-ag deleted file mode 100644 index 67a6d97..0000000 --- a/www/w3m/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- w3mhelp-w3m_en.html.orig Wed Apr 5 14:08:01 2000 -+++ w3mhelp-w3m_en.html Fri Apr 7 02:09:24 2000 -@@ -12,7 +12,7 @@ - ***** Key assign table ***** - </CENTER> - --<A HREF="w3mhelp-w3m_ja.html">Japanese</A> -+<A HREF="../ja/w3m/w3mhelp-w3m_ja.html">Japanese</A> - - <H2>Page/Cursor motion</H2> - <table> diff --git a/www/w3m/files/patch-ah b/www/w3m/files/patch-ah deleted file mode 100644 index da8697f..0000000 --- a/www/w3m/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- w3mhelp-w3m_ja.html.orig Wed Apr 5 14:08:01 2000 -+++ w3mhelp-w3m_ja.html Fri Apr 7 02:09:41 2000 -@@ -14,7 +14,7 @@ - ***** キー割り当て ***** - </CENTER> - --<A HREF="w3mhelp-w3m_en.html">English</A> -+<A HREF="../../w3m/w3mhelp-w3m_en.html">English</A> - - <H2>ページ/カーソル移動</H2> - <TABLE> diff --git a/www/w3m/files/patch-ai b/www/w3m/files/patch-ai deleted file mode 100644 index 2d73a52..0000000 --- a/www/w3m/files/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ ---- w3mhelp-lynx_en.html.orig Wed Apr 5 14:08:01 2000 -+++ w3mhelp-lynx_en.html Fri Apr 7 02:09:51 2000 -@@ -12,7 +12,7 @@ - ***** Key assign table ***** - </CENTER> - --<A HREF="w3mhelp-lynx_ja.html">Japanese</A> -+<A HREF="../ja/w3m/w3mhelp-lynx_ja.html">Japanese</A> - - <H3>Page/Cursor motion</H3> - <table> diff --git a/www/w3m/files/patch-aj b/www/w3m/files/patch-aj deleted file mode 100644 index 4922c75..0000000 --- a/www/w3m/files/patch-aj +++ /dev/null @@ -1,11 +0,0 @@ ---- w3mhelp-lynx_ja.html.orig Fri Feb 25 13:22:16 2000 -+++ w3mhelp-lynx_ja.html Fri Apr 7 02:10:09 2000 -@@ -14,7 +14,7 @@ - ***** lynx-like キー割り当て ***** - </CENTER> - --<A HREF="w3mhelp-lynx_en.html">English</A> -+<A HREF="../../w3m/w3mhelp-lynx_en.html">English</A> - - <H3>ページ/カーソル移動</H3> - <table> diff --git a/www/w3m/files/patch-au b/www/w3m/files/patch-au deleted file mode 100644 index 30d8d47..0000000 --- a/www/w3m/files/patch-au +++ /dev/null @@ -1,23 +0,0 @@ ---- terms.c.orig Mon Nov 5 02:59:40 2001 -+++ terms.c Mon Nov 5 02:59:17 2001 -@@ -244,8 +244,18 @@ - TerminalGet(tty, &d_ioval); - #ifdef MOUSE - term = getenv("TERM"); -- if (!strncmp(term, "kterm", 5) || !strncmp(term, "xterm", 5)) { -- is_xterm = 1; -+ { -+ static struct { const char *prefix; int len; } xtermlike[] = { -+ { "kterm", 5 }, { "xterm", 5 }, { "rxvt", 4 } -+ }; -+ int i; -+ -+ for (i = 0; i < sizeof(xtermlike)/sizeof(xtermlike[0]); i++) { -+ if (!strncmp(term, xtermlike[i].prefix, xtermlike[i].len)) { -+ is_xterm = 1; -+ break; -+ } -+ } - } - #endif - return 0; diff --git a/www/w3m/files/patch-configure b/www/w3m/files/patch-configure index f30e30d..bf57cd1 100644 --- a/www/w3m/files/patch-configure +++ b/www/w3m/files/patch-configure @@ -1,57 +1,45 @@ ---- configure.orig Thu Sep 27 21:30:08 2001 -+++ configure Sun Oct 7 14:33:20 2001 -@@ -33,7 +33,9 @@ - - # parameters: +--- configure.orig Fri Dec 21 11:11:50 2001 ++++ configure Sun Jan 6 15:25:08 2002 +@@ -64,6 +64,9 @@ + -helpdir=*|--helpdir=*) + helpdir=`expr "$1" : "-*helpdir=\(.*\)"` + ;; ++ -helpdir-ja=*|--helpdir-ja=*) ++ helpdir_ja=`expr "$1" : "-*helpdir-ja=\(.*\)"` ++ ;; + -sysconfdir=*|--sysconfdir=*) + sysconfdir=`expr "$1" : "-*sysconfdir=\(.*\)"` + ;; +@@ -513,6 +516,16 @@ + helpdir=$_dir + echo "helpdir='$helpdir'" >> config.param --prefix=/usr/local -+if [ -z "$prefix" ]; then -+ prefix=/usr/local ++d_helpdir_ja=$helpdir_ja ++if [ -z "$d_helpdir_ja" ]; then ++ d_helpdir_ja="$topdir/share/w3m" +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" ++echo "Which directory do you want to put the Japanese helpfile?" ++Echo "(default: $d_helpdir_ja) " ++readdir "$d_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 @@ ++echo "helpdir_ja='$helpdir_ja'" >> config.param ++ + d_sysconfdir=$sysconfdir + if [ -z "$d_sysconfdir" ]; then + d_sysconfdir="$topdir/etc/w3m" +@@ -1948,6 +1961,7 @@ BIN_DIR = $bindir HELP_DIR = $helpdir +HELP_DIR_JA = $helpdir_ja - LIB_DIR = $suplibdir + LIB_DIR = $libdir + ETC_DIR = $sysconfdir HELP_FILE = $helpfile - SYS_LIBRARIES = $gpmlib $extlib $termlib $ssllib $v6lib -@@ -1801,6 +1807,7 @@ +@@ -2007,6 +2021,7 @@ - #define LIB_DIR "$suplibdir" + #define LIB_DIR "$libdir" #define HELP_DIR "$helpdir" +#define HELP_DIR_JA "$helpdir_ja" + #define ETC_DIR "$sysconfdir" #define HELP_FILE "w3mhelp.html" - #define W3MCONFIG "w3mconfig" - + #define HELP_CGI "w3mhelp" diff --git a/www/w3m/files/patch-indep.c b/www/w3m/files/patch-indep.c deleted file mode 100644 index ebd135d..0000000 --- a/www/w3m/files/patch-indep.c +++ /dev/null @@ -1,11 +0,0 @@ ---- indep.c.orig Mon Oct 29 09:52:32 2001 -+++ indep.c Mon Oct 29 09:52:37 2001 -@@ -181,7 +181,7 @@ - - /* string search using the simplest algorithm */ - char * --strcasestr(char *s1, char *s2) -+strcasestr(const char *s1, const char *s2) - { - int len1, len2; - len1 = strlen(s1); diff --git a/www/w3m/files/patch-indep.h b/www/w3m/files/patch-indep.h deleted file mode 100644 index 609e519..0000000 --- a/www/w3m/files/patch-indep.h +++ /dev/null @@ -1,11 +0,0 @@ ---- indep.h.orig Mon Oct 29 09:49:01 2001 -+++ indep.h Mon Oct 29 09:49:52 2001 -@@ -23,7 +23,7 @@ - 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 char *strcasestr(const char *s1, const char *s2); - extern int strcasemstr(char *str, char *srch[], char **ret_ptr); - extern char *remove_space(char *str); - extern int non_null(char *s); |