upgrade to w3m-0.1.10. okay espie@
This commit is contained in:
d
parent
e5f2be4310
commit
717f38944a
@ -1,18 +0,0 @@
|
||||
def_bindir=!!PREFIX!!/bin
|
||||
def_libdir=!!PREFIX!!/lib/w3m
|
||||
def_helpdir=!!PREFIX!!/share/w3m
|
||||
pref_lang=2
|
||||
lynx_key=y
|
||||
use_color=y
|
||||
use_mouse=y
|
||||
use_menu=y
|
||||
use_cookie=y
|
||||
use_ssl=y
|
||||
dmodel=5
|
||||
ded=vi
|
||||
dmail=mail
|
||||
dbrowser=lynx
|
||||
dcc=${CC}
|
||||
dcflags=${CFLAGS}
|
||||
dtermlib=-ltermlib
|
||||
dldflags=
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (w3m-0.1.8.tar.gz) = 8e905f7a63b8f1f387529b9a6885b9c6
|
||||
RMD160 (w3m-0.1.8.tar.gz) = eafcedd108318a711d228ed234036a8554763f1e
|
||||
SHA1 (w3m-0.1.8.tar.gz) = 478c6ce154930d5e45828bd7930b9fc7738b5b76
|
||||
MD5 (w3m-0.1.10.tar.gz) = 2e0ed5e8db8ac8d7eb1e6996b74ace1d
|
||||
RMD160 (w3m-0.1.10.tar.gz) = 97f91ac762d0ce2c7bce8b2502c1cc71484ddbf8
|
||||
SHA1 (w3m-0.1.10.tar.gz) = 7b4df57e9ff6e9b7955ed7f91cf3abc8fa1c64c9
|
||||
|
||||
@ -1,31 +1,13 @@
|
||||
--- XMakefile.orig Thu Apr 6 11:13:54 2000
|
||||
+++ XMakefile Sat Apr 8 09:03:41 2000
|
||||
@@ -64,17 +64,17 @@
|
||||
cd gc; make CC='$(CC) $(MYCFLAGS)'
|
||||
|
||||
install: $(TARGETS)
|
||||
- -$(MKDIR) $(DESTDIR)$(BIN_DIR)
|
||||
- -$(MKDIR) $(DESTDIR)$(HELP_DIR)
|
||||
- -$(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 $(INSTALL) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
|
||||
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BIN_DIR)
|
||||
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HELP_DIR)
|
||||
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(LIB_DIR)
|
||||
+ $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)
|
||||
+ $(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)
|
||||
+ $(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)
|
||||
+ $(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)
|
||||
+ $(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)
|
||||
+ $(BSD_INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)
|
||||
+ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR); done
|
||||
+ (cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR); done)
|
||||
|
||||
uninstall:
|
||||
-$(RM) $(BIN_DIR)/$(TARGET)
|
||||
--- display.c.orig Thu Jul 6 15:43:29 2000
|
||||
+++ display.c Thu Jul 6 15:43:53 2000
|
||||
@@ -717,8 +717,10 @@
|
||||
}
|
||||
else {
|
||||
buf->pos = l->len -1;
|
||||
+#ifdef JP_CHARSET
|
||||
if (CharType(p[buf->pos]) == PC_KANJI2)
|
||||
buf->pos--;
|
||||
+#endif /* JP_CHARSET */
|
||||
}
|
||||
cpos = COLPOS(l, buf->pos);
|
||||
buf->visualpos = cpos - buf->currentColumn;
|
||||
|
||||
@ -1,20 +1,28 @@
|
||||
--- gc/gcconfig.h.orig Fri Jan 28 20:29:20 2000
|
||||
+++ gc/gcconfig.h Fri Jan 28 20:29:51 2000
|
||||
@@ -38,7 +38,7 @@
|
||||
# define HP
|
||||
# define mach_type_known
|
||||
# endif
|
||||
-# if defined(__OpenBSD__) && defined(m68k)
|
||||
+# if defined(__OpenBSD__) && (defined(m68k) || defined(__m68k__))
|
||||
# define M68K
|
||||
# define OPENBSD
|
||||
# define mach_type_known
|
||||
@@ -190,7 +190,7 @@
|
||||
# define NEXT
|
||||
# define mach_type_known
|
||||
# endif
|
||||
-# if defined(__OpenBSD__) && defined(i386)
|
||||
+# if defined(__OpenBSD__) && (defined(i386) || defined(__i386__))
|
||||
# define I386
|
||||
# define OPENBSD
|
||||
# define mach_type_known
|
||||
--- 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 @@
|
||||
|
||||
/* Machine specific parts contributed by various people. See README file. */
|
||||
|
||||
+#if defined(__unix__) && !defined(unix)
|
||||
+# define unix
|
||||
+#endif
|
||||
+#if defined(__i386__) && !defined(i386)
|
||||
+# define i386
|
||||
+#endif
|
||||
+#if defined(__sparc__) && !defined(sparc)
|
||||
+# define sparc
|
||||
+#endif
|
||||
+#if defined(__m68k__) && !defined(m68k)
|
||||
+# define m68k
|
||||
+#endif
|
||||
+#if defined(__m88k__) && !defined(m88k)
|
||||
+# define m88k
|
||||
+#endif
|
||||
+#if defined(__alpha__) && !defined(alpha)
|
||||
+# define alpha
|
||||
+#endif
|
||||
+
|
||||
/* First a unified test for Linux: */
|
||||
# if defined(linux) || defined(__linux__)
|
||||
# define LINUX
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
--- gcmain.c.orig Sat Apr 8 09:07:11 2000
|
||||
+++ gcmain.c Sat Apr 8 09:07:54 2000
|
||||
@@ -13,10 +13,21 @@
|
||||
#endif
|
||||
int real_main(int,char**,char**);
|
||||
|
||||
+/* Out-of-memory handler for GC. */
|
||||
+void *
|
||||
+die_oom(size_t bytes)
|
||||
+{
|
||||
+ fprintf(stderr, "Out of memory: %d bytes unavailable!\n", bytes);
|
||||
+ exit(1);
|
||||
+}
|
||||
+
|
||||
int
|
||||
main(int argc, char **argv, char **envp)
|
||||
{
|
||||
int dummy;
|
||||
+
|
||||
+ /* Set up to die if we run out of memory. */
|
||||
+ GC_oom_fn = die_oom;
|
||||
GC_stackbottom = (ptr_t)(&dummy);
|
||||
return(real_main(argc, argv, envp));
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
--- main.c.orig Fri May 26 23:02:30 2000
|
||||
+++ main.c Fri May 26 23:01:07 2000
|
||||
@@ -1758,8 +1758,10 @@ followA(void)
|
||||
parseURL2(a->url,&u,baseURL(Currentbuf));
|
||||
if (u.scheme == Currentbuf->currentURL.scheme &&
|
||||
u.port == Currentbuf->currentURL.port &&
|
||||
- strcasecmp(u.host,Currentbuf->currentURL.host) == 0 &&
|
||||
- strcmp(u.file,Currentbuf->currentURL.file) == 0) {
|
||||
+ ((u.host == NULL && Currentbuf->currentURL.host == NULL) ||
|
||||
+ strcasecmp(u.host, Currentbuf->currentURL.host) == 0) &&
|
||||
+ ((u.file == NULL && Currentbuf->currentURL.file == NULL) ||
|
||||
+ strcmp(u.file, Currentbuf->currentURL.file) == 0)) {
|
||||
/* index within this buffer */
|
||||
local_label = u.label;
|
||||
}
|
||||
@ -6,13 +6,14 @@ It's main features (over lynx) are:
|
||||
* HTML tables
|
||||
* HTML frames
|
||||
* HTML from stdin
|
||||
* HTTPS
|
||||
* horizontal scrolling
|
||||
|
||||
While it may not be as strictly accurate as lynx, w3m seems to render
|
||||
HTML pages more intelligently and more compactly.
|
||||
|
||||
The following notes come from the README:
|
||||
------------------------------------------------------------
|
||||
|
||||
w3m is a pager with WWW capability. It IS a pager, but it can be
|
||||
used as a text-mode WWW browser.
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2000/07/10 00:14:11 d Exp $
|
||||
bin/w3m
|
||||
lib/w3m/dirlist.cgi
|
||||
lib/w3m/w3mbookmark
|
||||
lib/w3m/w3mhelperpanel
|
||||
libexec/w3m/dirlist.cgi
|
||||
libexec/w3m/w3mbookmark
|
||||
libexec/w3m/w3mhelperpanel
|
||||
man/man1/w3m.1
|
||||
share/doc/w3m/FAQ.html
|
||||
share/doc/w3m/HISTORY
|
||||
@ -9,7 +10,6 @@ share/doc/w3m/MANUAL.html
|
||||
share/doc/w3m/README
|
||||
share/doc/w3m/README.cygwin
|
||||
share/doc/w3m/README.dict
|
||||
share/doc/w3m/README.dj
|
||||
share/doc/w3m/README.func
|
||||
share/doc/w3m/STORY.html
|
||||
share/doc/w3m/keymap.default
|
||||
@ -20,6 +20,7 @@ share/w3m/w3mhelp-lynx_en.html
|
||||
share/w3m/w3mhelp-lynx_ja.html
|
||||
share/w3m/w3mhelp-w3m_en.html
|
||||
share/w3m/w3mhelp-w3m_ja.html
|
||||
@dirrm lib/w3m
|
||||
share/w3m/w3mhelp.html
|
||||
@dirrm libexec/w3m
|
||||
@dirrm share/doc/w3m
|
||||
@dirrm share/w3m
|
||||
|
||||
Loading…
Reference in New Issue
Block a user