diff options
author | minoura <minoura> | 2002-10-18 14:50:14 +0000 |
---|---|---|
committer | minoura <minoura> | 2002-10-18 14:50:14 +0000 |
commit | 37952763380bb787f34647b543f6c5ae35ea1d9a (patch) | |
tree | e02d98227bc2f518e3f16a893d11bcf45f9bde53 /www/w3 | |
parent | 0ed6b3707c3d594c7072bca094b2e7b8f6087fcd (diff) | |
download | pkgsrc-37952763380bb787f34647b543f6c5ae35ea1d9a.tar.gz |
Upgraded to 4.0pre.47.
Also quick port to Emacs 21. Pre.47's changes are mostly to support Emacs 21,
but it has at least 2 problems:
- It does not work in a TTY.
- Mule handling is insufficient.
Diffstat (limited to 'www/w3')
-rw-r--r-- | www/w3/Makefile | 14 | ||||
-rw-r--r-- | www/w3/PLIST.emacs | 5 | ||||
-rw-r--r-- | www/w3/PLIST.xemacs | 5 | ||||
-rw-r--r-- | www/w3/distinfo | 8 | ||||
-rw-r--r-- | www/w3/patches/patch-ab | 24 | ||||
-rw-r--r-- | www/w3/patches/patch-ac | 14 |
6 files changed, 55 insertions, 15 deletions
diff --git a/www/w3/Makefile b/www/w3/Makefile index 3be8ea0f9a7..64cc74f7433 100644 --- a/www/w3/Makefile +++ b/www/w3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2002/03/14 17:04:38 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2002/10/18 14:50:14 minoura Exp $ -DISTNAME= w3-4.0pre.46 -PKGNAME= w3-4.0b46 +DISTNAME= w3-4.0pre.47 +PKGNAME= w3-4.0b47 CATEGORIES= www MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/emacs-w3/ \ ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/emacs-w3/ \ @@ -15,19 +15,17 @@ COMMENT= World Wide Web browser for Emacs CONFIGURE_ARGS+=--enable-site-install -.include "../../mk/bsd.prefs.mk" +.include "../../mk/emacs.mk" -.if defined(USE_XEMACS) +.if ${EMACS_FLAVOR} == "xemacs" HAS_CONFIGURE= yes -DEPENDS+= xemacs-[0-9]*:../../editors/xemacs CONFIGURE_ARGS+=--with-xemacs CONFIGURE_ARGS+=--with-package-dir=${PREFIX}/lib/xemacs/xemacs-packages PLIST_SRC= ${PKGDIR}/PLIST.xemacs .else GNU_CONFIGURE= yes -DEPENDS+= emacs-[0-9]*:../../editors/emacs CONFIGURE_ARGS+=--with-emacs -CONFIGURE_ARGS+=--with-lispdir=${PREFIX}/share/emacs/site-lisp/w3 +CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/w3 INFO_FILES= w3.info w3-faq.info PLIST_SRC= ${PKGDIR}/PLIST.emacs .endif diff --git a/www/w3/PLIST.emacs b/www/w3/PLIST.emacs index 406e13afe5d..28e0578f527 100644 --- a/www/w3/PLIST.emacs +++ b/www/w3/PLIST.emacs @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.emacs,v 1.2 2002/02/18 15:14:45 seb Exp $ +@comment $NetBSD: PLIST.emacs,v 1.3 2002/10/18 14:50:14 minoura Exp $ @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/w3-faq.info @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/w3.info info/w3-faq.info @@ -7,7 +7,6 @@ info/w3.info-1 info/w3.info-2 info/w3.info-3 info/w3.info-4 -info/w3.info-5 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/w3-faq.info @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/w3.info share/default.css @@ -89,6 +88,8 @@ share/emacs/site-lisp/w3/w3-e19.el share/emacs/site-lisp/w3/w3-e19.elc share/emacs/site-lisp/w3/w3-e20.el share/emacs/site-lisp/w3/w3-e20.elc +share/emacs/site-lisp/w3/w3-e21.el +share/emacs/site-lisp/w3/w3-e21.elc share/emacs/site-lisp/w3/w3-elisp.el share/emacs/site-lisp/w3/w3-elisp.elc share/emacs/site-lisp/w3/w3-emulate.el diff --git a/www/w3/PLIST.xemacs b/www/w3/PLIST.xemacs index 17bc3080277..e2557fb6113 100644 --- a/www/w3/PLIST.xemacs +++ b/www/w3/PLIST.xemacs @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.xemacs,v 1.1 2001/11/01 02:27:01 zuntum Exp $ +@comment $NetBSD: PLIST.xemacs,v 1.2 2002/10/18 14:50:14 minoura Exp $ lib/xemacs/xemacs-packages/etc/w3/default.css lib/xemacs/xemacs-packages/info/w3-faq.info lib/xemacs/xemacs-packages/info/w3.info @@ -6,7 +6,6 @@ lib/xemacs/xemacs-packages/info/w3.info-1 lib/xemacs/xemacs-packages/info/w3.info-2 lib/xemacs/xemacs-packages/info/w3.info-3 lib/xemacs/xemacs-packages/info/w3.info-4 -lib/xemacs/xemacs-packages/info/w3.info-5 lib/xemacs/xemacs-packages/lisp/w3/auto-autoloads.el lib/xemacs/xemacs-packages/lisp/w3/auto-autoloads.elc lib/xemacs/xemacs-packages/lisp/w3/base64.el @@ -85,6 +84,8 @@ lib/xemacs/xemacs-packages/lisp/w3/w3-e19.el lib/xemacs/xemacs-packages/lisp/w3/w3-e19.elc lib/xemacs/xemacs-packages/lisp/w3/w3-e20.el lib/xemacs/xemacs-packages/lisp/w3/w3-e20.elc +lib/xemacs/xemacs-packages/lisp/w3/w3-e21.el +lib/xemacs/xemacs-packages/lisp/w3/w3-e21.elc lib/xemacs/xemacs-packages/lisp/w3/w3-elisp.el lib/xemacs/xemacs-packages/lisp/w3/w3-elisp.elc lib/xemacs/xemacs-packages/lisp/w3/w3-emulate.el diff --git a/www/w3/distinfo b/www/w3/distinfo index 4f18463e5d8..32ed044f077 100644 --- a/www/w3/distinfo +++ b/www/w3/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:02:46 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/10/18 14:50:14 minoura Exp $ -SHA1 (w3-4.0pre.46.tar.gz) = 5cbf48993a7e74d5c9fea73def5a22b72668168d -Size (w3-4.0pre.46.tar.gz) = 504010 bytes +SHA1 (w3-4.0pre.47.tar.gz) = 51cce63a0507fc5dd3486674c678f24067d6611d +Size (w3-4.0pre.47.tar.gz) = 503062 bytes SHA1 (patch-aa) = 3b02015ed680630dbceb0e20e2f24850893beabd +SHA1 (patch-ab) = 1a805be496d385152388ae9b00ad2ffa9f8fdb53 +SHA1 (patch-ac) = 7edc0023e3ad88a126a6ea39955e246da6101f76 diff --git a/www/w3/patches/patch-ab b/www/w3/patches/patch-ab new file mode 100644 index 00000000000..52129206549 --- /dev/null +++ b/www/w3/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.1 2002/10/18 14:50:15 minoura Exp $ + +--- lisp/mule-sysdp.el.orig Sun Nov 14 22:00:12 1999 ++++ lisp/mule-sysdp.el Thu Oct 17 04:05:16 2002 +@@ -23,10 +23,15 @@ + mule-version)) + (if (or (fboundp 'kinsoku) + (boundp 'kinsoku-ascii)) +- (string-to-number (substring +- mule-version +- (match-beginning 0) +- (match-end 0))) ++ (let (vers) ++ (setq vers ++ (string-to-number ++ (substring mule-version ++ (match-beginning 0) ++ (match-end 0)))) ++ (if (> vers 4.0) ++ 4.0 ++ vers)) + 0)) + (t 2.3)) + 0) diff --git a/www/w3/patches/patch-ac b/www/w3/patches/patch-ac new file mode 100644 index 00000000000..e86aa65dddd --- /dev/null +++ b/www/w3/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1 2002/10/18 14:50:15 minoura Exp $ + +--- lisp/font.el.orig Wed Nov 28 20:04:21 2001 ++++ lisp/font.el Thu Oct 17 06:26:04 2002 +@@ -996,7 +996,8 @@ + (set-face-property face 'font-specification nil) + (apply 'set-face-font face font args)))) + +-(if font-running-emacs-new-redisplay ++(if (and font-running-emacs-new-redisplay ++ window-system) + (fset 'font-set-face-font 'font-set-face-font-new-redisplay)) + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |