From 91cb688a956d3bcb68bc94a33b681fdc0a5cef65 Mon Sep 17 00:00:00 2001 From: Munechika SUMIKAWA Date: Tue, 7 Dec 1999 16:41:54 +0000 Subject: [PATCH] Upgrade to 991203. PR: 15283 Submitted by: maintainer --- www/w3m/Makefile | 6 ++--- www/w3m/distinfo | 2 +- www/w3m/files/patch-aa | 44 ++++++++++++++++++---------------- www/w3m/files/patch-ae | 54 +++++++++++++++++++++++++++--------------- www/w3m/files/patch-ak | 11 +++++++++ www/w3m/pkg-plist | 3 +++ www/w3m/pkg-plist.ja | 3 +++ 7 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 www/w3m/files/patch-ak diff --git a/www/w3m/Makefile b/www/w3m/Makefile index fdbdb5f55a9a..0e34760f4c70 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -8,8 +8,8 @@ DISTNAME= w3m-${W3M_DIST_VER} PKGNAME?= w3m-${W3M_VER} -W3M_DIST_VER= 991028-2 -W3M_VER= 991028.2 +W3M_DIST_VER= 991203 +W3M_VER= ${W3M_DIST_VER} CATEGORIES?= www MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \ ftp://ftp.firedrake.org/w3m/ \ @@ -55,7 +55,7 @@ SED_CMD+= -e "s,undef USE_SSL,define USE_SSL,g" .endif MAKE_FLAGS+= DEFS="-I${LOCALBASE}/include ${SSL_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -lgc ${SSL_LIBS} ${EXTRA_SSL_LIBS}" + LIBS="-L${LOCALBASE}/lib ${SSL_LIBS} ${EXTRA_SSL_LIBS}" post-configure: @${CP} ${TARGET} ${TARGET}.in diff --git a/www/w3m/distinfo b/www/w3m/distinfo index af8af41e7344..8f23a30f783a 100644 --- a/www/w3m/distinfo +++ b/www/w3m/distinfo @@ -1 +1 @@ -MD5 (w3m-991028-2.tar.gz) = 811581cdd25b1ccbeb419e4db1cdcf0d +MD5 (w3m-991203.tar.gz) = 26339b5854d53ac185cf7904fa903c18 diff --git a/www/w3m/files/patch-aa b/www/w3m/files/patch-aa index 12cb8b493332..05bbd2e0cdcd 100644 --- a/www/w3m/files/patch-aa +++ b/www/w3m/files/patch-aa @@ -1,23 +1,24 @@ ---- config.h.orig Wed Oct 27 07:04:00 1999 -+++ config.h Tue Nov 2 17:14:55 1999 -@@ -28,18 +28,19 @@ +--- config.h.orig Thu Dec 2 13:12:36 1999 ++++ config.h Mon Dec 6 03:21:06 1999 +@@ -49,18 +49,20 @@ /**********************************************************/ #ifdef makefile_parameter -BIN_DIR = /usr/local/bin -HELP_DIR = /usr/local/lib/w3m -HELP_FILE = w3mhelp_ja.html --SYS_LIBRARIES = -lbsd -lnsl -lncurses +-SYS_LIBRARIES = -lgpm -lbsd -lncurses +BIN_DIR = %%PREFIX%%/bin ++LIB_DIR = %%PREFIX%%/libexec/w3m +HELP_DIR = %%PREFIX%%/share/doc/w3m +HELP_DIR_JA = %%PREFIX%%/share/doc/ja/w3m +HELP_FILE = w3mhelp_en.html -+SYS_LIBRARIES = -ltermcap ++SYS_LIBRARIES = -lncurses LOCAL_LIBRARIES = -CC = gcc --MYCFLAGS = -g -I./gc +-MYCFLAGS = -g -I./gc +#CC = gcc -+#MYCFLAGS = -g -I./gc ++#MYCFLAGS = -g -I./gc KEYBIND_SRC = keybind.c KEYBIND_OBJ = keybind.o EXT= @@ -28,7 +29,7 @@ #else -@@ -47,19 +48,28 @@ +@@ -68,21 +70,30 @@ #define JA 0 #define EN 1 @@ -40,27 +41,28 @@ +#define LANG EN +#endif #define COLOR --#undef MOUSE -+#define MOUSE + #define MOUSE +-#define USE_GPM ++#undef USE_GPM #define MENU --#undef USE_COOKIE -+#define USE_COOKIE + #define USE_COOKIE #undef USE_SSL -#define DEF_EDITOR "/bin/vi" -#define DEF_MAILER "/bin/mail" --#define DEF_EXT_BROWSER "/usr/bin/lynx" --#define LIB_DIR "/usr/local/lib/w3m" --#define HELP_FILE "/usr/local/lib/w3m/w3mhelp.html" +-#define DEF_EXT_BROWSER "/usr/local/bin/netscape" +#define DEF_EDITOR "/usr/bin/vi" +#define DEF_MAILER "/usr/bin/mail" +#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape" -+#define LIB_DIR "%%PREFIX%%/lib/w3m" + +-#define LIB_DIR "/usr/local/lib/w3m" +-#define HELP_FILE "w3mhelp.html" ++#define LIB_DIR "%%PREFIX%%/libexec/w3m" +#ifdef JAPANESE -+#define HELP_FILE "%%PREFIX%%/share/doc/ja/w3m/w3mhelp_ja.html" ++#define HELP_FILE "%%PREFIX%%/share/doc/ja/w3m/w3mhelp_ja.html" +#else -+#define HELP_FILE "%%PREFIX%%/share/doc/w3m/w3mhelp_en.html" ++#define HELP_FILE "%%PREFIX%%/share/doc/w3m/w3mhelp_en.html" +#endif - #define BOOKMARK "~/.w3m/bookmark.html" - #define KEYMAP_FILE "~/.w3m/keymap" - #define MENU_FILE "~/.w3m/menu" + #define W3MCONFIG "w3mconfig" + + #define RC_DIR "~/.w3m/" diff --git a/www/w3m/files/patch-ae b/www/w3m/files/patch-ae index 7d2b1159deb6..541e0228f899 100644 --- a/www/w3m/files/patch-ae +++ b/www/w3m/files/patch-ae @@ -1,38 +1,51 @@ ---- XMakefile.orig Thu Oct 28 12:09:40 1999 -+++ XMakefile Tue Nov 2 17:20:30 1999 -@@ -14,9 +14,9 @@ +--- XMakefile.orig Fri Dec 3 10:57:55 1999 ++++ XMakefile Mon Dec 6 03:12:50 1999 +@@ -17,16 +17,16 @@ INCLUDES=-I. -DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG -CFLAGS=$(MYCFLAGS) $(DEFS) --LIBS=$(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) +-LIBS=-L. -laa $(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) +DEFS+=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG +CFLAGS+=$(MYCFLAGS) $(DEFS) -+LIBS+=$(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) ++LIBS+=$(ALIB) -lgc -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) INSTALL=sh install.sh + INSTALL2=sh ../install.sh + RANLIB=ranlib - $(TARGET): $(ALLOBJS) $(GCTARGET) -@@ -28,21 +28,21 @@ + all: $(TARGETS) + +-$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET) ++$(TARGET): $(ALLOBJS) $(ALIB) + $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) + + $(ALIB): $(ALIBOBJS) +@@ -48,25 +48,26 @@ cd gc; make CC='$(CC) $(MYCFLAGS)' - install: $(TARGET) + install: $(TARGETS) - -mkdir $(DESTDIR)$(BIN_DIR) - -mkdir $(DESTDIR)$(HELP_DIR) -- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR) -- $(INSTALL) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR) -- $(INSTALL) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR) -- $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR) -- $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_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 +- $(INSTALL) -m 755 $(BOOKMARKER) $(DESTDIR)$(HELP_DIR)/$(BOOKMARKER) +- (cd scripts; for i in *; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(HELP_DIR)/$$i; done) + -mkdir -p $(DESTDIR)$(BIN_DIR) ++ -mkdir -p $(DESTDIR)$(LIB_DIR) + -mkdir -p $(DESTDIR)$(HELP_DIR) + -mkdir -p $(DESTDIR)$(HELP_DIR_JA) -+ ${BSD_INSTALL_PROGRAM} $(TARGET) $(DESTDIR)$(BIN_DIR) -+ ${BSD_INSTALL_DATA} w3mhelp_en.html $(DESTDIR)$(HELP_DIR) -+ ${BSD_INSTALL_DATA} w3mhelp_ja.html $(DESTDIR)$(HELP_DIR_JA) -+ ${BSD_INSTALL_DATA} w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR) -+ ${BSD_INSTALL_DATA} w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA) ++ $(BSD_INSTALL_PROGRAM) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET) ++ $(BSD_INSTALL_DATA) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp_en.html ++ $(BSD_INSTALL_DATA) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp_ja.html ++ $(BSD_INSTALL_DATA) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html ++ $(BSD_INSTALL_DATA) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html ++ $(BSD_INSTALL_PROGRAM) -m 755 $(BOOKMARKER) $(DESTDIR)$(LIB_DIR)/$(BOOKMARKER) ++ (cd scripts; for i in *; do $(BSD_INSTALL_SCRIPT) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done) uninstall: -$(RM) $(BIN_DIR)/$(TARGET) @@ -43,5 +56,8 @@ - -$(RM) $(HELP_DIR)/w3mhelp_ja.html + -$(RM) $(HELP_DIR_JA)/w3mhelp_ja.html -$(RM) $(HELP_DIR)/w3mhelp.html +- -$(RM) $(HELP_DIR)/$(BOOKMARKER) ++ -$(RM) $(LIB_DIR)/$(BOOKMARKER) - clean: sweep + clean: + rm -f *.o $(TARGETS) $(ALIB) mktable tagtable.c diff --git a/www/w3m/files/patch-ak b/www/w3m/files/patch-ak new file mode 100644 index 000000000000..6bd70a6b11b2 --- /dev/null +++ b/www/w3m/files/patch-ak @@ -0,0 +1,11 @@ +--- main.c.orig Mon Dec 6 01:55:23 1999 ++++ main.c Mon Dec 6 01:56:00 1999 +@@ -1032,7 +1032,7 @@ + void + ldhelp(void) + { +- cmd_loadURL(libFile(HELP_FILE), NULL); ++ cmd_loadURL(HELP_FILE, NULL); + } + + static void diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist index 8e05bafe5721..4e8f3095f2d4 100644 --- a/www/w3m/pkg-plist +++ b/www/w3m/pkg-plist @@ -1,4 +1,6 @@ bin/w3m +libexec/w3m/dirlist.cgi +libexec/w3m/w3mbookmark share/doc/ja/w3m/w3mhelp-lynx_ja.html share/doc/ja/w3m/w3mhelp_ja.html share/doc/w3m/FAQ.html @@ -14,5 +16,6 @@ share/doc/w3m/menu.default share/doc/w3m/menu.submenu share/doc/w3m/w3mhelp-lynx_en.html share/doc/w3m/w3mhelp_en.html +@dirrm libexec/w3m @dirrm share/doc/ja/w3m @dirrm share/doc/w3m diff --git a/www/w3m/pkg-plist.ja b/www/w3m/pkg-plist.ja index 1ff5986721be..4302062a2f0c 100644 --- a/www/w3m/pkg-plist.ja +++ b/www/w3m/pkg-plist.ja @@ -1,4 +1,6 @@ bin/w3m +libexec/w3m/dirlist.cgi +libexec/w3m/w3mbookmark share/doc/ja/w3m/FAQ.html share/doc/ja/w3m/HISTORY share/doc/ja/w3m/HISTORY.kokb @@ -30,5 +32,6 @@ share/doc/w3m/menu.default share/doc/w3m/menu.submenu share/doc/w3m/w3mhelp-lynx_en.html share/doc/w3m/w3mhelp_en.html +@dirrm libexec/w3m @dirrm share/doc/ja/w3m @dirrm share/doc/w3m