Date: Sat, 8 Jul 2000 14:04:04 +0900 (JST) From: nobutaka@nobutaka.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/19779: Update port: www/w3m Message-ID: <200007080504.OAA02054@nobutaka.com>
next in thread | raw e-mail | index | archive | help
>Number: 19779 >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 Jul 07 22:10:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: MANTANI Nobutaka >Release: FreeBSD 5.0-CURRENT i386 >Organization: Hiroshima University >Environment: >Description: Update to 0.1.11-pre. Added file: patches/patch-at Removed files: patches/patch-ap patch-as >How-To-Repeat: >Fix: diff -urN w3m.old/Makefile w3m/Makefile --- w3m.old/Makefile Sat Jul 8 13:50:42 2000 +++ w3m/Makefile Sat Jul 8 13:58:06 2000 @@ -6,18 +6,18 @@ # PORTNAME= w3m -PORTVERSION= 0.1.9 +PORTVERSION= 0.1.11p 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/ +DISTNAME= w3m-0.1.11-pre MAINTAINER= nobutaka@nobutaka.com BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc -WRKSRC= ${WRKDIR}/${PORTNAME} MAN1= w3m.1 MANLANG= "" CFLAGS= -pipe @@ -48,7 +48,6 @@ 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 .endif @@ -61,6 +60,9 @@ post-configure: @${CP} ${TARGET} ${TARGET}.in @${SED} ${SED_CMD} < ${TARGET}.in > ${TARGET} + @${SED} -e "s,@PERL@,${PERL},g" \ + -e "s,@CYGWIN@,0,g" \ + < ${WRKSRC}/scripts/dirlist.in > ${WRKSRC}/scripts/dirlist.cgi post-install: .if !defined(NOPORTDOCS) diff -urN w3m.old/files/md5 w3m/files/md5 --- w3m.old/files/md5 Sat Jul 8 13:50:25 2000 +++ w3m/files/md5 Fri Jul 7 18:45:11 2000 @@ -1 +1 @@ -MD5 (w3m-0.1.9.tar.gz) = 311e36e3e2eb673c01dd9a63d78a9936 +MD5 (w3m-0.1.11-pre.tar.gz) = d9fb24700ecde78624280467dda1aee5 diff -urN w3m.old/patches/patch-aa w3m/patches/patch-aa --- w3m.old/patches/patch-aa Sat Jul 8 13:50:26 2000 +++ w3m/patches/patch-aa Fri Jul 7 19:03:32 2000 @@ -1,6 +1,6 @@ ---- config.h.orig Fri Apr 21 12:37:50 2000 -+++ config.h Sat Apr 22 06:22:36 2000 -@@ -64,20 +64,16 @@ +--- config.h.orig Wed Jun 14 19:49:48 2000 ++++ config.h Fri Jul 7 18:59:48 2000 +@@ -69,20 +69,16 @@ /**********************************************************/ #ifdef makefile_parameter @@ -8,7 +8,7 @@ -HELP_DIR = /usr/local/lib/w3m -LIB_DIR = /usr/local/lib/w3m -HELP_FILE = w3mhelp-w3m_ja.html --SYS_LIBRARIES = -lgpm -lbsd -lnsl -lncurses -L/usr/local/ssl/lib -lssl -lcrypto +-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 @@ -25,8 +25,8 @@ -GCTARGET=gc/gc.a RANLIB=ranlib MKDIR=mkdir -p - VERSION=0.1.9 -@@ -89,26 +85,34 @@ + VERSION=0.1.11-pre +@@ -94,26 +90,34 @@ #define JA 0 #define EN 1 @@ -46,23 +46,21 @@ #define MENU #define USE_COOKIE -#define USE_SSL --#define USE_SSL_VERIFY +#undef USE_SSL -+#undef USE_SSL_VERIFY + #undef USE_SSL_VERIFY #undef FTPPASS_HOSTNAMEGEN - + #undef SHOW_PARAMS -#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 "/usr/local/lib/w3m" +-#define HELP_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-w3m_ja.html" diff -urN w3m.old/patches/patch-ao w3m/patches/patch-ao --- w3m.old/patches/patch-ao Sat Jul 8 13:50:26 2000 +++ w3m/patches/patch-ao Fri Jun 9 04:56:24 2000 @@ -1,17 +1,17 @@ ---- rc.c.orig Sat Apr 22 06:47:16 2000 -+++ rc.c Sat Apr 22 06:47:24 2000 -@@ -762,16 +762,3 @@ +--- rc.c.orig Fri Jun 9 04:55:18 2000 ++++ rc.c Fri Jun 9 04:55:26 2000 +@@ -990,16 +990,3 @@ Strcat_charp(file, base); return expandName(file->ptr); } - --char * +-char * -helpFile(char *base) -{ -#ifdef __EMX__ -- Str file = Strnew_charp(get_os2_dft("W3M_HELP_DIR", HELP_DIR)); +- Str file = Strnew_charp(get_os2_dft("W3M_HELP_DIR", HELP_DIR)); -#else /* not __EMX__ */ -- Str file = Strnew_charp(HELP_DIR); +- Str file = Strnew_charp(HELP_DIR); -#endif /* not __EMX__ */ - Strcat_char(file, '/'); - Strcat_charp(file, base); diff -urN w3m.old/patches/patch-ap w3m/patches/patch-ap --- w3m.old/patches/patch-ap Sat Jul 8 13:50:26 2000 +++ w3m/patches/patch-ap Thu Jan 1 09:00:00 1970 @@ -1,8 +0,0 @@ ---- 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 - # - # Directory list CGI by Hironori Sakamoto (hsaka@mth.biglobe.ne.jp) - # diff -urN w3m.old/patches/patch-as w3m/patches/patch-as --- w3m.old/patches/patch-as Sat Jul 8 13:50:26 2000 +++ w3m/patches/patch-as Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ ---- 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/patches/patch-at w3m/patches/patch-at --- w3m.old/patches/patch-at Thu Jan 1 09:00:00 1970 +++ w3m/patches/patch-at Fri Jul 7 19:14:09 2000 @@ -0,0 +1,12 @@ +--- file.c.orig Fri Jul 7 19:08:32 2000 ++++ file.c Fri Jul 7 19:08:44 2000 +@@ -5239,7 +5239,9 @@ + Strcat(tmp, lineBuf2); + lineBuf2 = tmp; + } ++#ifdef JP_CHARSET + lineBuf2 = convertLine(&uf, lineBuf2, &code); ++#endif + lineBuf2 = checkType(lineBuf2->ptr, propBuffer, LINELEN); + len = lineBuf2->length; + l = New(Line); >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?200007080504.OAA02054>