summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--www/w3m/Makefile30
-rw-r--r--www/w3m/distinfo7
-rw-r--r--www/w3m/files/extra-patch-XMakefile36
-rw-r--r--www/w3m/files/extra-patch-XMakefile.m17n36
-rw-r--r--www/w3m/files/extra-patch-terms.c.m17n16
-rw-r--r--www/w3m/files/patch-ag11
-rw-r--r--www/w3m/files/patch-ah11
-rw-r--r--www/w3m/files/patch-ai11
-rw-r--r--www/w3m/files/patch-aj11
-rw-r--r--www/w3m/files/patch-au23
-rw-r--r--www/w3m/files/patch-configure78
-rw-r--r--www/w3m/files/patch-indep.c11
-rw-r--r--www/w3m/files/patch-indep.h11
-rw-r--r--www/w3m/pkg-plist14
-rw-r--r--www/w3m/scripts/pre-configure21
15 files changed, 67 insertions, 260 deletions
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index eefaacc0c6cb..977e54690899 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -16,16 +16,21 @@ MAINTAINER?= nobutaka@FreeBSD.org
LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc
-W3M_VERSION= 0.2.2
-IMG_VERSION= 1.14
-M17N_VERSION= 0.19
-M17N_BASE_W3M_VERSION= 0.2.1
+W3M_VERSION= 0.2.3.2
+IMG_VERSION= 1.17
+M17N_VERSION= 20011230
+M17N_BASE_W3M_VERSION= 0.2.3.2
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= -nonstop
+CONFIGURE_ARGS= -nonstop --prefix=${PREFIX} \
+ --libdir=${PREFIX}/libexec/w3m \
+ --helpdir=${PREFIX}/share/doc/w3m \
+ --helpdir-ja=${PREFIX}/share/doc/ja/w3m \
+ --gc-includedir=${LOCALBASE}/include \
+ --gc-libdir=${LOCALBASE}/lib
HOSTNAME!= /bin/hostname
SCRIPTS_ENV= HOSTNAME=${HOSTNAME} WRKSRC=${WRKSRC} PREFIX=${PREFIX} \
- LOCALBASE=${LOCALBASE} JAPANESE=${JAPANESE} \
+ CC=${CC} LOCALBASE=${LOCALBASE} JAPANESE=${JAPANESE} \
USE_OPENSSL="${USE_OPENSSL}" SSL_CFLAGS="${SSL_CFLAGS}" \
SSL_LIBS="${SSL_LIBS}" EXTRA_SSL_LIBS="${EXTRA_SSL_LIBS}" \
INLINE_IMAGE=${INLINE_IMAGE} M17N=${M17N}
@@ -49,20 +54,15 @@ USE_OPENSSL= yes
PORTVERSION:= ${M17N_BASE_W3M_VERSION}+${M17N_VERSION}
MASTER_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-DISTNAME= ${PORTNAME}-m17n-${M17N_VERSION}
+DISTNAME= ${PORTNAME}-${M17N_BASE_W3M_VERSION}-m17n-${M17N_VERSION}
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-configure.m17n
+CONFIGURE_ARGS+= --suffix=""
-PATCH_SITES= http://www.nobutaka.com/FreeBSD/ports/20011009/
-PATCHFILES= ${PORTNAME}-m17n-${M17N_VERSION}-security-fix.diff
-PATCH_DIST_STRIP= -p0 -F3
-
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-XMakefile.m17n \
- ${PATCHDIR}/extra-patch-terms.c.m17n
PLIST_SUB+= M17N_ONLY="" NO_M17N="@comment "
# Disable inline image support for w3m-m17n.
.undef INLINE_IMAGE
.else
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-XMakefile
PLIST_SUB+= M17N_ONLY="@comment " NO_M17N=""
.endif
@@ -89,7 +89,7 @@ MAKE_FLAGS+= DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
.if defined(INLINE_IMAGE)
PORTVERSION:= ${PORTVERSION}+${IMG_VERSION}
PATCH_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-PATCHFILES= ${PORTNAME}-${W3M_VERSION}-img-${IMG_VERSION}.patch
+PATCHFILES= ${PORTNAME}-${W3M_VERSION}-img-${IMG_VERSION}.patch.gz
PATCH_DIST_STRIP= -p1
USE_IMLIB= yes
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index baee74b35789..8a7b1a5eca64 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,4 +1,3 @@
-MD5 (w3m-0.2.2.tar.gz) = 5c7f93827471fa86080a742b4bbaf51d
-MD5 (w3m-0.2.2-img-1.14.patch) = 6acfce4b99497197d2665cfa74005ca2
-MD5 (w3m-m17n-0.19.tar.gz) = 96243978524a7b8fba6cbb413026eeff
-MD5 (w3m-m17n-0.19-security-fix.diff) = 3d7bb72b8d12e6fc8ba485121b458148
+MD5 (w3m-0.2.3.2.tar.gz) = 8c97d7a9968bd3f54373b4cbd2c391e0
+MD5 (w3m-0.2.3.2-img-1.17.patch.gz) = ccb33d844012e3cb0fe9725c111770e1
+MD5 (w3m-0.2.3.2-m17n-20011230.tar.gz) = e1f5db3bc1fb8f9f7204dcdd5150ef10
diff --git a/www/w3m/files/extra-patch-XMakefile b/www/w3m/files/extra-patch-XMakefile
deleted file mode 100644
index 2d8efe6a9113..000000000000
--- a/www/w3m/files/extra-patch-XMakefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- XMakefile.orig Thu Sep 27 21:30:08 2001
-+++ XMakefile Sun Oct 7 14:42:43 2001
-@@ -80,22 +80,23 @@
- 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-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 $(EXT_TARGETS); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; 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
-+ $(BSD_INSTALL_DATA) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
-+ for d in $(EXT_TARGETS); do $(BSD_INSTALL_SCRIPT) $$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-w3m_en.html
-- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html
-+ -$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html
- -$(RM) $(HELP_DIR)/w3mhelp.html
- -$(RM) $(LIB_DIR)/$(BOOKMARKER)
- -$(RM) $(LIB_DIR)/$(HELPER)
diff --git a/www/w3m/files/extra-patch-XMakefile.m17n b/www/w3m/files/extra-patch-XMakefile.m17n
deleted file mode 100644
index da5ba4c68f88..000000000000
--- a/www/w3m/files/extra-patch-XMakefile.m17n
+++ /dev/null
@@ -1,36 +0,0 @@
---- XMakefile.orig Mon Oct 8 13:08:11 2001
-+++ XMakefile Mon Oct 8 13:11:26 2001
-@@ -87,22 +87,23 @@
- 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-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; 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
-+ $(BSD_INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
-+ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_SCRIPT) $$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-w3m_en.html
-- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html
-+ -$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html
- -$(RM) $(HELP_DIR)/w3mhelp.html
-
- clean: sweep
diff --git a/www/w3m/files/extra-patch-terms.c.m17n b/www/w3m/files/extra-patch-terms.c.m17n
deleted file mode 100644
index d061e70c3b1e..000000000000
--- a/www/w3m/files/extra-patch-terms.c.m17n
+++ /dev/null
@@ -1,16 +0,0 @@
---- terms.c.orig Sun Oct 22 00:46:08 2000
-+++ terms.c Sun Oct 22 01:23:53 2000
-@@ -17,7 +17,13 @@
- #include <gpm.h>
- #endif /* USE_GPM */
- #ifdef USE_SYSMOUSE
-+#include <osreldate.h>
-+#if (__FreeBSD_version >= 400017)
-+#include <sys/consio.h>
-+#include <sys/fbio.h>
-+#else
- #include <machine/console.h>
-+#endif
- int (*sysm_handler) (int x, int y, int nbs, int obs);
- static int cwidth = 8, cheight = 16;
- static int xpix, ypix, nbs, obs = 0;
diff --git a/www/w3m/files/patch-ag b/www/w3m/files/patch-ag
deleted file mode 100644
index 67a6d97b2ce5..000000000000
--- a/www/w3m/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-w3m_ja.html">Japanese</A>
-+<A HREF="../ja/w3m/w3mhelp-w3m_ja.html">Japanese</A>
-
- <H2>Page/Cursor motion</H2>
- <table>
diff --git a/www/w3m/files/patch-ah b/www/w3m/files/patch-ah
deleted file mode 100644
index da8697fe6eae..000000000000
--- a/www/w3m/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-w3m_en.html">English</A>
-+<A HREF="../../w3m/w3mhelp-w3m_en.html">English</A>
-
- <H2>ページ/カーソル移動</H2>
- <TABLE>
diff --git a/www/w3m/files/patch-ai b/www/w3m/files/patch-ai
deleted file mode 100644
index 2d73a52c8895..000000000000
--- a/www/w3m/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-lynx_ja.html">Japanese</A>
-+<A HREF="../ja/w3m/w3mhelp-lynx_ja.html">Japanese</A>
-
- <H3>Page/Cursor motion</H3>
- <table>
diff --git a/www/w3m/files/patch-aj b/www/w3m/files/patch-aj
deleted file mode 100644
index 4922c75138e8..000000000000
--- a/www/w3m/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
-
--<A HREF="w3mhelp-lynx_en.html">English</A>
-+<A HREF="../../w3m/w3mhelp-lynx_en.html">English</A>
-
- <H3>ページ/カーソル移動</H3>
- <table>
diff --git a/www/w3m/files/patch-au b/www/w3m/files/patch-au
deleted file mode 100644
index 30d8d47cfbf9..000000000000
--- a/www/w3m/files/patch-au
+++ /dev/null
@@ -1,23 +0,0 @@
---- terms.c.orig Mon Nov 5 02:59:40 2001
-+++ terms.c Mon Nov 5 02:59:17 2001
-@@ -244,8 +244,18 @@
- TerminalGet(tty, &d_ioval);
- #ifdef MOUSE
- term = getenv("TERM");
-- if (!strncmp(term, "kterm", 5) || !strncmp(term, "xterm", 5)) {
-- is_xterm = 1;
-+ {
-+ static struct { const char *prefix; int len; } xtermlike[] = {
-+ { "kterm", 5 }, { "xterm", 5 }, { "rxvt", 4 }
-+ };
-+ int i;
-+
-+ for (i = 0; i < sizeof(xtermlike)/sizeof(xtermlike[0]); i++) {
-+ if (!strncmp(term, xtermlike[i].prefix, xtermlike[i].len)) {
-+ is_xterm = 1;
-+ break;
-+ }
-+ }
- }
- #endif
- return 0;
diff --git a/www/w3m/files/patch-configure b/www/w3m/files/patch-configure
index f30e30de70fe..bf57cd14a126 100644
--- a/www/w3m/files/patch-configure
+++ b/www/w3m/files/patch-configure
@@ -1,57 +1,45 @@
---- configure.orig Thu Sep 27 21:30:08 2001
-+++ configure Sun Oct 7 14:33:20 2001
-@@ -33,7 +33,9 @@
-
- # parameters:
+--- configure.orig Fri Dec 21 11:11:50 2001
++++ configure Sun Jan 6 15:25:08 2002
+@@ -64,6 +64,9 @@
+ -helpdir=*|--helpdir=*)
+ helpdir=`expr "$1" : "-*helpdir=\(.*\)"`
+ ;;
++ -helpdir-ja=*|--helpdir-ja=*)
++ helpdir_ja=`expr "$1" : "-*helpdir-ja=\(.*\)"`
++ ;;
+ -sysconfdir=*|--sysconfdir=*)
+ sysconfdir=`expr "$1" : "-*sysconfdir=\(.*\)"`
+ ;;
+@@ -513,6 +516,16 @@
+ helpdir=$_dir
+ echo "helpdir='$helpdir'" >> config.param
--prefix=/usr/local
-+if [ -z "$prefix" ]; then
-+ prefix=/usr/local
++d_helpdir_ja=$helpdir_ja
++if [ -z "$d_helpdir_ja" ]; then
++ d_helpdir_ja="$topdir/share/w3m"
+fi
- all_yes=0
- while [ $# -gt 0 ]
- do
-@@ -332,6 +334,9 @@
- readdir "$def_helpdir"
- helpdir=$_dir
- echo "def_helpdir='$helpdir'" >> config.param
-+readdir "$def_helpdir_ja"
++echo "Which directory do you want to put the Japanese helpfile?"
++Echo "(default: $d_helpdir_ja) "
++readdir "$d_helpdir_ja"
+helpdir_ja=$_dir
-+echo "def_helpdir_ja='$helpdir_ja'" >> config.param
-
- echo "Which language do you prefer?"
- echo " 1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)"
-@@ -1686,7 +1691,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'
-@@ -1731,7 +1736,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.
-@@ -1753,6 +1758,7 @@
++echo "helpdir_ja='$helpdir_ja'" >> config.param
++
+ d_sysconfdir=$sysconfdir
+ if [ -z "$d_sysconfdir" ]; then
+ d_sysconfdir="$topdir/etc/w3m"
+@@ -1948,6 +1961,7 @@
BIN_DIR = $bindir
HELP_DIR = $helpdir
+HELP_DIR_JA = $helpdir_ja
- LIB_DIR = $suplibdir
+ LIB_DIR = $libdir
+ ETC_DIR = $sysconfdir
HELP_FILE = $helpfile
- SYS_LIBRARIES = $gpmlib $extlib $termlib $ssllib $v6lib
-@@ -1801,6 +1807,7 @@
+@@ -2007,6 +2021,7 @@
- #define LIB_DIR "$suplibdir"
+ #define LIB_DIR "$libdir"
#define HELP_DIR "$helpdir"
+#define HELP_DIR_JA "$helpdir_ja"
+ #define ETC_DIR "$sysconfdir"
#define HELP_FILE "w3mhelp.html"
- #define W3MCONFIG "w3mconfig"
-
+ #define HELP_CGI "w3mhelp"
diff --git a/www/w3m/files/patch-indep.c b/www/w3m/files/patch-indep.c
deleted file mode 100644
index ebd135d10ddb..000000000000
--- a/www/w3m/files/patch-indep.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- indep.c.orig Mon Oct 29 09:52:32 2001
-+++ indep.c Mon Oct 29 09:52:37 2001
-@@ -181,7 +181,7 @@
-
- /* string search using the simplest algorithm */
- char *
--strcasestr(char *s1, char *s2)
-+strcasestr(const char *s1, const char *s2)
- {
- int len1, len2;
- len1 = strlen(s1);
diff --git a/www/w3m/files/patch-indep.h b/www/w3m/files/patch-indep.h
deleted file mode 100644
index 609e519c31ec..000000000000
--- a/www/w3m/files/patch-indep.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- indep.h.orig Mon Oct 29 09:49:01 2001
-+++ indep.h Mon Oct 29 09:49:52 2001
-@@ -23,7 +23,7 @@
- extern char *cleanupName2(char *name, int flag);
- #define cleanupName(name) cleanupName2((name), TRUE)
- extern char *expandPath(char *name);
--extern char *strcasestr(char *s1, char *s2);
-+extern char *strcasestr(const char *s1, const char *s2);
- extern int strcasemstr(char *str, char *srch[], char **ret_ptr);
- extern char *remove_space(char *str);
- extern int non_null(char *s);
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index bad757e77da2..a5413d3604a1 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -1,7 +1,11 @@
bin/w3m
+bin/w3mman
libexec/w3m/dirlist.cgi
-%%NO_M17N%%libexec/w3m/inflate
+libexec/w3m/inflate
+libexec/w3m/multipart.cgi
libexec/w3m/w3mbookmark
+libexec/w3m/w3mhelp.cgi
+libexec/w3m/w3mman2html.cgi
libexec/w3m/w3mhelperpanel
%%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgdisplay
%%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgsize
@@ -22,8 +26,6 @@ libexec/w3m/w3mhelperpanel
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/keymap.lynx
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/menu.default
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/menu.submenu
-share/doc/ja/w3m/w3mhelp-lynx_ja.html
-share/doc/ja/w3m/w3mhelp-w3m_ja.html
%%PORTDOCS%%share/doc/w3m/FAQ.html
%%PORTDOCS%%share/doc/w3m/HISTORY
%%PORTDOCS%%share/doc/w3m/MANUAL.html
@@ -37,9 +39,9 @@ share/doc/ja/w3m/w3mhelp-w3m_ja.html
%%PORTDOCS%%share/doc/w3m/keymap.lynx
%%PORTDOCS%%share/doc/w3m/menu.default
%%PORTDOCS%%share/doc/w3m/menu.submenu
-share/doc/w3m/w3mhelp-lynx_en.html
-share/doc/w3m/w3mhelp-w3m_en.html
share/doc/w3m/w3mhelp.html
+share/doc/w3m/w3mhelp-funcdesc.en.pl
+share/doc/w3m/w3mhelp-funcdesc.ja.pl
+share/doc/w3m/w3mhelp-funcname.pl
@dirrm libexec/w3m
-@dirrm share/doc/ja/w3m
@dirrm share/doc/w3m
diff --git a/www/w3m/scripts/pre-configure b/www/w3m/scripts/pre-configure
index 757830b40bd3..314cc830dfdb 100644
--- a/www/w3m/scripts/pre-configure
+++ b/www/w3m/scripts/pre-configure
@@ -1,21 +1,17 @@
#!/bin/sh
echo "# Configuration at ${HOSTNAME}" > ${WRKSRC}/config.param
-echo prefix=${PREFIX} >> ${WRKSRC}/config.param
-echo def_bindir=${PREFIX}/bin >> ${WRKSRC}/config.param
-echo def_libdir=${PREFIX}/libexec/w3m >> ${WRKSRC}/config.param
-echo def_helpdir=${PREFIX}/share/doc/w3m >> ${WRKSRC}/config.param
-echo def_helpdir_ja=${PREFIX}/share/doc/ja/w3m >> ${WRKSRC}/config.param
echo ftppass_hostnamegen=y >> ${WRKSRC}/config.param
-echo show_params=y >> ${WRKSRC}/config.param
echo use_nntp=y >> ${WRKSRC}/config.param
-echo ansi_color=y >> ${WRKSRC}/config.param
+echo use_ansi_color=y >> ${WRKSRC}/config.param
echo dmodel=5 >> ${WRKSRC}/config.param
echo use_ssl_verify=y >> ${WRKSRC}/config.param
echo ded=/usr/bin/vi >> ${WRKSRC}/config.param
echo dmail=/usr/bin/mail >> ${WRKSRC}/config.param
-echo dbrowser=${PREFIX}/bin/netscape >> ${WRKSRC}/config.param
-echo dcc=/usr/bin/cc >> ${WRKSRC}/config.param
+echo dbrowser=${LOCALBASE}/bin/netscape >> ${WRKSRC}/config.param
+echo dcc=${CC} >> ${WRKSRC}/config.param
+echo emacs_like_lineedit=y >> ${WRKSRC}/config.param
+echo use_bundled_gclib=n >> ${WRKSRC}/config.param
if [ "x${USE_OPENSSL}" = "xyes" ] ; then
echo dcflags="\"${SSL_CFLAGS} -I${LOCALBASE}/include\"" >> ${WRKSRC}/config.param
@@ -26,9 +22,9 @@ else
fi
if [ "x${JAPANESE}" = "xYes" ] ; then
- echo pref_lang=1 >> ${WRKSRC}/config.param
+ echo lang=JA >> ${WRKSRC}/config.param
else
- echo pref_lang=2 >> ${WRKSRC}/config.param
+ echo lang=EN >> ${WRKSRC}/config.param
fi
if [ "x${INLINE_IMAGE}" = "xyes" ] ; then
@@ -36,8 +32,7 @@ if [ "x${INLINE_IMAGE}" = "xyes" ] ; then
fi
if [ "x${M17N}" = "xyes" ] ; then
- echo suffix= >> ${WRKSRC}/config.param
echo charset=UTF-8 >> ${WRKSRC}/config.param
else
- echo def_dcode=E >> ${WRKSRC}/config.param
+ echo display_code=E >> ${WRKSRC}/config.param
fi
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:21:28 +0000