version 0.1.6, ok'd by dugsong@

This commit is contained in:
d 2000-01-30 22:12:23 +00:00
parent b2b1d23d43
commit 96b88e3fc2
6 changed files with 95 additions and 100 deletions

View File

@ -1,3 +1,3 @@
SHA1 (w3m-991008.tar.gz) = 05ed1ecff841c9392608107d5d7414a41f13dc58
RMD160 (w3m-991008.tar.gz) = d10050662b9caedb70b4a60eeab5c0c2b720a708
MD5 (w3m-991008.tar.gz) = f8a8e520d8acc1f6964602aaf2fa1212
MD5 (w3m-0.1.6.tar.gz) = 572abe9476c0552abf8e803dfa6a1112
RMD160 (w3m-0.1.6.tar.gz) = 2491de946ab279a9dc52793e3100f92e4fdeec3e
SHA1 (w3m-0.1.6.tar.gz) = 3829fcbecba3499a4fc1a498cd21be0fc36a9b0c

View File

@ -1,36 +1,31 @@
--- XMakefile.orig Fri Oct 8 08:19:52 1999
+++ XMakefile Fri Oct 8 22:06:01 1999
@@ -15,7 +15,8 @@
INCLUDES=-I.
DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG
-CFLAGS=$(MYCFLAGS) $(DEFS)
+CFLAGS+=$(MYCFLAGS) $(DEFS)
+PREFIX?=/usr/local
LIBS=$(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
$(TARGET): $(ALLOBJS) $(GCTARGET)
@@ -27,15 +28,14 @@
--- XMakefile.orig Fri Jan 28 20:14:18 2000
+++ XMakefile Fri Jan 28 20:19:41 2000
@@ -50,17 +50,17 @@
cd gc; make CC='$(CC) $(MYCFLAGS)'
install: $(TARGET)
- -mkdir $(DESTDIR)$(BIN_DIR)
- -mkdir $(DESTDIR)$(HELP_DIR)
- cp $(TARGET) $(DESTDIR)$(BIN_DIR)
- cp w3mhelp_en.html $(DESTDIR)$(HELP_DIR)
- cp w3mhelp_ja.html $(DESTDIR)$(HELP_DIR)
- cp w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)
- cp w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)
- cp $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
- chmod go+r $(DESTDIR)$(HELP_DIR)/w3mhelp.html
+ -mkdir -p -m 755 $(BIN_DIR)
+ -mkdir -p -m 755 $(HELP_DIR)
+ -mkdir -p -m 755 $(DOC_DIR)
+ install -c -m 755 $(TARGET) $(BIN_DIR)
+ install -c -m 644 w3mhelp*.html $(HELP_DIR)
+ ln -s $(HELP_DIR)/$(HELP_FILE) $(HELP_DIR)/w3mhelp.html
+ install -c -m 644 doc/* $(DOC_DIR)
+ mv $(DOC_DIR)/w3m.1 $(PREFIX)/man/man1
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_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp_en.html
- $(INSTALL) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp_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; ln -s ../install.sh .; for i in *.cgi; do $(INSTALL) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
+ $(BSD_INSTALL_PROGRAM_DIR) $(BIN_DIR)
+ $(BSD_INSTALL_DATA_DIR) $(HELP_DIR)
+ $(BSD_INSTALL_PROGRAM_DIR) $(LIB_DIR)
+ $(BSD_INSTALL_PROGRAM) $(TARGET) $(BIN_DIR)
+ $(BSD_INSTALL_DATA) w3mhelp_en.html $(HELP_DIR)
+ $(BSD_INSTALL_DATA) w3mhelp_ja.html $(HELP_DIR)
+ $(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(HELP_DIR)
+ $(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(HELP_DIR)
+ ln $(HELP_DIR)/$(HELP_FILE) $(HELP_DIR)/w3mhelp.html
+ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$d $(LIB_DIR); done
+ (cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(LIB_DIR); done)
uninstall:
-$(RM) $(BIN_DIR)/$(TARGET)

View File

@ -1,54 +1,20 @@
--- config.h.orig Thu Oct 7 05:29:53 1999
+++ config.h Sat Oct 9 01:21:22 1999
@@ -28,37 +28,37 @@
/**********************************************************/
#ifdef makefile_parameter
-BIN_DIR = /usr/local/bin
-HELP_DIR = /usr/local/lib
-HELP_FILE = w3mhelp_ja.html
-SYS_LIBRARIES = -lbsd -lnsl -ltermcap -L/usr/local/ssl/lib -lssl -lcrypto
+BIN_DIR = $(PREFIX)/bin
+HELP_DIR = $(PREFIX)/share/w3m
+HELP_FILE = w3mhelp-lynx_en.html
+DOC_DIR = $(PREFIX)/share/doc/w3m
+SYS_LIBRARIES = -lcurses
LOCAL_LIBRARIES =
CC = gcc
-MYCFLAGS = -g -I./gc -I/usr/local/ssl/include -I/usr/local/ssl/include/openssl
-KEYBIND_SRC = keybind.c
-KEYBIND_OBJ = keybind.o
+MYCFLAGS = -DHELP_FILE="\"$(PREFIX)/share/w3m/w3mhelp.html\"" -I./gc
+KEYBIND_SRC = keybind_lynx.c
+KEYBIND_OBJ = keybind_lynx.o
EXT=
GCLIB=gc/gc.a
GCTARGET=gc/gc.a
#else
-#define DISPLAY_CODE 'E'
+#define DISPLAY_CODE 'x'
#define JA 0
#define EN 1
-#define LANG JA
-#define KANJI_SYMBOLS
+#define LANG EN
+#undef KANJI_SYMBOLS
#define COLOR
#undef MOUSE
#define MENU
#define USE_COOKIE
-#define USE_SSL
+#undef USE_SSL
-#define DEF_EDITOR "/bin/vi"
-#define DEF_MAILER "/bin/mail"
+#define DEF_EDITOR "/usr/bin/vi"
+#define DEF_MAILER "/usr/bin/mail"
#define DEF_EXT_BROWSER "/usr/bin/lynx"
-#define HELP_FILE "/usr/local/lib/w3mhelp.html"
#define BOOKMARK "~/.w3m/bookmark.html"
#define KEYMAP_FILE "~/.w3m/keymap"
#define MENU_FILE "~/.w3m/menu"
--- 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

View File

@ -1,7 +1,7 @@
--- main.c.orig Sat Oct 9 00:04:43 1999
+++ main.c Sat Oct 9 00:10:21 1999
@@ -47,10 +47,21 @@
# include "gc_private.h"
--- main.c.orig Fri Jan 21 17:18:58 2000
+++ main.c Fri Jan 28 22:34:23 2000
@@ -73,10 +73,21 @@
#endif
int real_main(int,char**,char**);
+/* Out-of-memory handler for GC. */

View File

@ -1,13 +1,11 @@
bin/w3m
share/w3m/w3mhelp-lynx_en.html
share/w3m/w3mhelp-lynx_ja.html
share/w3m/w3mhelp_en.html
share/w3m/w3mhelp_ja.html
share/w3m/w3mhelp.html
@dirrm share/w3m
lib/w3m/dirlist.cgi
lib/w3m/dirlist2.cgi
lib/w3m/w3mbookmark
lib/w3m/w3mhelperpanel
share/doc/w3m/FAQ.html
share/doc/w3m/HISTORY
share/doc/w3m/MANUAL.html
share/doc/w3m/MANUAL_lynx.html
share/doc/w3m/README
share/doc/w3m/README.cygwin
share/doc/w3m/README.dict
@ -17,5 +15,11 @@ share/doc/w3m/keymap.default
share/doc/w3m/keymap.lynx
share/doc/w3m/menu.default
share/doc/w3m/menu.submenu
share/w3m/w3mhelp-lynx_en.html
share/w3m/w3mhelp-lynx_ja.html
share/w3m/w3mhelp.html
share/w3m/w3mhelp_en.html
share/w3m/w3mhelp_ja.html
@dirrm share/w3m
@dirrm share/doc/w3m
man/man1/w3m.1
@dirrm lib/w3m

30
www/w3m/scripts/configure vendored Normal file
View File

@ -0,0 +1,30 @@
# $Id: configure,v 1.1 2000/01/30 22:12:24 d Exp $
echo "Creating ${WRKBUILD}/config.param"
set `uname -a`
host=$2
exec 1>${WRKBUILD}/config.param
echo "# Configuretion at $host"
echo def_bindir="${PREFIX}/bin"
echo def_libdir="${PREFIX}/lib/w3m"
echo def_helpdir="${PREFIX}/share/w3m"
echo pref_lang=2
echo lynx_key=y
echo use_color=y
echo use_mouse=y
echo use_menu=y
echo use_cookie=y
echo use_ssl=y
echo dmodel=5
echo ded="vi"
echo dmail="mail"
echo dbrowser="lynx"
echo dcc='${CC}'
echo dcflags='${CFLAGS}'
echo dtermlib='-ltermlib'
echo dldflags=''
exit 0