Date: Sat, 24 Mar 2001 13:22:01 +0900 (JST) From: nobutaka@nobutaka.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/26040: Update port: www/w3m Message-ID: <200103240422.f2O4M1g54816@excalibur.nobutaka.com>
next in thread | raw e-mail | index | archive | help
>Number: 26040
>Category: ports
>Synopsis: Update port: www/w3m
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 23 20:30:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: MANTANI Nobutaka
>Release: FreeBSD 4.3-BETA i386
>Organization:
Hiroshima University
>Environment:
System: FreeBSD excalibur.nobutaka.com 4.3-BETA FreeBSD 4.3-BETA #49: Wed Mar 14 01:24:53 JST 2001 nobutaka@excalibur.nobutaka.com:/usr/src/sys/compile/EXCALIBUR i386
>Description:
Update www/w3m port to 0.2.1.
>How-To-Repeat:
>Fix:
diff -urN w3m.old/Makefile w3m/Makefile
--- w3m.old/Makefile Sat Mar 24 13:12:16 2001
+++ w3m/Makefile Fri Mar 23 15:08:55 2001
@@ -6,29 +6,18 @@
#
PORTNAME= w3m
-PORTVERSION= ${W3M_VERSION}.p.${W3M_PATCHLEVEL}
+PORTVERSION= 0.2.1
CATEGORIES+= www ipv6
-MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/dev/ \
- http://mi.med.tohoku.ac.jp/~satodai/w3m/src/dev/ \
- ftp://ftp.firedrake.org/w3m/dev/ \
- ftp://ftp.umlauf.de/pub/w3m/dev/ \
- http://www.instinct.org/w3m/dev/ \
- http://grilli.net/mirrors/w3m/download/dev/
-DISTNAME= ${PORTNAME}-${W3M_VERSION}-pre
-
-PATCH_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-PATCHFILES= ${PORTNAME}-${W3M_VERSION}-pre-hsaka${W3M_PATCHLEVEL}.patch.gz
-PATCH_DIST_STRIP= -p1
+MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
+ http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
+ ftp://ftp.firedrake.org/w3m/ \
+ ftp://ftp.umlauf.de/pub/w3m/ \
+ http://www.instinct.org/w3m/ \
+ http://grilli.net/mirrors/w3m/download/
MAINTAINER= nobutaka@nobutaka.com
-BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc \
- ${PATCH}:${PORTSDIR}/devel/patch
-
-PATCH= ${LOCALBASE}/bin/gpatch
-
-W3M_VERSION= 0.1.11
-W3M_PATCHLEVEL= 24
+BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
MAN1= w3m.1
MANLANG= ""
diff -urN w3m.old/distinfo w3m/distinfo
--- w3m.old/distinfo Sat Mar 24 13:12:16 2001
+++ w3m/distinfo Fri Mar 23 15:15:56 2001
@@ -1,2 +1 @@
-MD5 (w3m-0.1.11-pre.tar.gz) = d9fb24700ecde78624280467dda1aee5
-MD5 (w3m-0.1.11-pre-hsaka24.patch.gz) = 5a4ca6407a28c1b8dec4706d07015a1d
+MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
diff -urN w3m.old/files/patch-aa w3m/files/patch-aa
--- w3m.old/files/patch-aa Sat Mar 24 13:12:16 2001
+++ w3m/files/patch-aa Fri Mar 23 15:23:30 2001
@@ -1,6 +1,42 @@
---- config.h.orig Wed Jun 14 19:49:48 2000
-+++ config.h Fri Jul 7 18:59:48 2000
-@@ -69,20 +69,16 @@
+--- config.h.orig Fri Mar 23 11:49:44 2001
++++ config.h Fri Mar 23 15:20:22 2001
+@@ -18,7 +18,7 @@
+ goto-next-mark (ESC p), goto-next-mark (ESC n) and
+ mark-by-regexp (").
+ */
+-#undef USE_MARK
++#define USE_MARK
+
+ /*
+ If you want to load and save URL history.
+@@ -34,7 +34,7 @@
+ VIEW_UNSEENOBJECTS enables w3m to make a link to unseen objects.
+ e.g. background image.
+ */
+-#undef VIEW_UNSEENOBJECTS
++#define VIEW_UNSEENOBJECTS
+
+ /*
+ VI_PREC_NUM enables vi-like behavior for '2 SPC' or '2 b'
+@@ -49,7 +49,7 @@
+ /*
+ * Support Gopher protocol
+ */
+-#undef USE_GOPHER
++#define USE_GOPHER
+
+ /*
+ * Support NNTP
+@@ -84,7 +84,7 @@
+ /*
+ * Use Emacs-like key binding for file name completion
+ */
+-#undef EMACS_LIKE_LINEEDIT
++#define EMACS_LIKE_LINEEDIT
+
+ /*
+ * Remove line trailing spaces in html buffer.
+@@ -94,21 +94,16 @@
/**********************************************************/
#ifdef makefile_parameter
@@ -8,7 +44,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 -ltermcap -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
@@ -16,7 +52,8 @@
+SYS_LIBRARIES = -lncurses
LOCAL_LIBRARIES =
-CC = gcc
--MYCFLAGS = -O -I./gc -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
+-MYCFLAGS = -g -Wall -I./gc/include -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
+-GCCFLAGS = -g -Wall -I./gc/include -DATOMIC_UNCOLLECTABLE -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT -DNO_DEBUGGING #-DNO_SIGNALS
KEYBIND_SRC = keybind.c
KEYBIND_OBJ = keybind.o
EXT=
@@ -25,8 +62,8 @@
-GCTARGET=gc/gc.a
RANLIB=ranlib
MKDIR=mkdir -p
- VERSION=0.1.11-pre
-@@ -94,26 +90,34 @@
+ VERSION=0.2.1
+@@ -120,26 +115,36 @@
#define JA 0
#define EN 1
@@ -36,7 +73,9 @@
#define KANJI_SYMBOLS
+#else
+#define LANG EN
++#undef KANJI_SYMBOLS
+#endif
++
#define COLOR
#define MOUSE
-#define USE_GPM
@@ -46,21 +85,23 @@
#define MENU
#define USE_COOKIE
-#define USE_SSL
+-#define USE_SSL_VERIFY
+#undef USE_SSL
- #undef USE_SSL_VERIFY
- #undef FTPPASS_HOSTNAMEGEN
- #undef SHOW_PARAMS
++#undef USE_SSL_VERIFY
+ #define FTPPASS_HOSTNAMEGEN
+ #define SHOW_PARAMS
-#define DEF_EDITOR "/bin/vi"
-#define DEF_MAILER "/bin/mail"
-#define DEF_EXT_BROWSER "/usr/X11R6/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 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-w3m_ja.html"
>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?200103240422.f2O4M1g54816>