diff options
author | uebayasi <uebayasi@pkgsrc.org> | 2004-04-18 12:08:42 +0000 |
---|---|---|
committer | uebayasi <uebayasi@pkgsrc.org> | 2004-04-18 12:08:42 +0000 |
commit | 53b251a2677d2a1cafb13e873a8e8f537075b5f1 (patch) | |
tree | 59d8dd76b43d03b4d908b0f4813fc58242c06adc /www | |
parent | 5ce0ba183f7737316559a85f0dc1742bf8341d1a (diff) | |
download | pkgsrc-53b251a2677d2a1cafb13e873a8e8f537075b5f1.tar.gz |
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 (limited to 'www')
-rw-r--r-- | www/w3m-img/Makefile | 13 | ||||
-rw-r--r-- | www/w3m/Makefile | 5 | ||||
-rw-r--r-- | www/w3m/Makefile.common | 241 | ||||
-rw-r--r-- | www/w3m/PLIST | 39 | ||||
-rw-r--r-- | www/w3m/distinfo | 7 | ||||
-rw-r--r-- | www/w3m/patches/patch-aa | 22 |
6 files changed, 126 insertions, 201 deletions
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile index 00b8aadee1b..abf419ccb35 100644 --- a/www/w3m-img/Makefile +++ b/www/w3m-img/Makefile @@ -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 --git a/www/w3m/Makefile b/www/w3m/Makefile index 2aaaea4434c..f38fa0edfe1 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -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 --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common index 1f486fac93a..5d95555f4a2 100644 --- a/www/w3m/Makefile.common +++ b/www/w3m/Makefile.common @@ -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 -HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/ +HOMEPAGE= http://w3m.sourceforge.net/ -WRKSRC= ${WRKDIR}/w3m-${W3M_VERS} -USE_BUILDLINK2= yes +PKG_INSTALLATION_TYPES= overwrite pkgviews -W3M_VERS= ${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS} -W3M_BASE_VERS= 0.4 -W3M_M17N_VERS= 20030224 +USE_BUILDLINK3= # defined +GNU_CONFIGURE= # defined +USE_GNU_TOOLS+= make # Needed for some combinations of options... -# w3m source with m17n patch applied. -W3M_SRC= ${DISTNAME}${EXTRACT_SUFX} -DISTFILES+= ${W3M_SRC} -EXTRACT_ONLY= ${W3M_SRC} +W3M_VERS= 0.5 -PATCHDIR= ${.CURDIR}/../w3m/patches -DISTINFO_FILE= ${.CURDIR}/../w3m/distinfo +# For manuals. +USE_PERL5= build -# For manuals -USE_PERL5= # defined +DOCDIR= share/doc/w3m -# 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} - -HELPDIR= share/doc/w3m -HELPERDIR= lib/w3m +.include "../../mk/bsd.prefs.mk" -# configure will check IPv6 readiness automatically -BUILD_DEFS+= USE_INET6 +# 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! +# -.include "../../mk/bsd.prefs.mk" +BUILD_DEFS+= W3M_USE_M17N +#BUILD_DEFS+= W3M_USE_UNICODE +BUILD_DEFS+= W3M_USE_LYNX_KEY -# 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 - -CONFIGURE_ENV+= use_m17n=y -.if ${W3M_USE_UNICODE} == YES -CONFIGURE_ENV+= use_unicode=y -.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 -.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 +.if ${W3M_USE_M17N} == YES +CONFIGURE_ARGS+= --enable-m17n .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+= --disable-m17n .endif + +# 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_ENV+= lynx_key=y -HELP_W3M= -lynx +CONFIGURE_ARGS+= --enable-keymap=lynx .else -CONFIGURE_ENV+= lynx_key=n -HELP_W3M= -w3m +CONFIGURE_ARGS+= --enable-keymap=w3m .endif -.if ${W3M_USE_IMAGE} == YES -CONFIGURE_ENV+= use_image=y + +_W3M_USE_IMAGE?= NO +.if ${_W3M_USE_IMAGE} == YES +CONFIGURE_ARGS+= --enable-image=x11 .else -CONFIGURE_ENV+= use_image=n +CONFIGURE_ARGS+= --disable-image .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" +CONFIGURE_ARGS+= --with-termlib=curses .else -CONFIGURE_ENV+= dtermlib="-ltermcap" +CONFIGURE_ARGS+= --with-termlib=termcap .endif -CONFIGURE_ENV+= dmodel=6 -CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" -CONFIGURE_ARGS+= --yes -CONFIGURE_ARGS+= --suffix= -CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --bindir=${PREFIX}/bin -CONFIGURE_ARGS+= --auxbindir=${PREFIX}/${HELPERDIR} -CONFIGURE_ARGS+= --libdir=${PREFIX}/${HELPERDIR} -CONFIGURE_ARGS+= --helpdir=${PREFIX}/${HELPDIR} -CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_PREFIX.boehm-gc}/include -CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_PREFIX.boehm-gc}/lib - -.if ${W3M_USE_IMAGE} == YES -PLIST_SUBST+= USE_IMAGE='' + +# 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='' .else -PLIST_SUBST+= USE_IMAGE='@comment ' +PLIST_SUBST+= USE_IMAGE='@comment ' .endif +SUBST_CLASSES+= man-ja +SUBST_MESSAGE.man-ja= "Fixing the path to Japanese manual pages." +SUBST_STAGE.man-ja= post-patch +SUBST_FILES.man-ja= Makefile.in config.h.dist +SUBST_SED.man-ja= -e 's|/ja/|/ja_JP.eucJP/|g' + post-extract: @cd ${WRKSRC}/doc; ${RM} -fr CVS @cd ${WRKSRC}/doc-jp; ${RM} -fr CVS @cd ${WRKSRC}; ${RM} -fr gc -# @${LN} ${LIBWC_WRKSRC} ${WRKSRC}/libwc post-patch: @${FIND} ${WRKSRC} -type f -name '*.orig' -print | ${XARGS} ${RM} -# do not look at previous configuration -do-configure: - @cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \ - INSTALL="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} - -pre-build: - @cd ${WRKSRC}; \ - ${MAKE} XXMakefile; \ - ${MV} XXMakefile XXMakefile.gen; \ - ${SED} -e '/^GCLIB/s|gc/gc.a|-lgc|' -e '/^GCTARGET/s|gc/gc.a||' \ - XXMakefile.gen > XXMakefile - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/w3m ${LOCALBASE}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${LOCALBASE}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc-jp/w3m.1 ${LOCALBASE}/man/ja_JP.EUC/man1 - ${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPDIR} - ${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_en.html ${LOCALBASE}/${HELPDIR} - ${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_ja.html ${LOCALBASE}/${HELPDIR} - ${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_en.html ${LOCALBASE}/${HELPDIR} - ${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_ja.html ${LOCALBASE}/${HELPDIR} - # Use ${PAX} to discard uid/gid - cd ${WRKSRC}; ${PAX} -w doc doc-jp | \ - (cd ${LOCALBASE}/${HELPDIR}; ${PAX} -r) - ${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPERDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/inflate ${LOCALBASE}/${HELPERDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/w3mbookmark ${LOCALBASE}/${HELPERDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/w3mhelperpanel ${LOCALBASE}/${HELPERDIR} -.if ${W3M_USE_IMAGE} == YES - ${INSTALL_PROGRAM} ${WRKSRC}/w3mimgdisplay ${LOCALBASE}/${HELPERDIR} -.endif - post-install: - @cd ${LOCALBASE}/${HELPDIR}; \ - ${RM} -f w3mhelp.html; \ - ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html - -.if ${W3M_USE_IMAGE} == YES -.include "../../graphics/gdk-pixbuf/buildlink2.mk" + # Install help files. + @cd ${WRKSRC}; ${MAKE_PROGRAM} install-helpfile + # Use ${PAX} to discard uid/gid. Exclude manuals (*.1). + ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR} + @cd ${WRKSRC}; ${PAX} -w -s ',.*\.1$$,,' doc doc-jp | \ + ( cd ${PREFIX}/${DOCDIR}; ${PAX} -r ) + +.include "../../devel/boehm-gc/buildlink3.mk" +.if ${_W3M_USE_IMAGE} == YES +.include "../../graphics/gdk-pixbuf/buildlink3.mk" .endif -.include "../../devel/boehm-gc/buildlink2.mk" +.include "../../security/openssl/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/w3m/PLIST b/www/w3m/PLIST index f6c8f8c1c4e..3d831424045 100644 --- a/www/w3m/PLIST +++ b/www/w3m/PLIST @@ -1,12 +1,9 @@ -@comment $NetBSD: PLIST,v 1.9 2003/03/22 03:25:40 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2004/04/18 12:08:42 uebayasi Exp $ bin/w3m +bin/w3mman man/man1/w3m.1 -man/ja_JP.EUC/man1/w3m.1 -share/doc/w3m/w3mhelp-w3m_en.html -share/doc/w3m/w3mhelp-w3m_ja.html -share/doc/w3m/w3mhelp-lynx_en.html -share/doc/w3m/w3mhelp-lynx_ja.html -share/doc/w3m/w3mhelp.html +man/man1/w3mman.1 +man/ja_JP.eucJP/man1/w3m.1 @comment share/doc/w3m/doc share/doc/w3m/doc/FAQ.html share/doc/w3m/doc/HISTORY @@ -25,7 +22,6 @@ share/doc/w3m/doc/keymap.default share/doc/w3m/doc/keymap.lynx share/doc/w3m/doc/menu.default share/doc/w3m/doc/menu.submenu -share/doc/w3m/doc/w3m.1 @comment share/doc/w3m/doc-jp share/doc/w3m/doc-jp/FAQ.html share/doc/w3m/doc-jp/HISTORY @@ -50,12 +46,27 @@ share/doc/w3m/doc-jp/keymap.default share/doc/w3m/doc-jp/keymap.lynx share/doc/w3m/doc-jp/menu.default share/doc/w3m/doc-jp/menu.submenu -share/doc/w3m/doc-jp/w3m.1 +share/w3m/w3mhelp-funcdesc.en.pl +share/w3m/w3mhelp-funcdesc.ja.pl +share/w3m/w3mhelp-funcname.pl +share/w3m/w3mhelp-lynx_en.html +share/w3m/w3mhelp-lynx_ja.html +share/w3m/w3mhelp-w3m_en.html +share/w3m/w3mhelp-w3m_ja.html +share/w3m/w3mhelp.html +libexec/w3m/inflate +${USE_IMAGE}libexec/w3m/w3mimgdisplay +libexec/w3m/cgi-bin/dirlist.cgi +libexec/w3m/cgi-bin/multipart.cgi +libexec/w3m/cgi-bin/w3mbookmark +libexec/w3m/cgi-bin/w3mhelp.cgi +libexec/w3m/cgi-bin/w3mhelperpanel +libexec/w3m/cgi-bin/w3mmail.cgi +libexec/w3m/cgi-bin/w3mman2html.cgi +libexec/w3m/xface2xpm +@dirrm libexec/w3m/cgi-bin +@dirrm libexec/w3m @dirrm share/doc/w3m/doc-jp @dirrm share/doc/w3m/doc @dirrm share/doc/w3m -lib/w3m/inflate -lib/w3m/w3mbookmark -lib/w3m/w3mhelperpanel -${USE_IMAGE}lib/w3m/w3mimgdisplay -@dirrm lib/w3m +@dirrm share/w3m diff --git a/www/w3m/distinfo b/www/w3m/distinfo index bcb8b32ca63..cbce1d793ee 100644 --- a/www/w3m/distinfo +++ b/www/w3m/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.11 2003/02/27 02:31:27 uebayasi Exp $ +$NetBSD: distinfo,v 1.12 2004/04/18 12:08:42 uebayasi Exp $ -SHA1 (w3m-0.4-m17n-20030224.tar.gz) = 2d01918413f205edb1bb351acc4799792677a9e1 -Size (w3m-0.4-m17n-20030224.tar.gz) = 2433690 bytes -SHA1 (patch-aa) = e40ad9fa0765041b605e86febd71d399b92fc4d1 +SHA1 (w3m-0.5.tar.gz) = d8d5439fe4777eabf3313f76ef5a71e8e8554fd5 +Size (w3m-0.5.tar.gz) = 1889076 bytes SHA1 (patch-ab) = c0c21616d1d3557453648107eca26eaa91af4741 diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa deleted file mode 100644 index ac6544c92c2..00000000000 --- a/www/w3m/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.11 2002/03/04 15:55:34 kei Exp $ - ---- configure.orig Sat Feb 16 00:48:01 2002 -+++ configure Tue Mar 5 00:33:09 2002 -@@ -381,7 +381,7 @@ - - find_ssl() { - sslinclude="" -- for i1 in $ssl_includedir /usr /usr/local $prefix -+ for i1 in $ssl_includedir - do - for i2 in /openssl /ssl / - do -@@ -391,6 +391,8 @@ - sslinclude="-I${dirname}/include" - elif [ -f $dirname/include/openssl/ssl.h ]; then - sslinclude="-I${dirname}/include/openssl -I${dirname}/include" -+ elif [ -f $dirname/ssl.h ]; then -+ sslinclude="-I${dirname}" - fi - for i3 in lib/openssl lib - do |