diff --git a/www/emacs-w3m-xemacs21-mule/Makefile b/www/emacs-w3m-xemacs21-mule/Makefile index 222b6d6a2238..2986f34824f7 100644 --- a/www/emacs-w3m-xemacs21-mule/Makefile +++ b/www/emacs-w3m-xemacs21-mule/Makefile @@ -11,6 +11,7 @@ USE_EMACS= yes EMACS_PORT_NAME= xemacs21-mule COMMENT= Simple front-end to w3m for xemacs21-mule +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-aclocal.m4 CONFIGURE_ARGS= --with-xemacs=${EMACS_CMD} \ --with-packagedir=${PREFIX}/${EMACS_PACKAGESDIR} EMACS_PACKAGESDIR= lib/xemacs/site-packages diff --git a/www/emacs-w3m-xemacs21-mule/pkg-plist b/www/emacs-w3m-xemacs21-mule/pkg-plist index 701e6ff393f7..0e768546d3bf 100644 --- a/www/emacs-w3m-xemacs21-mule/pkg-plist +++ b/www/emacs-w3m-xemacs21-mule/pkg-plist @@ -1,24 +1,44 @@ %%PKGINFODIR%%/MANIFEST.w3m +%%ICONDIR%%/antenna-up.png %%ICONDIR%%/antenna-up.xpm +%%ICONDIR%%/back-disabled.png %%ICONDIR%%/back-disabled.xpm +%%ICONDIR%%/back-up.png %%ICONDIR%%/back-up.xpm +%%ICONDIR%%/copy-up.png %%ICONDIR%%/copy-up.xpm +%%ICONDIR%%/db-history-up.png %%ICONDIR%%/db-history-up.xpm +%%ICONDIR%%/forward-disabled.png %%ICONDIR%%/forward-disabled.xpm +%%ICONDIR%%/forward-up.png %%ICONDIR%%/forward-up.xpm +%%ICONDIR%%/history-up.png %%ICONDIR%%/history-up.xpm +%%ICONDIR%%/home-up.png %%ICONDIR%%/home-up.xpm +%%ICONDIR%%/image-up.png %%ICONDIR%%/image-up.xpm +%%ICONDIR%%/open-up.png %%ICONDIR%%/open-up.xpm +%%ICONDIR%%/parent-disabled.png %%ICONDIR%%/parent-disabled.xpm +%%ICONDIR%%/parent-up.png %%ICONDIR%%/parent-up.xpm +%%ICONDIR%%/reload-up.png %%ICONDIR%%/reload-up.xpm +%%ICONDIR%%/search-up.png %%ICONDIR%%/search-up.xpm %%ICONDIR%%/spinner.gif +%%ICONDIR%%/state-00.png %%ICONDIR%%/state-00.xpm +%%ICONDIR%%/state-01.png %%ICONDIR%%/state-01.xpm +%%ICONDIR%%/state-10.png %%ICONDIR%%/state-10.xpm +%%ICONDIR%%/state-11.png %%ICONDIR%%/state-11.xpm +%%ICONDIR%%/weather-up.png %%ICONDIR%%/weather-up.xpm %%LISPDIR%%/_pkg.el %%LISPDIR%%/_pkg.elc @@ -41,6 +61,10 @@ %%SHIMBUN%%%%LISPDIR%%/sb-2ch.elc %%SHIMBUN%%%%LISPDIR%%/sb-airs.el %%SHIMBUN%%%%LISPDIR%%/sb-airs.elc +%%SHIMBUN%%%%LISPDIR%%/sb-aljazeera.el +%%SHIMBUN%%%%LISPDIR%%/sb-aljazeera.elc +%%SHIMBUN%%%%LISPDIR%%/sb-arch-bluegate.el +%%SHIMBUN%%%%LISPDIR%%/sb-arch-bluegate.elc %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc %%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.el @@ -49,14 +73,16 @@ %%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc %%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.el %%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.elc +%%SHIMBUN%%%%LISPDIR%%/sb-atom-hash.el +%%SHIMBUN%%%%LISPDIR%%/sb-atom-hash.elc +%%SHIMBUN%%%%LISPDIR%%/sb-atom.el +%%SHIMBUN%%%%LISPDIR%%/sb-atom.elc %%SHIMBUN%%%%LISPDIR%%/sb-bbc.el %%SHIMBUN%%%%LISPDIR%%/sb-bbc.elc %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc %%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.el %%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.elc -%%SHIMBUN%%%%LISPDIR%%/sb-chalow.el -%%SHIMBUN%%%%LISPDIR%%/sb-chalow.elc %%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.el %%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-cnet.el @@ -69,6 +95,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-debian.el %%SHIMBUN%%%%LISPDIR%%/sb-debian.elc +%%SHIMBUN%%%%LISPDIR%%/sb-debugmagazin-de.el +%%SHIMBUN%%%%LISPDIR%%/sb-debugmagazin-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-dennou.el %%SHIMBUN%%%%LISPDIR%%/sb-dennou.elc %%SHIMBUN%%%%LISPDIR%%/sb-digiko.el @@ -79,6 +107,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-emacs-w3m.elc %%SHIMBUN%%%%LISPDIR%%/sb-emacswiki.el %%SHIMBUN%%%%LISPDIR%%/sb-emacswiki.elc +%%SHIMBUN%%%%LISPDIR%%/sb-engadget-ja.el +%%SHIMBUN%%%%LISPDIR%%/sb-engadget-ja.elc %%SHIMBUN%%%%LISPDIR%%/sb-excite.el %%SHIMBUN%%%%LISPDIR%%/sb-excite.elc %%SHIMBUN%%%%LISPDIR%%/sb-exconn.el @@ -91,6 +121,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-ffii.elc %%SHIMBUN%%%%LISPDIR%%/sb-fml.el %%SHIMBUN%%%%LISPDIR%%/sb-fml.elc +%%SHIMBUN%%%%LISPDIR%%/sb-gendai-net.el +%%SHIMBUN%%%%LISPDIR%%/sb-gendai-net.elc %%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.el %%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.elc %%SHIMBUN%%%%LISPDIR%%/sb-glimpse.el @@ -99,6 +131,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc %%SHIMBUN%%%%LISPDIR%%/sb-haiku-os.el %%SHIMBUN%%%%LISPDIR%%/sb-haiku-os.elc +%%SHIMBUN%%%%LISPDIR%%/sb-hash.el +%%SHIMBUN%%%%LISPDIR%%/sb-hash.elc %%SHIMBUN%%%%LISPDIR%%/sb-heise.el %%SHIMBUN%%%%LISPDIR%%/sb-heise.elc %%SHIMBUN%%%%LISPDIR%%/sb-hns.el @@ -107,6 +141,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.elc %%SHIMBUN%%%%LISPDIR%%/sb-impress.el %%SHIMBUN%%%%LISPDIR%%/sb-impress.elc +%%SHIMBUN%%%%LISPDIR%%/sb-infoshop.el +%%SHIMBUN%%%%LISPDIR%%/sb-infoshop.elc %%SHIMBUN%%%%LISPDIR%%/sb-itmedia.el %%SHIMBUN%%%%LISPDIR%%/sb-itmedia.elc %%SHIMBUN%%%%LISPDIR%%/sb-japantimes.el @@ -123,8 +159,6 @@ %%SHIMBUN%%%%LISPDIR%%/sb-kde.elc %%SHIMBUN%%%%LISPDIR%%/sb-laut-de.el %%SHIMBUN%%%%LISPDIR%%/sb-laut-de.elc -%%SHIMBUN%%%%LISPDIR%%/sb-linux-ja.el -%%SHIMBUN%%%%LISPDIR%%/sb-linux-ja.elc %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-lotusex.el @@ -157,8 +191,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-msdn.elc %%SHIMBUN%%%%LISPDIR%%/sb-msports-nifty.el %%SHIMBUN%%%%LISPDIR%%/sb-msports-nifty.elc -%%SHIMBUN%%%%LISPDIR%%/sb-muchy.el -%%SHIMBUN%%%%LISPDIR%%/sb-muchy.elc +%%SHIMBUN%%%%LISPDIR%%/sb-multi.el +%%SHIMBUN%%%%LISPDIR%%/sb-multi.elc %%SHIMBUN%%%%LISPDIR%%/sb-n24-de.el %%SHIMBUN%%%%LISPDIR%%/sb-n24-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-namazu.el @@ -169,12 +203,18 @@ %%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.elc %%SHIMBUN%%%%LISPDIR%%/sb-nikkei.el %%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc +%%SHIMBUN%%%%LISPDIR%%/sb-nytimes.el +%%SHIMBUN%%%%LISPDIR%%/sb-nytimes.elc +%%SHIMBUN%%%%LISPDIR%%/sb-opentechpress-jp.el +%%SHIMBUN%%%%LISPDIR%%/sb-opentechpress-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-orca.el %%SHIMBUN%%%%LISPDIR%%/sb-orca.elc %%SHIMBUN%%%%LISPDIR%%/sb-palmfan.el %%SHIMBUN%%%%LISPDIR%%/sb-palmfan.elc %%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.el %%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.elc +%%SHIMBUN%%%%LISPDIR%%/sb-perlentaucher-de.el +%%SHIMBUN%%%%LISPDIR%%/sb-perlentaucher-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.el %%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.elc %%SHIMBUN%%%%LISPDIR%%/sb-pilot-mailsync.el @@ -189,6 +229,10 @@ %%SHIMBUN%%%%LISPDIR%%/sb-redhat.elc %%SHIMBUN%%%%LISPDIR%%/sb-rediff.el %%SHIMBUN%%%%LISPDIR%%/sb-rediff.elc +%%SHIMBUN%%%%LISPDIR%%/sb-rss-blogs.el +%%SHIMBUN%%%%LISPDIR%%/sb-rss-blogs.elc +%%SHIMBUN%%%%LISPDIR%%/sb-rss-hash.el +%%SHIMBUN%%%%LISPDIR%%/sb-rss-hash.elc %%SHIMBUN%%%%LISPDIR%%/sb-rss.el %%SHIMBUN%%%%LISPDIR%%/sb-rss.elc %%SHIMBUN%%%%LISPDIR%%/sb-ruby.el @@ -197,10 +241,14 @@ %%SHIMBUN%%%%LISPDIR%%/sb-sankei.elc %%SHIMBUN%%%%LISPDIR%%/sb-savannah.el %%SHIMBUN%%%%LISPDIR%%/sb-savannah.elc +%%SHIMBUN%%%%LISPDIR%%/sb-scipy.el +%%SHIMBUN%%%%LISPDIR%%/sb-scipy.elc %%SHIMBUN%%%%LISPDIR%%/sb-security-memo.el %%SHIMBUN%%%%LISPDIR%%/sb-security-memo.elc %%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.el %%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.elc +%%SHIMBUN%%%%LISPDIR%%/sb-slashdot.el +%%SHIMBUN%%%%LISPDIR%%/sb-slashdot.elc %%SHIMBUN%%%%LISPDIR%%/sb-sml.el %%SHIMBUN%%%%LISPDIR%%/sb-sml.elc %%SHIMBUN%%%%LISPDIR%%/sb-sourceforge-jp.el @@ -213,16 +261,22 @@ %%SHIMBUN%%%%LISPDIR%%/sb-squeak-dev.elc %%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.el %%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.elc +%%SHIMBUN%%%%LISPDIR%%/sb-sueddeutsche-de.el +%%SHIMBUN%%%%LISPDIR%%/sb-sueddeutsche-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-tcup.el %%SHIMBUN%%%%LISPDIR%%/sb-tcup.elc %%SHIMBUN%%%%LISPDIR%%/sb-tdiary-ml.el %%SHIMBUN%%%%LISPDIR%%/sb-tdiary-ml.elc %%SHIMBUN%%%%LISPDIR%%/sb-tdiary.el %%SHIMBUN%%%%LISPDIR%%/sb-tdiary.elc +%%SHIMBUN%%%%LISPDIR%%/sb-tech-on.el +%%SHIMBUN%%%%LISPDIR%%/sb-tech-on.elc %%SHIMBUN%%%%LISPDIR%%/sb-texfaq.el %%SHIMBUN%%%%LISPDIR%%/sb-texfaq.elc %%SHIMBUN%%%%LISPDIR%%/sb-text.el %%SHIMBUN%%%%LISPDIR%%/sb-text.elc +%%SHIMBUN%%%%LISPDIR%%/sb-the-onion.el +%%SHIMBUN%%%%LISPDIR%%/sb-the-onion.elc %%SHIMBUN%%%%LISPDIR%%/sb-the-register.el %%SHIMBUN%%%%LISPDIR%%/sb-the-register.elc %%SHIMBUN%%%%LISPDIR%%/sb-tigris.el @@ -233,8 +287,6 @@ %%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc -%%SHIMBUN%%%%LISPDIR%%/sb-weeklyworldnews.el -%%SHIMBUN%%%%LISPDIR%%/sb-weeklyworldnews.elc %%SHIMBUN%%%%LISPDIR%%/sb-welt-de.el %%SHIMBUN%%%%LISPDIR%%/sb-welt-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-wiki.el @@ -245,8 +297,6 @@ %%SHIMBUN%%%%LISPDIR%%/sb-wincefan.elc %%SHIMBUN%%%%LISPDIR%%/sb-wired-jp.el %%SHIMBUN%%%%LISPDIR%%/sb-wired-jp.elc -%%SHIMBUN%%%%LISPDIR%%/sb-wired.el -%%SHIMBUN%%%%LISPDIR%%/sb-wired.elc %%SHIMBUN%%%%LISPDIR%%/sb-x51.el %%SHIMBUN%%%%LISPDIR%%/sb-x51.elc %%SHIMBUN%%%%LISPDIR%%/sb-xemacs.el @@ -261,13 +311,14 @@ %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.elc %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc +%%SHIMBUN%%%%LISPDIR%%/sb-zdnet-jp.el +%%SHIMBUN%%%%LISPDIR%%/sb-zdnet-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-zeit-de.el %%SHIMBUN%%%%LISPDIR%%/sb-zeit-de.elc %%SHIMBUN%%%%LISPDIR%%/shimbun.el %%SHIMBUN%%%%LISPDIR%%/shimbun.elc %%LISPDIR%%/w3m-antenna.el %%LISPDIR%%/w3m-antenna.elc -%%LISPDIR%%/w3m-bitmap.el %%LISPDIR%%/w3m-bookmark.el %%LISPDIR%%/w3m-bookmark.elc %%LISPDIR%%/w3m-bug.el @@ -278,16 +329,15 @@ %%LISPDIR%%/w3m-cookie.elc %%LISPDIR%%/w3m-dtree.el %%LISPDIR%%/w3m-dtree.elc -%%LISPDIR%%/w3m-e19.el -%%LISPDIR%%/w3m-e20.el -%%LISPDIR%%/w3m-e21.el +%%LISPDIR%%/w3m-ems.el %%LISPDIR%%/w3m-favicon.el %%LISPDIR%%/w3m-favicon.elc +%%LISPDIR%%/w3m-fb.el +%%LISPDIR%%/w3m-fb.elc %%LISPDIR%%/w3m-filter.el %%LISPDIR%%/w3m-filter.elc %%LISPDIR%%/w3m-form.el %%LISPDIR%%/w3m-form.elc -%%LISPDIR%%/w3m-fsf.el %%LISPDIR%%/w3m-hist.el %%LISPDIR%%/w3m-hist.elc %%LISPDIR%%/w3m-image.el @@ -295,9 +345,10 @@ %%LISPDIR%%/w3m-lnum.el %%LISPDIR%%/w3m-lnum.elc %%LISPDIR%%/w3m-load.el +%%LISPDIR%%/w3m-mail.el +%%LISPDIR%%/w3m-mail.elc %%LISPDIR%%/w3m-namazu.el %%LISPDIR%%/w3m-namazu.elc -%%LISPDIR%%/w3m-om.el %%LISPDIR%%/w3m-perldoc.el %%LISPDIR%%/w3m-perldoc.elc %%LISPDIR%%/w3m-proc.el @@ -306,6 +357,8 @@ %%LISPDIR%%/w3m-rss.elc %%LISPDIR%%/w3m-search.el %%LISPDIR%%/w3m-search.elc +%%LISPDIR%%/w3m-session.el +%%LISPDIR%%/w3m-session.elc %%LISPDIR%%/w3m-symbol.el %%LISPDIR%%/w3m-symbol.elc %%LISPDIR%%/w3m-tabmenu.el @@ -316,7 +369,6 @@ %%LISPDIR%%/w3m-util.elc %%LISPDIR%%/w3m-weather.el %%LISPDIR%%/w3m-weather.elc -%%LISPDIR%%/w3m-xmas.el %%LISPDIR%%/w3m.el %%LISPDIR%%/w3m.elc %%PORTDOCS%%share/doc/ja/emacs-w3m/README.ja diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index cdd3f9a98513..f4436dfc73fc 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -6,17 +6,20 @@ # PORTNAME= emacs-w3m -PORTVERSION= 1.4.4 -PORTREVISION= 6 +PORTVERSION= 1.4.378.b.${SNAPDATE} CATEGORIES= www elisp -MASTER_SITES= http://emacs-w3m.namazu.org/ +MASTER_SITES= http://people.freebsd.org/~nobutaka/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} +DISTNAME= ${PORTNAME}-1.4.378-${SNAPDATE} MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Simple front-end to w3m for emacs +USE_BZIP2= yes USE_EMACS= yes +SNAPDATE= 20100125 + CONFIGURE_ARGS?= --with-emacs=${EMACS_CMD} \ --with-lispdir=${PREFIX}/${LISPDIR} \ --with-icondir=${PREFIX}/${ICONDIR} @@ -41,7 +44,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} DOCSDIR_JA= ${PREFIX}/share/doc/ja/${PORTNAME} .if defined(WITHOUT_SHIMBUN) -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Makefile.in +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in SHIMBUN= "@comment " WITHOUT_OCTET_VIEWER= yes .else @@ -50,10 +53,6 @@ SHIMBUN= "" .include -.if (${EMACS_PORT_NAME} == "emacs23") -BROKEN= this version does not support Emacs 23 -.endif - .if (${EMACS_PORT_NAME} == "emacs22") || (${EMACS_PORT_NAME} == "emacs23") FLIM_PORT= ${PORTSDIR}/editors/flim SEMI_PORT= ${PORTSDIR}/editors/semi diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo index 5c63a2fcb904..12b83724c4f5 100644 --- a/www/emacs-w3m/distinfo +++ b/www/emacs-w3m/distinfo @@ -1,3 +1,3 @@ -MD5 (emacs-w3m-1.4.4.tar.gz) = 6e592a9c0ab22fb532ebc3bcb21a45b1 -SHA256 (emacs-w3m-1.4.4.tar.gz) = a3e5e8374f7cfcedd5107feec84659248aad52fa302dec1e85f48529e71c77a4 -SIZE (emacs-w3m-1.4.4.tar.gz) = 796123 +MD5 (emacs-w3m-1.4.378-20100125.tar.bz2) = 7276bc76f2b6cdedbe9ba1287ceafe5a +SHA256 (emacs-w3m-1.4.378-20100125.tar.bz2) = 77ac726f00d60407d3f0a50d15f8af4dc2ae4720c6ebd33dc6790bcc5e6f3ec4 +SIZE (emacs-w3m-1.4.378-20100125.tar.bz2) = 741621 diff --git a/www/emacs-w3m/files/extra-patch-Makefile.in b/www/emacs-w3m/files/extra-patch-Makefile.in deleted file mode 100644 index 86f0eae03094..000000000000 --- a/www/emacs-w3m/files/extra-patch-Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.in.orig Sat Jul 27 19:04:35 2002 -+++ Makefile.in Sat Jul 27 19:04:39 2002 -@@ -42,16 +42,6 @@ - $(INSTALL_DATA) $$p $(lispdir)/$$p;\ - fi;\ - done;\ -- if test -f shimbun/shimbun.elc; then\ -- for p in `cd shimbun && echo *.el`; do\ -- echo " $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p";\ -- $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p;\ -- done;\ -- for p in `cd shimbun && echo *.elc`; do\ -- echo " $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p";\ -- $(INSTALL_DATA) shimbun/$$p $(lispdir)/$$p;\ -- done;\ -- fi - - install-icons: - @if test $(ICONDIR) = NONE; then\ diff --git a/www/emacs-w3m/files/extra-patch-aclocal.m4 b/www/emacs-w3m/files/extra-patch-aclocal.m4 new file mode 100644 index 000000000000..5f0937b19e62 --- /dev/null +++ b/www/emacs-w3m/files/extra-patch-aclocal.m4 @@ -0,0 +1,19 @@ +--- aclocal.m4.orig 2008-02-06 11:24:18.000000000 +0900 ++++ aclocal.m4 2010-01-28 00:57:56.000000000 +0900 +@@ -13,7 +13,7 @@ + dnl XEmacs 21.5 starts, in order to suppress warnings for Lisp shadows + dnl when XEmacs 21.5 starts. + if test "${VANILLA_FLAG}" = "-vanilla"; then +- XEMACSDEBUG='XEMACSDEBUG='\''(setq log-warning-minimum-level (quote error))'\'' ' ++ XEMACSDEBUG= + else + XEMACSDEBUG= + fi +@@ -296,6 +296,7 @@ + fi + fi]) + retval=`eval ${XEMACSDEBUG}${EMACS}' '${VANILLA_FLAG}' -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status'` ++ retval=`echo $retval | tr -d "\n"` + if test x"$retval" != xOK; then + AC_MSG_ERROR([Process couldn't proceed. See the above messages.]) + fi diff --git a/www/emacs-w3m/files/patch-Makefile.in b/www/emacs-w3m/files/patch-Makefile.in index 07bff0203007..cf97c31944b6 100644 --- a/www/emacs-w3m/files/patch-Makefile.in +++ b/www/emacs-w3m/files/patch-Makefile.in @@ -1,11 +1,24 @@ ---- Makefile.in.orig Thu Apr 29 16:50:55 2004 -+++ Makefile.in Sun Jun 13 22:08:51 2004 -@@ -56,7 +56,7 @@ +--- Makefile.in.orig 2008-02-06 11:24:18.000000000 +0900 ++++ Makefile.in 2010-01-25 00:55:21.000000000 +0900 +@@ -63,7 +63,7 @@ install-lisp: lisp - @$(SHELL) $(srcdir)/mkinstalldirs $(lispdir);\ -- for p in ChangeLog* *.el; do\ + @$(SHELL) $(srcdir)/mkinstalldirs "$(lispdir)";\ +- for p in ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9] *.el; do\ + for p in *.el; do\ - case "$$p" in\ - $(IGNORES)) ;;\ - *) echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\ + if test -f "$$p"; then\ + case "$$p" in\ + $(IGNORES)) ;;\ +@@ -85,12 +85,6 @@ + fi;\ + done;\ + if test -f shimbun/shimbun.elc; then\ +- for p in `cd shimbun && echo ChangeLog ChangeLog.[1-9] ChangeLog.[1-9][0-9]`; do\ +- if test -f "shimbun/$$p"; then\ +- echo "$(INSTALL_DATA) shimbun/$$p \"$(lispdir)/s$$p\"";\ +- $(INSTALL_DATA) shimbun/$$p "$(lispdir)/s$$p";\ +- fi;\ +- done;\ + for p in `cd shimbun && echo *.el`; do\ + echo "$(INSTALL_DATA) shimbun/$$p \"$(lispdir)/$$p\"";\ + $(INSTALL_DATA) shimbun/$$p "$(lispdir)/$$p";\ diff --git a/www/emacs-w3m/files/patch-w3mhack.el b/www/emacs-w3m/files/patch-w3mhack.el deleted file mode 100644 index b2cb68c19bc1..000000000000 --- a/www/emacs-w3m/files/patch-w3mhack.el +++ /dev/null @@ -1,11 +0,0 @@ ---- w3mhack.el.orig Sat Dec 31 22:56:04 2005 -+++ w3mhack.el Sat Dec 31 22:56:43 2005 -@@ -1180,7 +1180,7 @@ - `(lambda (&rest args) - (apply ,si:push-mark (car args) t (cddr args))))) - (unwind-protect -- (texinfo-format-buffer nil) -+ (texinfo-format-buffer t) - (fset 'message si:message) - (fset 'push-mark si:push-mark))) - (if (buffer-modified-p) diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist index b10169c21bbc..fb2fa3dab076 100644 --- a/www/emacs-w3m/pkg-plist +++ b/www/emacs-w3m/pkg-plist @@ -1,23 +1,43 @@ +%%ICONDIR%%/antenna-up.png %%ICONDIR%%/antenna-up.xpm +%%ICONDIR%%/back-disabled.png %%ICONDIR%%/back-disabled.xpm +%%ICONDIR%%/back-up.png %%ICONDIR%%/back-up.xpm +%%ICONDIR%%/copy-up.png %%ICONDIR%%/copy-up.xpm +%%ICONDIR%%/db-history-up.png %%ICONDIR%%/db-history-up.xpm +%%ICONDIR%%/forward-disabled.png %%ICONDIR%%/forward-disabled.xpm +%%ICONDIR%%/forward-up.png %%ICONDIR%%/forward-up.xpm +%%ICONDIR%%/history-up.png %%ICONDIR%%/history-up.xpm +%%ICONDIR%%/home-up.png %%ICONDIR%%/home-up.xpm +%%ICONDIR%%/image-up.png %%ICONDIR%%/image-up.xpm +%%ICONDIR%%/open-up.png %%ICONDIR%%/open-up.xpm +%%ICONDIR%%/parent-disabled.png %%ICONDIR%%/parent-disabled.xpm +%%ICONDIR%%/parent-up.png %%ICONDIR%%/parent-up.xpm +%%ICONDIR%%/reload-up.png %%ICONDIR%%/reload-up.xpm +%%ICONDIR%%/search-up.png %%ICONDIR%%/search-up.xpm %%ICONDIR%%/spinner.gif +%%ICONDIR%%/state-00.png %%ICONDIR%%/state-00.xpm +%%ICONDIR%%/state-01.png %%ICONDIR%%/state-01.xpm +%%ICONDIR%%/state-10.png %%ICONDIR%%/state-10.xpm +%%ICONDIR%%/state-11.png %%ICONDIR%%/state-11.xpm +%%ICONDIR%%/weather-up.png %%ICONDIR%%/weather-up.xpm %%SHIMBUN%%%%LISPDIR%%/mew-shimbun.el %%SHIMBUN%%@unexec rm -f %D/%%LISPDIR%%/mew-shimbun.elc @@ -33,6 +53,10 @@ %%SHIMBUN%%%%LISPDIR%%/sb-2ch.elc %%SHIMBUN%%%%LISPDIR%%/sb-airs.el %%SHIMBUN%%%%LISPDIR%%/sb-airs.elc +%%SHIMBUN%%%%LISPDIR%%/sb-aljazeera.el +%%SHIMBUN%%%%LISPDIR%%/sb-aljazeera.elc +%%SHIMBUN%%%%LISPDIR%%/sb-arch-bluegate.el +%%SHIMBUN%%%%LISPDIR%%/sb-arch-bluegate.elc %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc %%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.el @@ -41,14 +65,16 @@ %%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc %%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.el %%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.elc +%%SHIMBUN%%%%LISPDIR%%/sb-atom-hash.el +%%SHIMBUN%%%%LISPDIR%%/sb-atom-hash.elc +%%SHIMBUN%%%%LISPDIR%%/sb-atom.el +%%SHIMBUN%%%%LISPDIR%%/sb-atom.elc %%SHIMBUN%%%%LISPDIR%%/sb-bbc.el %%SHIMBUN%%%%LISPDIR%%/sb-bbc.elc %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc %%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.el %%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.elc -%%SHIMBUN%%%%LISPDIR%%/sb-chalow.el -%%SHIMBUN%%%%LISPDIR%%/sb-chalow.elc %%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.el %%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-cnet.el @@ -61,6 +87,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-debian.el %%SHIMBUN%%%%LISPDIR%%/sb-debian.elc +%%SHIMBUN%%%%LISPDIR%%/sb-debugmagazin-de.el +%%SHIMBUN%%%%LISPDIR%%/sb-debugmagazin-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-dennou.el %%SHIMBUN%%%%LISPDIR%%/sb-dennou.elc %%SHIMBUN%%%%LISPDIR%%/sb-digiko.el @@ -71,6 +99,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-emacs-w3m.elc %%SHIMBUN%%%%LISPDIR%%/sb-emacswiki.el %%SHIMBUN%%%%LISPDIR%%/sb-emacswiki.elc +%%SHIMBUN%%%%LISPDIR%%/sb-engadget-ja.el +%%SHIMBUN%%%%LISPDIR%%/sb-engadget-ja.elc %%SHIMBUN%%%%LISPDIR%%/sb-excite.el %%SHIMBUN%%%%LISPDIR%%/sb-excite.elc %%SHIMBUN%%%%LISPDIR%%/sb-exconn.el @@ -83,6 +113,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-ffii.elc %%SHIMBUN%%%%LISPDIR%%/sb-fml.el %%SHIMBUN%%%%LISPDIR%%/sb-fml.elc +%%SHIMBUN%%%%LISPDIR%%/sb-gendai-net.el +%%SHIMBUN%%%%LISPDIR%%/sb-gendai-net.elc %%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.el %%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.elc %%SHIMBUN%%%%LISPDIR%%/sb-glimpse.el @@ -91,6 +123,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc %%SHIMBUN%%%%LISPDIR%%/sb-haiku-os.el %%SHIMBUN%%%%LISPDIR%%/sb-haiku-os.elc +%%SHIMBUN%%%%LISPDIR%%/sb-hash.el +%%SHIMBUN%%%%LISPDIR%%/sb-hash.elc %%SHIMBUN%%%%LISPDIR%%/sb-heise.el %%SHIMBUN%%%%LISPDIR%%/sb-heise.elc %%SHIMBUN%%%%LISPDIR%%/sb-hns.el @@ -99,6 +133,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.elc %%SHIMBUN%%%%LISPDIR%%/sb-impress.el %%SHIMBUN%%%%LISPDIR%%/sb-impress.elc +%%SHIMBUN%%%%LISPDIR%%/sb-infoshop.el +%%SHIMBUN%%%%LISPDIR%%/sb-infoshop.elc %%SHIMBUN%%%%LISPDIR%%/sb-itmedia.el %%SHIMBUN%%%%LISPDIR%%/sb-itmedia.elc %%SHIMBUN%%%%LISPDIR%%/sb-japantimes.el @@ -115,8 +151,6 @@ %%SHIMBUN%%%%LISPDIR%%/sb-kde.elc %%SHIMBUN%%%%LISPDIR%%/sb-laut-de.el %%SHIMBUN%%%%LISPDIR%%/sb-laut-de.elc -%%SHIMBUN%%%%LISPDIR%%/sb-linux-ja.el -%%SHIMBUN%%%%LISPDIR%%/sb-linux-ja.elc %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-lotusex.el @@ -149,8 +183,8 @@ %%SHIMBUN%%%%LISPDIR%%/sb-msdn.elc %%SHIMBUN%%%%LISPDIR%%/sb-msports-nifty.el %%SHIMBUN%%%%LISPDIR%%/sb-msports-nifty.elc -%%SHIMBUN%%%%LISPDIR%%/sb-muchy.el -%%SHIMBUN%%%%LISPDIR%%/sb-muchy.elc +%%SHIMBUN%%%%LISPDIR%%/sb-multi.el +%%SHIMBUN%%%%LISPDIR%%/sb-multi.elc %%SHIMBUN%%%%LISPDIR%%/sb-n24-de.el %%SHIMBUN%%%%LISPDIR%%/sb-n24-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-namazu.el @@ -161,12 +195,18 @@ %%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.elc %%SHIMBUN%%%%LISPDIR%%/sb-nikkei.el %%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc +%%SHIMBUN%%%%LISPDIR%%/sb-nytimes.el +%%SHIMBUN%%%%LISPDIR%%/sb-nytimes.elc +%%SHIMBUN%%%%LISPDIR%%/sb-opentechpress-jp.el +%%SHIMBUN%%%%LISPDIR%%/sb-opentechpress-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-orca.el %%SHIMBUN%%%%LISPDIR%%/sb-orca.elc %%SHIMBUN%%%%LISPDIR%%/sb-palmfan.el %%SHIMBUN%%%%LISPDIR%%/sb-palmfan.elc %%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.el %%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.elc +%%SHIMBUN%%%%LISPDIR%%/sb-perlentaucher-de.el +%%SHIMBUN%%%%LISPDIR%%/sb-perlentaucher-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.el %%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.elc %%SHIMBUN%%%%LISPDIR%%/sb-pilot-mailsync.el @@ -181,6 +221,10 @@ %%SHIMBUN%%%%LISPDIR%%/sb-redhat.elc %%SHIMBUN%%%%LISPDIR%%/sb-rediff.el %%SHIMBUN%%%%LISPDIR%%/sb-rediff.elc +%%SHIMBUN%%%%LISPDIR%%/sb-rss-blogs.el +%%SHIMBUN%%%%LISPDIR%%/sb-rss-blogs.elc +%%SHIMBUN%%%%LISPDIR%%/sb-rss-hash.el +%%SHIMBUN%%%%LISPDIR%%/sb-rss-hash.elc %%SHIMBUN%%%%LISPDIR%%/sb-rss.el %%SHIMBUN%%%%LISPDIR%%/sb-rss.elc %%SHIMBUN%%%%LISPDIR%%/sb-ruby.el @@ -189,10 +233,14 @@ %%SHIMBUN%%%%LISPDIR%%/sb-sankei.elc %%SHIMBUN%%%%LISPDIR%%/sb-savannah.el %%SHIMBUN%%%%LISPDIR%%/sb-savannah.elc +%%SHIMBUN%%%%LISPDIR%%/sb-scipy.el +%%SHIMBUN%%%%LISPDIR%%/sb-scipy.elc %%SHIMBUN%%%%LISPDIR%%/sb-security-memo.el %%SHIMBUN%%%%LISPDIR%%/sb-security-memo.elc %%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.el %%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.elc +%%SHIMBUN%%%%LISPDIR%%/sb-slashdot.el +%%SHIMBUN%%%%LISPDIR%%/sb-slashdot.elc %%SHIMBUN%%%%LISPDIR%%/sb-sml.el %%SHIMBUN%%%%LISPDIR%%/sb-sml.elc %%SHIMBUN%%%%LISPDIR%%/sb-sourceforge-jp.el @@ -205,16 +253,22 @@ %%SHIMBUN%%%%LISPDIR%%/sb-squeak-dev.elc %%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.el %%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.elc +%%SHIMBUN%%%%LISPDIR%%/sb-sueddeutsche-de.el +%%SHIMBUN%%%%LISPDIR%%/sb-sueddeutsche-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-tcup.el %%SHIMBUN%%%%LISPDIR%%/sb-tcup.elc %%SHIMBUN%%%%LISPDIR%%/sb-tdiary-ml.el %%SHIMBUN%%%%LISPDIR%%/sb-tdiary-ml.elc %%SHIMBUN%%%%LISPDIR%%/sb-tdiary.el %%SHIMBUN%%%%LISPDIR%%/sb-tdiary.elc +%%SHIMBUN%%%%LISPDIR%%/sb-tech-on.el +%%SHIMBUN%%%%LISPDIR%%/sb-tech-on.elc %%SHIMBUN%%%%LISPDIR%%/sb-texfaq.el %%SHIMBUN%%%%LISPDIR%%/sb-texfaq.elc %%SHIMBUN%%%%LISPDIR%%/sb-text.el %%SHIMBUN%%%%LISPDIR%%/sb-text.elc +%%SHIMBUN%%%%LISPDIR%%/sb-the-onion.el +%%SHIMBUN%%%%LISPDIR%%/sb-the-onion.elc %%SHIMBUN%%%%LISPDIR%%/sb-the-register.el %%SHIMBUN%%%%LISPDIR%%/sb-the-register.elc %%SHIMBUN%%%%LISPDIR%%/sb-tigris.el @@ -225,8 +279,6 @@ %%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc -%%SHIMBUN%%%%LISPDIR%%/sb-weeklyworldnews.el -%%SHIMBUN%%%%LISPDIR%%/sb-weeklyworldnews.elc %%SHIMBUN%%%%LISPDIR%%/sb-welt-de.el %%SHIMBUN%%%%LISPDIR%%/sb-welt-de.elc %%SHIMBUN%%%%LISPDIR%%/sb-wiki.el @@ -237,8 +289,6 @@ %%SHIMBUN%%%%LISPDIR%%/sb-wincefan.elc %%SHIMBUN%%%%LISPDIR%%/sb-wired-jp.el %%SHIMBUN%%%%LISPDIR%%/sb-wired-jp.elc -%%SHIMBUN%%%%LISPDIR%%/sb-wired.el -%%SHIMBUN%%%%LISPDIR%%/sb-wired.elc %%SHIMBUN%%%%LISPDIR%%/sb-x51.el %%SHIMBUN%%%%LISPDIR%%/sb-x51.elc %%SHIMBUN%%%%LISPDIR%%/sb-xemacs.el @@ -253,13 +303,14 @@ %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.elc %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc +%%SHIMBUN%%%%LISPDIR%%/sb-zdnet-jp.el +%%SHIMBUN%%%%LISPDIR%%/sb-zdnet-jp.elc %%SHIMBUN%%%%LISPDIR%%/sb-zeit-de.el %%SHIMBUN%%%%LISPDIR%%/sb-zeit-de.elc %%SHIMBUN%%%%LISPDIR%%/shimbun.el %%SHIMBUN%%%%LISPDIR%%/shimbun.elc %%LISPDIR%%/w3m-antenna.el %%LISPDIR%%/w3m-antenna.elc -%%LISPDIR%%/w3m-bitmap.el %%LISPDIR%%/w3m-bookmark.el %%LISPDIR%%/w3m-bookmark.elc %%LISPDIR%%/w3m-bug.el @@ -270,18 +321,16 @@ %%LISPDIR%%/w3m-cookie.elc %%LISPDIR%%/w3m-dtree.el %%LISPDIR%%/w3m-dtree.elc -%%LISPDIR%%/w3m-e19.el -%%LISPDIR%%/w3m-e20.el -%%LISPDIR%%/w3m-e21.el -%%LISPDIR%%/w3m-e21.elc +%%LISPDIR%%/w3m-ems.el +%%LISPDIR%%/w3m-ems.elc %%LISPDIR%%/w3m-favicon.el %%LISPDIR%%/w3m-favicon.elc +%%LISPDIR%%/w3m-fb.el +%%LISPDIR%%/w3m-fb.elc %%LISPDIR%%/w3m-filter.el %%LISPDIR%%/w3m-filter.elc %%LISPDIR%%/w3m-form.el %%LISPDIR%%/w3m-form.elc -%%LISPDIR%%/w3m-fsf.el -%%LISPDIR%%/w3m-fsf.elc %%LISPDIR%%/w3m-hist.el %%LISPDIR%%/w3m-hist.elc %%LISPDIR%%/w3m-image.el @@ -289,9 +338,10 @@ %%LISPDIR%%/w3m-lnum.el %%LISPDIR%%/w3m-lnum.elc %%LISPDIR%%/w3m-load.el +%%LISPDIR%%/w3m-mail.el +%%LISPDIR%%/w3m-mail.elc %%LISPDIR%%/w3m-namazu.el %%LISPDIR%%/w3m-namazu.elc -%%LISPDIR%%/w3m-om.el %%LISPDIR%%/w3m-perldoc.el %%LISPDIR%%/w3m-perldoc.elc %%LISPDIR%%/w3m-proc.el @@ -300,6 +350,8 @@ %%LISPDIR%%/w3m-rss.elc %%LISPDIR%%/w3m-search.el %%LISPDIR%%/w3m-search.elc +%%LISPDIR%%/w3m-session.el +%%LISPDIR%%/w3m-session.elc %%LISPDIR%%/w3m-symbol.el %%LISPDIR%%/w3m-symbol.elc %%LISPDIR%%/w3m-tabmenu.el @@ -310,7 +362,6 @@ %%LISPDIR%%/w3m-util.elc %%LISPDIR%%/w3m-weather.el %%LISPDIR%%/w3m-weather.elc -%%LISPDIR%%/w3m-xmas.el %%LISPDIR%%/w3m.elc %%LISPDIR%%/w3m.el %%PORTDOCS%%share/doc/ja/emacs-w3m/README.ja