From owner-freebsd-ports Sat Jan 29 9:30:15 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 4A28E1585F for ; Sat, 29 Jan 2000 09:30:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id JAA90717; Sat, 29 Jan 2000 09:30:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from narcissus.pel.sys.hiroshima-u.ac.jp (ppp-saijo-160.ipc.hiroshima-u.ac.jp [133.41.4.160]) by hub.freebsd.org (Postfix) with ESMTP id C997215266 for ; Sat, 29 Jan 2000 09:21:20 -0800 (PST) (envelope-from nobutaka@narcissus.pel.sys.hiroshima-u.ac.jp) Received: (from nobutaka@localhost) by narcissus.pel.sys.hiroshima-u.ac.jp (8.9.3/8.9.3) id CAA54344; Sun, 30 Jan 2000 02:19:51 +0900 (JST) (envelope-from nobutaka) Message-Id: <200001291719.CAA54344@narcissus.pel.sys.hiroshima-u.ac.jp> Date: Sun, 30 Jan 2000 02:19:51 +0900 (JST) From: nobutaka@nobutaka.com Reply-To: nobutaka@nobutaka.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/16448: Update port: www/w3m Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 16448 >Category: ports >Synopsis: Update port: www/w3m >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jan 29 09:30:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: MANTANI Nobutaka >Release: FreeBSD 4.0-CURRENT i386 >Organization: Hiroshima University >Environment: >Description: Upgrade to 0.1.7. Added files: patches/ patch-ao patch-ap patch-aq Removed files: patches/ patch-al patch-am patch-an >How-To-Repeat: >Fix: diff -urN w3m.old/Makefile w3m/Makefile --- w3m.old/Makefile Sat Jan 29 23:30:43 2000 +++ w3m/Makefile Sun Jan 30 02:13:32 2000 @@ -1,20 +1,18 @@ # New ports collection makefile for: w3m -# Version required: 991028-2 +# Version required: 0.1.7 # Date Created: 7 Oct 1999 # Whom: MANTANI Nobutaka # # $FreeBSD: ports/www/w3m/Makefile,v 1.7 2000/01/24 01:11:12 sumikawa Exp $ # -DISTNAME= w3m-${W3M_DIST_VER} -PKGNAME?= w3m-${W3M_VER} -W3M_DIST_VER= 991203 -W3M_VER= ${W3M_DIST_VER} +DISTNAME= w3m-${W3M_VER} +W3M_VER= 0.1.7 CATEGORIES?= www ipv6 -MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \ - ftp://ftp.firedrake.org/w3m/ \ - http://www.instinct.org/~pgl/w3m/ \ - http://grilli.net/mirrors/w3m/download/ +MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/dev/ \ + ftp://ftp.firedrake.org/w3m/dev/ \ + http://www.instinct.org/~pgl/w3m/dev/ \ + http://grilli.net/mirrors/w3m/download/dev/ MAINTAINER= nobutaka@nobutaka.com @@ -27,7 +25,7 @@ MANLANG= "" TARGET= ${WRKSRC}/config.h -DOCS= FAQ.html MANUAL.html MANUAL_lynx.html README \ +DOCS= FAQ.html HISTORY MANUAL.html README \ README.dict README.func STORY.html keymap.default \ keymap.lynx menu.default menu.submenu SED_CMD= -e "s,%%PREFIX%%,${PREFIX},g" \ diff -urN w3m.old/files/md5 w3m/files/md5 --- w3m.old/files/md5 Sat Jan 29 23:30:42 2000 +++ w3m/files/md5 Sat Jan 29 22:37:49 2000 @@ -1 +1 @@ -MD5 (w3m-991203.tar.gz) = 26339b5854d53ac185cf7904fa903c18 +MD5 (w3m-0.1.7.tar.gz) = 113644aea9749224ac961ffa3c24766a diff -urN w3m.old/patches/patch-aa w3m/patches/patch-aa --- w3m.old/patches/patch-aa Sat Jan 29 23:30:42 2000 +++ w3m/patches/patch-aa Sat Jan 29 22:37:49 2000 @@ -1,35 +1,32 @@ ---- config.h.orig Thu Dec 2 13:12:36 1999 -+++ config.h Mon Dec 6 03:21:06 1999 -@@ -49,18 +49,20 @@ +--- config.h.orig Fri Jan 28 09:48:51 2000 ++++ config.h Fri Jan 28 18:53:34 2000 +@@ -59,19 +59,16 @@ /**********************************************************/ #ifdef makefile_parameter -BIN_DIR = /usr/local/bin -HELP_DIR = /usr/local/lib/w3m +-LIB_DIR = /usr/local/lib/w3m -HELP_FILE = w3mhelp_ja.html --SYS_LIBRARIES = -lgpm -lbsd -lncurses +-SYS_LIBRARIES = -lgpm -lbsd -lncurses -L/usr/local/ssl/lib -lssl -lcrypto +BIN_DIR = %%PREFIX%%/bin -+LIB_DIR = %%PREFIX%%/libexec/w3m +HELP_DIR = %%PREFIX%%/share/doc/w3m +HELP_DIR_JA = %%PREFIX%%/share/doc/ja/w3m ++LIB_DIR = %%PREFIX%%/libexec/w3m +HELP_FILE = w3mhelp_en.html +SYS_LIBRARIES = -lncurses LOCAL_LIBRARIES = -CC = gcc --MYCFLAGS = -g -I./gc -+#CC = gcc -+#MYCFLAGS = -g -I./gc +-MYCFLAGS = -g -I./gc -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include KEYBIND_SRC = keybind.c KEYBIND_OBJ = keybind.o EXT= -GCLIB=gc/gc.a -GCTARGET=gc/gc.a -+#GCLIB=gc/gc.a -+#GCTARGET=gc/gc.a + RANLIB=ranlib + MKDIR=mkdir -p #else - - -@@ -68,21 +70,30 @@ +@@ -81,23 +78,31 @@ #define JA 0 #define EN 1 @@ -43,19 +40,22 @@ #define COLOR #define MOUSE -#define USE_GPM +-#undef USE_SYSMOUSE +#undef USE_GPM ++#define USE_SYSMOUSE #define MENU #define USE_COOKIE - #undef USE_SSL +-#define USE_SSL ++#undef USE_SSL --#define DEF_EDITOR "/bin/vi" + #define DEF_EDITOR "/usr/bin/vi" -#define DEF_MAILER "/bin/mail" -#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 "/usr/local/lib/w3m" +-#define HELP_DIR "/usr/local/lib/w3m" -#define HELP_FILE "w3mhelp.html" +#define LIB_DIR "%%PREFIX%%/libexec/w3m" +#ifdef JAPANESE diff -urN w3m.old/patches/patch-ae w3m/patches/patch-ae --- w3m.old/patches/patch-ae Sat Jan 29 23:30:42 2000 +++ w3m/patches/patch-ae Sat Jan 29 22:37:49 2000 @@ -1,18 +1,16 @@ ---- XMakefile.orig Fri Dec 3 10:57:55 1999 -+++ XMakefile Mon Dec 6 03:12:50 1999 -@@ -17,16 +17,16 @@ +--- XMakefile.orig Fri Jan 28 08:38:16 2000 ++++ XMakefile Fri Jan 28 18:55:34 2000 +@@ -18,14 +18,14 @@ INCLUDES=-I. -DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG -CFLAGS=$(MYCFLAGS) $(DEFS) --LIBS=-L. -laa $(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) +-LIBS=-L. -lindep $(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) +DEFS+=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG +CFLAGS+=$(MYCFLAGS) $(DEFS) -+LIBS+=$(ALIB) -lgc -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) ++LIBS+=-L. -lindep -lgc -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES) INSTALL=sh install.sh - INSTALL2=sh ../install.sh - RANLIB=ranlib all: $(TARGETS) @@ -21,31 +19,27 @@ $(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS) $(ALIB): $(ALIBOBJS) -@@ -48,25 +48,26 @@ - cd gc; make CC='$(CC) $(MYCFLAGS)' - +@@ -66,23 +66,24 @@ install: $(TARGETS) -- -mkdir $(DESTDIR)$(BIN_DIR) -- -mkdir $(DESTDIR)$(HELP_DIR) + -$(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_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) +- 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) -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) ++ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done ++ (cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done) uninstall: -$(RM) $(BIN_DIR)/$(TARGET) @@ -54,10 +48,10 @@ + -$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html -$(RM) $(HELP_DIR)/w3mhelp_en.html - -$(RM) $(HELP_DIR)/w3mhelp_ja.html +- -$(RM) $(HELP_DIR)/w3mhelp.html + -$(RM) $(HELP_DIR_JA)/w3mhelp_ja.html - -$(RM) $(HELP_DIR)/w3mhelp.html -- -$(RM) $(HELP_DIR)/$(BOOKMARKER) + -$(RM) $(LIB_DIR)/$(BOOKMARKER) ++ -$(RM) $(LIB_DIR)/$(HELPER) - clean: - rm -f *.o $(TARGETS) $(ALIB) mktable tagtable.c + clean: sweep + rm -f *.o *.a $(TARGETS) mktable diff -urN w3m.old/patches/patch-ak w3m/patches/patch-ak --- w3m.old/patches/patch-ak Sat Jan 29 23:30:42 2000 +++ w3m/patches/patch-ak Sat Jan 29 22:37:49 2000 @@ -1,10 +1,10 @@ ---- main.c.orig Mon Dec 6 01:55:23 1999 -+++ main.c Mon Dec 6 01:56:00 1999 -@@ -1032,7 +1032,7 @@ +--- main.c.orig Fri Jan 28 14:38:59 2000 ++++ main.c Fri Jan 28 18:57:39 2000 +@@ -1087,7 +1087,7 @@ void ldhelp(void) { -- cmd_loadURL(libFile(HELP_FILE), NULL); +- cmd_loadURL(helpFile(HELP_FILE), NULL); + cmd_loadURL(HELP_FILE, NULL); } diff -urN w3m.old/patches/patch-al w3m/patches/patch-al --- w3m.old/patches/patch-al Sat Jan 29 23:30:42 2000 +++ w3m/patches/patch-al Thu Jan 1 09:00:00 1970 @@ -1,55 +0,0 @@ ---- terms.c.orig Sat Dec 18 16:46:16 1999 -+++ terms.c Sat Dec 18 16:53:51 1999 -@@ -14,8 +14,8 @@ - #include - #ifdef USE_GPM - #include --static int is_xterm = 0; - #endif -+static int is_xterm = 0; - - #ifdef AIX - #include -@@ -1471,16 +1471,23 @@ - gpm_handler = gpm_process_mouse; - } - #endif -+ char *term; -+ -+ if (mouseActive) return; -+ term = getenv("TERM"); -+ if (!strncmp(term,"kterm",5) || !strncmp(term,"xterm",5)) { -+ is_xterm = 1; -+ } - mouseActive = 1; - } - - void mouse_end() - { - if (mouseActive == 0) return; --#ifdef USE_GPM - if (is_xterm) { - XTERM_OFF; - } -+#ifdef USE_GPM - else - Gpm_Close(); - #endif -@@ -1491,17 +1498,13 @@ - { - if (!mouseActive) - mouse_init(); --#ifdef USE_GPM - if (is_xterm) --#endif - XTERM_ON; - } - - void mouse_inactive() - { --#ifdef USE_GPM - if (is_xterm) --#endif - XTERM_OFF; - } - diff -urN w3m.old/patches/patch-am w3m/patches/patch-am --- w3m.old/patches/patch-am Sat Jan 29 23:30:42 2000 +++ w3m/patches/patch-am Thu Jan 1 09:00:00 1970 @@ -1,14 +0,0 @@ ---- keybind.c.orig Mon Dec 6 15:18:33 1999 -+++ keybind.c Mon Dec 6 15:24:31 1999 -@@ -90,9 +90,9 @@ - /* 8 9 : ; < = > ? */ - nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, - /* @ A B C D E F G */ -- nulcmd, movU, movD, movR, movL, nulcmd, nulcmd, nulcmd, -+ nulcmd, movU, movD, movR, movL, nulcmd, goLineL,pgFore, - /* H I J K L M N O */ -- nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, mouse, nulcmd, nulcmd, -+ goLineF,pgBack, nulcmd, nulcmd, nulcmd, mouse, nulcmd, nulcmd, - /* P Q R S T U V W */ - nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, - /* X Y Z [ \ ] ^ _ */ diff -urN w3m.old/patches/patch-an w3m/patches/patch-an --- w3m.old/patches/patch-an Sat Jan 29 23:30:42 2000 +++ w3m/patches/patch-an Thu Jan 1 09:00:00 1970 @@ -1,12 +0,0 @@ ---- etc.c- Wed Dec 1 19:49:48 1999 -+++ etc.c Wed Dec 8 00:43:40 1999 -@@ -1526,6 +1526,9 @@ - sec); - } - -+#ifdef INET6 -+#include -+#endif /* INET6 */ - #include - char * - FQDN(char *host) diff -urN w3m.old/patches/patch-ao w3m/patches/patch-ao --- w3m.old/patches/patch-ao Thu Jan 1 09:00:00 1970 +++ w3m/patches/patch-ao Sat Jan 29 22:37:49 2000 @@ -0,0 +1,16 @@ +--- rc.c.orig Fri Jan 28 09:46:07 2000 ++++ rc.c Fri Jan 28 18:58:17 2000 +@@ -540,13 +540,3 @@ + Strcat_charp(file, base); + return expandName(file->ptr); + } +- +-char * +-helpFile(char *base) +-{ +- Str file = Strnew_charp(HELP_DIR); +- +- Strcat_char(file, '/'); +- Strcat_charp(file, base); +- return expandName(file->ptr); +-} diff -urN w3m.old/patches/patch-ap w3m/patches/patch-ap --- w3m.old/patches/patch-ap Thu Jan 1 09:00:00 1970 +++ w3m/patches/patch-ap Wed Jan 19 06:18:29 2000 @@ -0,0 +1,8 @@ +--- scripts/dirlist.cgi.orig Wed Jan 19 06:17:10 2000 ++++ scripts/dirlist.cgi Wed Jan 19 06:17:43 2000 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # Directory list CGI by Hironori Sakamoto (hsaka@mth.biglobe.ne.jp) + # diff -urN w3m.old/patches/patch-aq w3m/patches/patch-aq --- w3m.old/patches/patch-aq Thu Jan 1 09:00:00 1970 +++ w3m/patches/patch-aq Wed Jan 19 06:18:46 2000 @@ -0,0 +1,8 @@ +--- scripts/dirlist2.cgi.orig Wed Jan 19 06:17:21 2000 ++++ scripts/dirlist2.cgi Wed Jan 19 06:17:52 2000 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + $PI = 3.141592653; + diff -urN w3m.old/pkg/PLIST w3m/pkg/PLIST --- w3m.old/pkg/PLIST Sat Jan 29 23:30:43 2000 +++ w3m/pkg/PLIST Sat Jan 29 22:37:49 2000 @@ -1,11 +1,13 @@ bin/w3m libexec/w3m/dirlist.cgi +libexec/w3m/dirlist2.cgi libexec/w3m/w3mbookmark +libexec/w3m/w3mhelperpanel share/doc/ja/w3m/w3mhelp-lynx_ja.html share/doc/ja/w3m/w3mhelp_ja.html 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.dict share/doc/w3m/README.func diff -urN w3m.old/pkg/PLIST.ja w3m/pkg/PLIST.ja --- w3m.old/pkg/PLIST.ja Sat Jan 29 23:30:43 2000 +++ w3m/pkg/PLIST.ja Sat Jan 29 23:09:50 2000 @@ -1,11 +1,12 @@ bin/w3m libexec/w3m/dirlist.cgi +libexec/w3m/dirlist2.cgi libexec/w3m/w3mbookmark +libexec/w3m/w3mhelperpanel share/doc/ja/w3m/FAQ.html share/doc/ja/w3m/HISTORY share/doc/ja/w3m/HISTORY.kokb share/doc/ja/w3m/MANUAL.html -share/doc/ja/w3m/MANUAL_lynx.html share/doc/ja/w3m/README share/doc/ja/w3m/README.dict share/doc/ja/w3m/README.func @@ -20,8 +21,8 @@ share/doc/ja/w3m/w3mhelp-lynx_ja.html share/doc/ja/w3m/w3mhelp_ja.html 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.dict share/doc/w3m/README.func >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message