Date: Sat, 22 Apr 2000 08:16:58 +0900 (JST) From: nobutaka@nobutaka.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/18149: Update port: www/w3m Message-ID: <200004212316.IAA16921@nobutaka.com>
next in thread | raw e-mail | index | archive | help
>Number: 18149
>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: Fri Apr 21 17:20:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: MANTANI Nobutaka
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
Hiroshima University
>Environment:
>Description:
Update to version 0.1.9.
Added files:
patches/ patch-as
Removed files:
patches/ patch-aq patch-ar
>How-To-Repeat:
>Fix:
diff -urN w3m.old/Makefile w3m/Makefile
--- w3m.old/Makefile Sat Apr 22 07:05:27 2000
+++ w3m/Makefile Sat Apr 22 07:44:54 2000
@@ -6,18 +6,17 @@
#
PORTNAME= w3m
-PORTVERSION?= ${W3M_VER}
+PORTVERSION= 0.1.9
CATEGORIES+= www ipv6
-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/
+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/
MAINTAINER= nobutaka@nobutaka.com
BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
-W3M_VER= 0.1.7
WRKSRC= ${WRKDIR}/${PORTNAME}
MAN1= w3m.1
MANLANG= ""
@@ -37,10 +36,9 @@
.endif
.if defined(JAPANESE)
-SED_CMD+= -e "s,undef JAPANESE,define JAPANESE,g" \
- -e "s,w3mhelp_en.html,w3mhelp_ja.html,g"
+SED_CMD+= -e "s,undef JAPANESE,define JAPANESE,g"
MANLANG+= ja
-DOCS_JP= ${DOCS} HISTORY HISTORY.kokb README.keymap README.kokb \
+DOCS_JP= ${DOCS} HISTORY.kokb README.keymap README.kokb \
README.menu
.endif
@@ -48,7 +46,8 @@
SSL_CFLAGS= -I${OPENSSLINC}/openssl -I${OPENSSLINC}
SSL_LIBS= -L${OPENSSLLIB} -lssl -lcrypto
-SED_CMD+= -e "s,undef USE_SSL,define USE_SSL,g"
+SED_CMD+= -e "s,undef USE_SSL,define USE_SSL,g" \
+ -e "s,undef USE_SSL_VERIFY, define USE_SSL_VERIFY,g"
.if defined(OPENSSL_RSAREF)
EXTRA_SSL_LIBS= -lRSAglue -lrsaref
@@ -67,15 +66,15 @@
.if !defined(NOPORTDOCS)
.if defined(JAPANESE)
@${MKDIR} ${PREFIX}/share/doc/ja/w3m
- @(cd ${WRKSRC}/doc-jp; \
+ @cd ${WRKSRC}/doc-jp; \
for i in ${DOCS_JP} ; do \
${INSTALL_DATA} $$i ${PREFIX}/share/doc/ja/w3m/ ; \
- done)
+ done
.endif
- @(cd ${WRKSRC}/doc; \
+ @cd ${WRKSRC}/doc; \
for i in ${DOCS} ; do \
${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
- done)
+ done
.endif
@${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1
.if defined(JAPANESE)
diff -urN w3m.old/files/md5 w3m/files/md5
--- w3m.old/files/md5 Sat Apr 22 07:05:27 2000
+++ w3m/files/md5 Sat Apr 22 06:16:12 2000
@@ -1 +1 @@
-MD5 (w3m-0.1.7.tar.gz) = 113644aea9749224ac961ffa3c24766a
+MD5 (w3m-0.1.9.tar.gz) = 311e36e3e2eb673c01dd9a63d78a9936
diff -urN w3m.old/patches/patch-aa w3m/patches/patch-aa
--- w3m.old/patches/patch-aa Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-aa Sat Apr 22 06:25:11 2000
@@ -1,32 +1,32 @@
---- config.h.orig Fri Jan 28 09:48:51 2000
-+++ config.h Fri Jan 28 18:53:34 2000
-@@ -59,19 +59,16 @@
+--- config.h.orig Fri Apr 21 12:37:50 2000
++++ config.h Sat Apr 22 06:22:36 2000
+@@ -64,20 +64,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 -L/usr/local/ssl/lib -lssl -lcrypto
+-HELP_FILE = w3mhelp-w3m_ja.html
+-SYS_LIBRARIES = -lgpm -lbsd -lnsl -lncurses -L/usr/local/ssl/lib -lssl -lcrypto
+BIN_DIR = %%PREFIX%%/bin
+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 -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
+-MYCFLAGS = -O -I./gc -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
KEYBIND_SRC = keybind.c
KEYBIND_OBJ = keybind.o
EXT=
+ MATHLIB=-lm
-GCLIB=gc/gc.a
-GCTARGET=gc/gc.a
RANLIB=ranlib
MKDIR=mkdir -p
- #else
-@@ -81,23 +78,31 @@
+ VERSION=0.1.9
+@@ -89,26 +85,34 @@
#define JA 0
#define EN 1
@@ -46,22 +46,28 @@
#define MENU
#define USE_COOKIE
-#define USE_SSL
+-#define USE_SSL_VERIFY
+#undef USE_SSL
++#undef USE_SSL_VERIFY
+ #undef FTPPASS_HOSTNAMEGEN
- #define DEF_EDITOR "/usr/bin/vi"
--#define DEF_MAILER "/bin/mail"
--#define DEF_EXT_BROWSER "/usr/local/bin/netscape"
-+#define DEF_MAILER "/usr/bin/mail"
-+#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"
+-#define DEF_EDITOR "/bin/vi"
+-#define DEF_MAILER "/bin/mail"
+-#define DEF_EXT_BROWSER "/usr/X11R6/bin/netscape"
+-
-#define LIB_DIR "/usr/local/lib/w3m"
-#define HELP_DIR "/usr/local/lib/w3m"
-#define HELP_FILE "w3mhelp.html"
++#define DEF_EDITOR "/usr/bin/vi"
++#define DEF_MAILER "/usr/bin/mail"
++#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"
++
+#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-w3m_ja.html"
+#else
-+#define HELP_FILE "%%PREFIX%%/share/doc/w3m/w3mhelp_en.html"
++#define HELP_FILE "%%PREFIX%%/share/doc/w3m/w3mhelp-w3m_en.html"
+#endif
#define W3MCONFIG "w3mconfig"
diff -urN w3m.old/patches/patch-ae w3m/patches/patch-ae
--- w3m.old/patches/patch-ae Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-ae Sat Apr 22 06:52:37 2000
@@ -1,16 +1,18 @@
---- XMakefile.orig Fri Jan 28 08:38:16 2000
-+++ XMakefile Fri Jan 28 18:55:34 2000
-@@ -18,14 +18,14 @@
+--- XMakefile.orig Fri Apr 21 13:35:48 2000
++++ XMakefile Sat Apr 22 06:51:43 2000
+@@ -18,16 +18,16 @@
INCLUDES=-I.
--DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG
+-DEFS=$(INCLUDES) # -DDEBUG
-CFLAGS=$(MYCFLAGS) $(DEFS)
--LIBS=-L. -lindep $(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
-+DEFS+=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG
-+CFLAGS+=$(MYCFLAGS) $(DEFS)
-+LIBS+=-L. -lindep -lgc -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
+-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
++DEFS+=$(INCLUDES) # -DDEBUG
++CFLAGS+=$(DEFS)
++LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
INSTALL=sh install.sh
+ INSTALL2=sh ../install.sh
+ AR=ar
all: $(TARGETS)
@@ -19,37 +21,37 @@
$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
$(ALIB): $(ALIBOBJS)
-@@ -66,23 +66,24 @@
+@@ -67,23 +67,24 @@
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_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp_en.html
-- $(INSTALL) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp_ja.html
+- $(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; 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
-+ 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)
+- (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
++ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$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_en.html
-- -$(RM) $(HELP_DIR)/w3mhelp_ja.html
+ -$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html
+- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html
- -$(RM) $(HELP_DIR)/w3mhelp.html
-+ -$(RM) $(HELP_DIR_JA)/w3mhelp_ja.html
++ -$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html
+ -$(RM) $(LIB_DIR)/$(BOOKMARKER)
+ -$(RM) $(LIB_DIR)/$(HELPER)
diff -urN w3m.old/patches/patch-ag w3m/patches/patch-ag
--- w3m.old/patches/patch-ag Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-ag Fri Apr 7 02:12:18 2000
@@ -1,11 +1,11 @@
---- w3mhelp_en.html.orig Thu Oct 7 12:17:27 1999
-+++ w3mhelp_en.html Fri Oct 15 20:40:03 1999
+--- 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_ja.html">Japanese</A>
-+<A HREF="../ja/w3m/w3mhelp_ja.html">Japanese</A>
+-<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 -urN w3m.old/patches/patch-ah w3m/patches/patch-ah
--- w3m.old/patches/patch-ah Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-ah Fri Apr 7 02:12:44 2000
@@ -1,11 +1,11 @@
---- w3mhelp_ja.html.orig Thu Oct 7 12:18:45 1999
-+++ w3mhelp_ja.html Fri Oct 15 20:40:03 1999
+--- 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_en.html">English</A>
-+<A HREF="../../w3m/w3mhelp_en.html">English</A>
+-<A HREF="w3mhelp-w3m_en.html">English</A>
++<A HREF="../../w3m/w3mhelp-w3m_en.html">English</A>
<H2>ページ/カーソル移動</H2>
<TABLE>
diff -urN w3m.old/patches/patch-ai w3m/patches/patch-ai
--- w3m.old/patches/patch-ai Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-ai Fri Apr 7 02:13:07 2000
@@ -1,11 +1,11 @@
---- w3mhelp-lynx_en.html.orig Thu Oct 7 12:18:43 1999
-+++ w3mhelp-lynx_en.html Fri Oct 15 20:40:03 1999
+--- 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_ja.html">Japanese</A>
-+<A HREF="../ja/w3m/w3mhelp_ja.html">Japanese</A>
+-<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 -urN w3m.old/patches/patch-aj w3m/patches/patch-aj
--- w3m.old/patches/patch-aj Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-aj Fri Apr 7 02:13:30 2000
@@ -1,5 +1,5 @@
---- w3mhelp-lynx_ja.html.orig Thu Oct 7 12:18:16 1999
-+++ w3mhelp-lynx_ja.html Fri Oct 15 20:40:03 1999
+--- 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>
diff -urN w3m.old/patches/patch-ak w3m/patches/patch-ak
--- w3m.old/patches/patch-ak Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-ak Sat Apr 22 06:37:32 2000
@@ -1,11 +1,11 @@
---- main.c.orig Fri Jan 28 14:38:59 2000
-+++ main.c Fri Jan 28 18:57:39 2000
-@@ -1087,7 +1087,7 @@
+--- main.c.orig Fri Apr 21 12:45:53 2000
++++ main.c Sat Apr 22 06:35:44 2000
+@@ -1139,7 +1139,7 @@
void
ldhelp(void)
{
-- cmd_loadURL(helpFile(HELP_FILE), NULL);
-+ cmd_loadURL(HELP_FILE, NULL);
+- cmd_loadURL(helpFile(HELP_FILE), NULL);
++ cmd_loadURL(HELP_FILE, NULL);
}
static void
diff -urN w3m.old/patches/patch-ao w3m/patches/patch-ao
--- w3m.old/patches/patch-ao Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-ao Sat Apr 22 06:47:29 2000
@@ -1,15 +1,18 @@
---- 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);
+--- rc.c.orig Sat Apr 22 06:47:16 2000
++++ rc.c Sat Apr 22 06:47:24 2000
+@@ -762,16 +762,3 @@
+ Strcat_charp(file, base);
+ return expandName(file->ptr);
}
-
--char *
+-char *
-helpFile(char *base)
-{
-- Str file = Strnew_charp(HELP_DIR);
--
+-#ifdef __EMX__
+- Str file = Strnew_charp(get_os2_dft("W3M_HELP_DIR", HELP_DIR));
+-#else /* not __EMX__ */
+- Str file = Strnew_charp(HELP_DIR);
+-#endif /* not __EMX__ */
- 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 Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-ap Fri Apr 7 01:10:30 2000
@@ -1,5 +1,5 @@
---- scripts/dirlist.cgi.orig Wed Jan 19 06:17:10 2000
-+++ scripts/dirlist.cgi Wed Jan 19 06:17:43 2000
+--- scripts/dirlist.cgi.orig Thu Apr 6 16:42:40 2000
++++ scripts/dirlist.cgi Thu Apr 6 16:42:48 2000
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
diff -urN w3m.old/patches/patch-aq w3m/patches/patch-aq
--- w3m.old/patches/patch-aq Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-aq Thu Jan 1 09:00:00 1970
@@ -1,8 +0,0 @@
---- 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/patches/patch-ar w3m/patches/patch-ar
--- w3m.old/patches/patch-ar Sat Apr 22 07:05:27 2000
+++ w3m/patches/patch-ar Thu Jan 1 09:00:00 1970
@@ -1,29 +0,0 @@
---- url.c.orig Sat Jan 29 02:15:47 2000
-+++ url.c Mon Jan 31 00:29:58 2000
-@@ -25,6 +25,7 @@
-
- static JMP_BUF AbortLoading;
-
-+/* XXX: note html.h SCM_* */
- static int
- DefaultPort[] = {
- 80, /* http */
-@@ -32,6 +33,8 @@
- 21, /* ftp */
- 21, /* ftpdir */
- 0, /* local - not defined */
-+ 0, /* ??? - not defined? */
-+ 0, /* exec - not defined? */
- 119, /* nntp */
- 119, /* news */
- 0, /* mailto - not defined */
-@@ -44,8 +47,9 @@
- {"http", SCM_HTTP},
- {"gopher", SCM_GOPHER},
- {"ftp", SCM_FTP},
- {"local", SCM_LOCAL},
- {"file", SCM_LOCAL},
-+ {"exec", SCM_LOCAL_CGI}, /* ??? */
- {"nntp", SCM_NNTP},
- {"news", SCM_NEWS},
- {"mailto", SCM_MAILTO},
diff -urN w3m.old/patches/patch-as w3m/patches/patch-as
--- w3m.old/patches/patch-as Thu Jan 1 09:00:00 1970
+++ w3m/patches/patch-as Sat Apr 22 07:33:40 2000
@@ -0,0 +1,10 @@
+--- etc.c.orig Sat Apr 22 07:32:07 2000
++++ etc.c Sat Apr 22 07:33:06 2000
+@@ -1079,7 +1079,6 @@
+ #else /* if !defined(USE_SSL_VERIFY) */
+ ss->status = SSL_read(ss->handle, ss->buf, ss->bufsize);
+ #endif /* !defined(USE_SSL_VERIFY) */
+- ss->status = SSL_read(ss->handle, ss->buf, ss->bufsize);
+ }
+ else
+ ss->status = read(ss->sock, ss->buf, ss->bufsize);
diff -urN w3m.old/pkg/PLIST w3m/pkg/PLIST
--- w3m.old/pkg/PLIST Sat Apr 22 07:05:27 2000
+++ w3m/pkg/PLIST Fri Apr 7 01:10:31 2000
@@ -1,10 +1,9 @@
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/ja/w3m/w3mhelp-w3m_ja.html
share/doc/w3m/FAQ.html
share/doc/w3m/HISTORY
share/doc/w3m/MANUAL.html
@@ -17,7 +16,7 @@
share/doc/w3m/menu.default
share/doc/w3m/menu.submenu
share/doc/w3m/w3mhelp-lynx_en.html
-share/doc/w3m/w3mhelp_en.html
+share/doc/w3m/w3mhelp-w3m_en.html
@dirrm libexec/w3m
@dirrm share/doc/ja/w3m
@dirrm share/doc/w3m
diff -urN w3m.old/pkg/PLIST.ja w3m/pkg/PLIST.ja
--- w3m.old/pkg/PLIST.ja Sat Apr 22 07:05:27 2000
+++ w3m/pkg/PLIST.ja Fri Apr 7 01:34:52 2000
@@ -1,6 +1,5 @@
bin/w3m
libexec/w3m/dirlist.cgi
-libexec/w3m/dirlist2.cgi
libexec/w3m/w3mbookmark
libexec/w3m/w3mhelperpanel
share/doc/ja/w3m/FAQ.html
@@ -19,7 +18,7 @@
share/doc/ja/w3m/menu.default
share/doc/ja/w3m/menu.submenu
share/doc/ja/w3m/w3mhelp-lynx_ja.html
-share/doc/ja/w3m/w3mhelp_ja.html
+share/doc/ja/w3m/w3mhelp-w3m_ja.html
share/doc/w3m/FAQ.html
share/doc/w3m/HISTORY
share/doc/w3m/MANUAL.html
@@ -32,7 +31,7 @@
share/doc/w3m/menu.default
share/doc/w3m/menu.submenu
share/doc/w3m/w3mhelp-lynx_en.html
-share/doc/w3m/w3mhelp_en.html
+share/doc/w3m/w3mhelp-w3m_en.html
@dirrm libexec/w3m
@dirrm share/doc/ja/w3m
@dirrm share/doc/w3m
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200004212316.IAA16921>