pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update W3m from 0.4.0 to 0.5.
details: https://anonhg.NetBSD.org/pkgsrc/rev/1e50b4cc14a7
branches: trunk
changeset: 473280:1e50b4cc14a7
user: uebayasi <uebayasi%pkgsrc.org@localhost>
date: Sun Apr 18 12:08:42 2004 +0000
description:
Update W3m from 0.4.0 to 0.5.
Now M17N patch is merged into the main development now.
Pkgsrc changes:
* Simplify options.
* XXX "M17N without Unicode" is broken now. This should be fixed.
Other changes in W3m:
w3m 0.5 - 2004-03-22
* gettextize
* m17n patch merged
w3m 0.4.2 - 2003-09-23
* options: -4, -6
* configuration file in $(sysconfdir)/$(package)/
* func: NEXT_VISITED, PREV_VISITED
* autoconfiscate (partially)
* rc: use_history
w3m 0.4.1 - 2003-03-07
* fix bugs
- completion segfault in lineinput
- incremental search
- URL pattern fix
- UFhalfclose bug
- allow pipe in shell command
- enhance ftp directory support
- linenumber in edit
- fix Bug#181897
- W3M_TTY problem fixed
diffstat:
mk/bsd.pkg.defaults.mk | 44 +-------
www/w3m-img/Makefile | 13 +-
www/w3m/Makefile | 5 +-
www/w3m/Makefile.common | 241 +++++++++++++++++-----------------------------
www/w3m/PLIST | 39 ++++--
www/w3m/distinfo | 7 +-
www/w3m/patches/patch-aa | 22 ----
7 files changed, 133 insertions(+), 238 deletions(-)
diffs (truncated from 492 to 300 lines):
diff -r e85f97146ca9 -r 1e50b4cc14a7 mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk Sun Apr 18 09:21:55 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk Sun Apr 18 12:08:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.228 2004/04/10 12:26:23 salo Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.229 2004/04/18 12:08:42 uebayasi Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -2058,51 +2058,21 @@
# Possible: not defined, see "configure --help"
# Default: not defined
-W3M_USE_COLOR?= YES
-# Used in w3m to use colors.
-# Possible: YES, NO
-# Default: YES
-
-W3M_USE_COOKIE?= YES
-# Enable cookie support in w3m.
-# Possible: YES, NO
-# Default: YES
-
-W3M_USE_IMAGE?= NO
-# Enable inline image display support in w3m. (Useful, but still a bit
-# buggy yet?)
-# Possible: YES, NO
-# Default: NO
-
-W3M_USE_JAPANESE_MESSAGES?= NO
-# Let w3m to use Japanese messages. (Japanese localization.)
-# Possible: YES, NO
-# Default: NO
-
W3M_USE_LYNX_KEY?= NO
# Enable lynx like keybinding for w3m.
# Possible: YES, NO
# Default: NO
-W3M_USE_M17N= YES
+W3M_USE_M17N?= YES
# For multilingual support for w3m.
# Possible: YES, NO
# Default: YES
-W3M_USE_MOUSE?= YES
-# Enable mouse support in w3m.
-# Possible: YES, NO
-# Default: YES
-
-W3M_USE_SSL?= YES
-# Enable HTTPS support in w3m.
-# Possible: YES, NO
-# Default: YES
-
-W3M_USE_UNICODE?= YES
-# Used in w3m to use Unicode characters.
-# Possible: YES, NO
-# Default: YES
+# XXX Currently broken; should be fixed later.
+#W3M_USE_UNICODE?= YES
+## Used in w3m to use Unicode characters.
+## Possible: YES, NO
+## Default: YES
WGET_USE_SSL?= YES
# Enable SSL in wget (for https connections)
diff -r e85f97146ca9 -r 1e50b4cc14a7 www/w3m-img/Makefile
--- a/www/w3m-img/Makefile Sun Apr 18 09:21:55 2004 +0000
+++ b/www/w3m-img/Makefile Sun Apr 18 12:08:42 2004 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:58 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/18 12:08:43 uebayasi Exp $
#
-PKGNAME= w3m-img-${W3M_BASE_VERS}
-PKGREVISION= 3
+PKGNAME= w3m-img-${W3M_VERS}
COMMENT= Multilingualized version of a pager/text-based browser w3m with inline image support
CONFLICTS+= w3m-[0-9]*
-# enable image support
-W3M_USE_IMAGE= YES
-
+DISTINFO_FILE= ${.CURDIR}/../../www/w3m/distinfo
+PATCHDIR= ${.CURDIR}/../../www/w3m/patches
PLIST_SRC= ${.CURDIR}/../../www/w3m/PLIST
+# Enable image support.
+_W3M_USE_IMAGE= YES
+
.include "../../www/w3m/Makefile.common"
diff -r e85f97146ca9 -r 1e50b4cc14a7 www/w3m/Makefile
--- a/www/w3m/Makefile Sun Apr 18 09:21:55 2004 +0000
+++ b/www/w3m/Makefile Sun Apr 18 12:08:42 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2004/03/26 02:27:58 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2004/04/18 12:08:42 uebayasi Exp $
#
-PKGNAME= w3m-${W3M_BASE_VERS}
-PKGREVISION= 3
+PKGNAME= w3m-${W3M_VERS}
COMMENT= Multilingualized version of a pager/text-based browser w3m
CONFLICTS+= w3m-img-[0-9]*
diff -r e85f97146ca9 -r 1e50b4cc14a7 www/w3m/Makefile.common
--- a/www/w3m/Makefile.common Sun Apr 18 09:21:55 2004 +0000
+++ b/www/w3m/Makefile.common Sun Apr 18 12:08:42 2004 +0000
@@ -1,191 +1,128 @@
-# $NetBSD: Makefile.common,v 1.23 2004/01/27 00:53:10 heinz Exp $
+# $NetBSD: Makefile.common,v 1.24 2004/04/18 12:08:42 uebayasi Exp $
#
DISTNAME= w3m-${W3M_VERS}
CATEGORIES= www
-MASTER_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=w3m/}
MAINTAINER= kei%NetBSD.org@localhost
-HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/
-
-WRKSRC= ${WRKDIR}/w3m-${W3M_VERS}
-USE_BUILDLINK2= yes
+HOMEPAGE= http://w3m.sourceforge.net/
-W3M_VERS= ${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS}
-W3M_BASE_VERS= 0.4
-W3M_M17N_VERS= 20030224
-
-# w3m source with m17n patch applied.
-W3M_SRC= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+= ${W3M_SRC}
-EXTRACT_ONLY= ${W3M_SRC}
+PKG_INSTALLATION_TYPES= overwrite pkgviews
-PATCHDIR= ${.CURDIR}/../w3m/patches
-DISTINFO_FILE= ${.CURDIR}/../w3m/distinfo
-
-# For manuals
-USE_PERL5= # defined
+USE_BUILDLINK3= # defined
+GNU_CONFIGURE= # defined
+USE_GNU_TOOLS+= make # Needed for some combinations of options...
-# multibyte/wide character support was split into libwc in latest version of
-# w3m-m17n.
-#LIBWC_SRC= libwc-latest.tar.gz
-#LIBWC_WRKSRC= ${WRKDIR}/w3m-${W3M_VERS}
-#DISTFILES+= ${LIBWC_SRC}
-#EXTRACT_ONLY+= ${LIBWC_SRC}
+W3M_VERS= 0.5
-HELPDIR= share/doc/w3m
-HELPERDIR= lib/w3m
+# For manuals.
+USE_PERL5= build
-# configure will check IPv6 readiness automatically
-BUILD_DEFS+= USE_INET6
+DOCDIR= share/doc/w3m
.include "../../mk/bsd.prefs.mk"
-# Always enable multiligualization.
-W3M_USE_M17N= YES
-# Set this to YES if you want unicode support.
-W3M_USE_UNICODE?= YES
-# set this to YES to use Japanese messages.
-W3M_USE_JAPANESE_MESSAGES?= NO
-# Set this to YES to use lynx like key binding.
-W3M_USE_LYNX_KEY?= NO
-# set this to YES if you want HTTPS support.
-W3M_USE_SSL?= YES
-# set this to YES if you want HTTP cookie support.
-W3M_USE_COOKIE?= YES
-# set this to YES if you want mouse support.
-W3M_USE_MOUSE?= YES
-# set this to YES if you want color support.
-W3M_USE_COLOR?= YES
-# set this to YES if you want image support.
-W3M_USE_IMAGE?= NO
+# Memo about W3m configuration:
+#
+# * pkgsrc should export only user configurable build options that can't
+# be configured at run-time.
+#
+# * As of 0.5, W3m is moving from English/Japanese (localized model) to
+# internationalized model. The set of its options are not well refined
+# nor tested yet. These configuration should be revisited later.
+#
+# * --enable-m17n enables multibyte encoding support, and
+# --enable-unicode adds UTF-7/UTF-8 support. W3m has a home-grown M17N
+# library (libwc) instead of using libc's I18N functions, that means
+# enabling M17N much increases the size of W3m binary. Additionary W3m
+# has a home-grown Unicode mapping table, which is huge too!
+#
-CONFIGURE_ENV+= use_m17n=y
-.if ${W3M_USE_UNICODE} == YES
-CONFIGURE_ENV+= use_unicode=y
+BUILD_DEFS+= W3M_USE_M17N
+#BUILD_DEFS+= W3M_USE_UNICODE
+BUILD_DEFS+= W3M_USE_LYNX_KEY
+
+.if ${W3M_USE_M17N} == YES
+CONFIGURE_ARGS+= --enable-m17n
.else
-CONFIGURE_ENV+= use_unicode=n
-.endif
-CONFIGURE_ENV+= charset=ISO-2022-JP-2
-.if ${W3M_USE_JAPANESE_MESSAGES} == YES
-CONFIGURE_ARGS+= --lang=ja
-HELP_LANG= _ja
-.else
-CONFIGURE_ARGS+= --lang=en
-HELP_LANG= _en
+CONFIGURE_ARGS+= --disable-m17n
.endif
-.if ${W3M_USE_COLOR} == YES
-CONFIGURE_ENV+= use_color=y
-.else
-CONFIGURE_ENV+= use_color=n
-.endif
-.if ${W3M_USE_MOUSE} == YES
-CONFIGURE_ENV+= use_mouse=y
-.else
-CONFIGURE_ENV+= use_mouse=n
-.endif
-.if ${W3M_USE_COOKIE} == YES
-CONFIGURE_ENV+= use_cookie=y
+
+# XXX "M17N without Unicode" is broken now. Need to be fixed.
+#.if ${W3M_USE_UNICODE} == YES
+#CONFIGURE_ARGS+= --enable-unicode
+#.else
+#CONFIGURE_ARGS+= --disable-unicode
+#.endif
+
+.if ${W3M_USE_LYNX_KEY} == YES
+CONFIGURE_ARGS+= --enable-keymap=lynx
.else
-CONFIGURE_ENV+= use_cookie=n
-.endif
-.if ${W3M_USE_SSL} == YES
-CONFIGURE_ENV+= use_ssl=y use_ssl_verify=y
-CONFIGURE_ARGS+= --ssl-includedir=${SSLBASE}/include/openssl
-CONFIGURE_ARGS+= --ssl-libdir=${SSLBASE}/lib
-.include "../../security/openssl/buildlink2.mk"
-.else
-CONFIGURE_ENV+= use_ssl=n use_ssl_verify=n
+CONFIGURE_ARGS+= --enable-keymap=w3m
.endif
-.if ${W3M_USE_LYNX_KEY} == YES
-CONFIGURE_ENV+= lynx_key=y
-HELP_W3M= -lynx
+
+_W3M_USE_IMAGE?= NO
+.if ${_W3M_USE_IMAGE} == YES
+CONFIGURE_ARGS+= --enable-image=x11
.else
-CONFIGURE_ENV+= lynx_key=n
-HELP_W3M= -w3m
+CONFIGURE_ARGS+= --disable-image
.endif
-.if ${W3M_USE_IMAGE} == YES
-CONFIGURE_ENV+= use_image=y
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+= --with-termlib=curses
.else
-CONFIGURE_ENV+= use_image=n
+CONFIGURE_ARGS+= --with-termlib=termcap
.endif
-CONFIGURE_ENV+= use_menu=y use_matrix=n use_ansi_color=y
-CONFIGURE_ENV+= use_help_cgi=n use_migemo=n
-CONFIGURE_ENV+= ded=vi dmail=Mail dbrowser=
-CONFIGURE_ENV+= dcc="${CC}"
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ENV+= dtermlib="-lcurses"
+
+# Configurable by environment variables at run-time.
+CONFIGURE_ARGS+= --with-charset=US-ASCII
+
+# This *should* be set at run-time.
+CONFIGURE_ARGS+= --disable-messagel10n
+
+CONFIGURE_ARGS+= --disable-help_cgi
+CONFIGURE_ARGS+= --enable-color
+CONFIGURE_ARGS+= --enable-cookie
+CONFIGURE_ARGS+= --enable-mouse
+CONFIGURE_ARGS+= --with-browser=
+CONFIGURE_ARGS+= --with-editor=vi
+CONFIGURE_ARGS+= --with-gc=${BUILDLINK_PREFIX.boehm-gc}
+CONFIGURE_ARGS+= --with-mailer=Mail
+CONFIGURE_ARGS+= --with-ssl=${SSLBASE}
+
+.if ${_W3M_USE_IMAGE} == YES
+PLIST_SUBST+= USE_IMAGE=''
Home |
Main Index |
Thread Index |
Old Index