Update to w3-4.0pre.46.

Timed out from: MAINTAINER
Reviewed by: Ilya Martynov <m_ilya@agava.com>
Repo-copied by: asami

8 files changed, 163 insertions, 312 deletions

diff --git a/www/w3-4/Makefile b/www/w3-4/Makefile
index 48836ad9f6bc..8b778411e70d 100644
--- a/www/w3-4/Makefile
+++ b/www/w3-4/Makefile
@@ -6,36 +6,29 @@
 #
 
 PORTNAME=	w3
-PORTVERSION=	2.2.26
+PORTVERSION=	4.0.p46
 CATEGORIES+=	www elisp
-MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/network/WWW/w3/ \
-		ftp://ftp.cs.indiana.edu/pub/elisp/w3/
+MASTER_SITES=	${MASTER_SITE_XEMACS}
+MASTER_SITE_SUBDIR=	emacs-w3
+DISTNAME=	w3-4.0pre.46
 
-MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
+MAINTAINER=	kiri@FreeBSD.org
 
-BUILD_DEPENDS?=	emacs-19.34:${PORTSDIR}/editors/emacs
-RUN_DEPENDS?=	emacs-19.34:${PORTSDIR}/editors/emacs
+BUILD_DEPENDS?=	emacs-20.7:${PORTSDIR}/editors/emacs20
+RUN_DEPENDS?=	emacs-20.7:${PORTSDIR}/editors/emacs20
+
+GNU_CONFIGURE=	yes
 
-WRKSRC=		${WRKDIR}/w3
 MAKE_ENV+=	EMACSCMD=${EMACSCMD} ELISPDIR=${ELISPDIR} \
 		MKDIR="${MKDIR}" CP=${CP} \
 		INFODIR=${INFODIR} \
 		INSTALL_DATA="${INSTALL_DATA}"
 
-PKGINSTALL=	${WRKDIR}/INSTALL
-PKGDEINSTALL=	${WRKDIR}/DEINSTALL
-VERSION=	2.2.26
-EMACSCMD?=	emacs-19.34
 PORTSDOCDIR=	${PREFIX}/share/doc/w3
 SAMPLEDIR=	${PREFIX}/share/examples/w3
-ELISPDIR?=	${PREFIX}/share/emacs/site-lisp
-INFODIR=	${PREFIX}/info
-ADDIR=		${X11BASE}/lib/X11/app-defaults
-DIRSECTION=	The Emacs editor and associated tools
-INFOFILE=	w3.info
 
 post-build:
-.for f in DEINSTALL INSTALL dot.emacs user-install
+.for f in dot.emacs user-install
 	@${SED} -e "s,%VERSION%,${VERSION},g" \
 		-e "s,%PREFIX%,${PREFIX},g" \
 		-e "s,%INFODIR%,${INFODIR},g" \
@@ -60,14 +53,8 @@ post-install:
 	@${INSTALL_DATA} ${WRKDIR}/${f} ${SAMPLEDIR}
 .endfor
 	@${INSTALL_SCRIPT} ${WRKDIR}/user-install ${SAMPLEDIR}
-.for f in W3.ad clean-cache Makefile w3.txi
-	@${INSTALL_DATA} ${WRKSRC}/${f}  ${PORTSDOCDIR}
-.endfor
+
 .endif
-	@${SETENV} MKDIR="${MKDIR}" TOUCH=${TOUCH} \
-		INFODIR=${INFODIR} INFOFILE=${INFOFILE} \
-		ELISPDIR=${ELISPDIR} ADDIR=${ADDIR} \
-		DIRSECTION="${DIRSECTION}" \
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL 
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/w3-4/distinfo b/www/w3-4/distinfo
index 461238b90fcf..b6af04c8d80b 100644
--- a/www/w3-4/distinfo
+++ b/www/w3-4/distinfo
@@ -1 +1 @@
-MD5 (w3-2.2.26.tar.gz) = e12d158809b8084bd0dc3491610b0a43
+MD5 (w3-4.0pre.46.tar.gz) = 7c15eadee53b314fd46c957ae83e00a0
diff --git a/www/w3-4/files/DEINSTALL.tmpl b/www/w3-4/files/DEINSTALL.tmpl
deleted file mode 100644
index 48f1b91fd511..000000000000
--- a/www/w3-4/files/DEINSTALL.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-infodir=${INFODIR:-%INFODIR%}
-infofile=${INFOFILE:-%INFOFILE%}
-elispdir=${ELISPDIR:-%ELISPDIR%}
-addir=${ADDIR:-%ADDIR%}
-
-if [ "X$2" = X"DEINSTALL" ]; then
-	echo "Deleting \"w3\" entry from ${infodir}/dir"
-	install-info --delete ${infodir}/${infofile} ${infodir}/dir
-	OptionStart=";;; Emacs-w3 configuration options"
-	OptionEnd=";;; End of Emacs-w3 configuration options"
-	if  [ "`grep \"^${OptionStart}\"  ${elispdir}/site-start.el`" ]; then 
-		echo "Deleting \"w3\" entry from ${elispdir}/site-start.el"
-		sed -e "/^${OptionStart}/,/^${OptionEnd}/d"\
-			 ${elispdir}/site-start.el \
-					> ${elispdir}/site-start.el.bak
-		mv ${elispdir}/site-start.el.bak ${elispdir}/site-start.el
-	fi
-	OptionStart="!!! Emacs-w3 configuration options"
-	OptionEnd="!!! End of Emacs-w3 configuration options"
-	if  [ "`grep \"^${OptionStart}\"  ${addir}/Emacs`" ]; then 
-		echo "Deleting \"w3\" entry from ${addir}/Emacs"
-		sed -e 's/^![ 	]*\(Emacs\*w3-.*\)$/&/' \
-			-e "/^${OptionStart}/,/^${OptionEnd}/d" \
-			${addir}/Emacs		> ${addir}/Emacs.bak
-		mv ${addir}/Emacs.bak ${addir}/Emacs
-	fi
-else
-	exit 0
-fi
diff --git a/www/w3-4/files/INSTALL.tmpl b/www/w3-4/files/INSTALL.tmpl
deleted file mode 100644
index 7ffbe18093fd..000000000000
--- a/www/w3-4/files/INSTALL.tmpl
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-TOUCH=${TOUCH:-%TOUCH%}
-MKDIR=${MKDIR:-"%MKDIR%"}
-
-infodir=${INFODIR:-%INFODIR%}
-infofile=${INFOFILE:-%INFOFILE%}
-elispdir=${ELISPDIR:-%ELISPDIR%}
-addir=${ADDIR:-%ADDIR%}
-
-dirsection=${DIRSECTION:-%DIRSECTION%}
-
-OptionStart="Emacs-w3 configuration options"
-OptionEnd="End of Emacs-w3 configuration options"
-
-if [ "X$2" = X"POST-INSTALL" ]; then
-	if [ ! -f ${elispdir}/site-start.el ]; then 
-		 ${TOUCH} ${elispdir}/site-start.el
-	fi
-	${MKDIR} ${addir}
-	if [ ! -f ${addir}/Emacs ]; then 
-		 ${TOUCH} ${addir}/Emacs
-	fi
-	if [ ! "`grep \"START-INFO-DIR-ENTRY\" ${infodir}/${infofile}`" ]; then
-		echo "INFO-DIR-SECTION ${dirsection}" \
-						>> ${infodir}/${infofile}
-		echo "START-INFO-DIR-ENTRY"	>> ${infodir}/${infofile}
-		echo "* W3: (`basename ${infofile} .info`).			WWW browser." \
-						>> ${infodir}/${infofile}
-		echo "END-INFO-DIR-ENTRY"	>> ${infodir}/${infofile}
-	fi
-	echo "Adding \"w3\" entry to ${infodir}/dir"
-	install-info ${infodir}/${infofile} ${infodir}/dir
-	sed -e "/^;;; ${OptionStart}/,/^;;; ${OptionEnd}/d" \
-		${elispdir}/site-start.el > ${elispdir}/site-start.el.bak
-	mv ${elispdir}/site-start.el.bak ${elispdir}/site-start.el
-	echo "Adding \"w3\" entry to ${elispdir}/site-start.el"
-	echo ";;; ${OptionStart}" \
-						>> ${elispdir}/site-start.el
-	echo "(setq load-path "			>> ${elispdir}/site-start.el
-	echo "	(cons (expand-file-name " >> ${elispdir}/site-start.el
-	echo "		\"${elispdir}/w3\") load-path))" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'w3-preview-this-buffer \"w3\" \"WWW Previewer\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'w3-follow-url-at-point" \
-						>> ${elispdir}/site-start.el
-	echo "	\"w3\" \"Find document at pt\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'w3 \"w3\" \"WWW Browser\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'w3-open-local" >> ${elispdir}/site-start.el
-	echo "	\"w3\" \"Open local file for WWW browsing\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'w3-fetch"	>> ${elispdir}/site-start.el
-	echo "	\"w3\" \"Open remote file for WWW browsing\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'w3-use-hotlist" >> ${elispdir}/site-start.el
-	echo "	\"w3\" \"Use shortcuts to view WWW docs\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'w3-show-hotlist" >> ${elispdir}/site-start.el
-	echo "	\"w3\" \"Use shortcuts to view WWW docs\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'w3-follow-link" >> ${elispdir}/site-start.el
-	echo "	\"w3\" \"Follow a hypertext link.\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'w3-batch-fetch" >> ${elispdir}/site-start.el
-	echo "	\"w3\" \"Batch retrieval of URLs\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'url-get-url-at-point" >> ${elispdir}/site-start.el
-	echo "	\"url\" \"Find the url under the cursor\" nil)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'url-file-attributes" \
-						>> ${elispdir}/site-start.el
-	echo "	\"url\" \"File attributes of a URL\" nil)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'url-popup-info"	>> ${elispdir}/site-start.el
-	echo "	\"url\" \"Get info on a URL\" t)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'url-retrieve"		>> ${elispdir}/site-start.el
-	echo "	\"url\" \"Retrieve a URL\" nil)" >> ${elispdir}/site-start.el
-	echo "(autoload 'url-buffer-visiting" \
-						>> ${elispdir}/site-start.el
-	echo "	\"url\" \"Find buffer visiting a URL.\" nil)" \
-						>> ${elispdir}/site-start.el
-	echo "(autoload 'gopher-dispatch-object" \
-						>> ${elispdir}/site-start.el
-	echo "	\"gopher\" \"Fetch gopher dir\" t)" \
-						>> ${elispdir}/site-start.el
-	echo ";;; ${OptionEnd}" \
-						 >> ${elispdir}/site-start.el
-	if [ ! -f ${addir}/Emacs ]; then
-		touch ${addir}/Emacs
-	fi
-	sed -e 's/^![ 	]*\(Emacs\*w3-.*\)$/&/' \
-		-e "/^!!! ${OptionStart}/,/^!!! ${OptionEnd}/d" \
-			${addir}/Emacs > ${addir}/Emacs.bak
-	mv ${addir}/Emacs.bak ${addir}/Emacs
-	echo "Adding \"w3\" entry to ${addir}/Emacs"
-	sed -e 's/^[ 	]*Emacs\*w3-.*$/! &/'	${addir}/Emacs \
-						> ${addir}/Emacs.bak
-	echo "!!! ${OptionStart}"		>> ${addir}/Emacs.bak
-	echo "Emacs*w3-node-style.attributeForeground: purple" \
-						>> ${addir}/Emacs.bak
-	echo "Emacs*w3-visited-node-style.attributeForeground: blue" \
-						>> ${addir}/Emacs.bak
-	echo "!!! End of ${OptionStart}"	>> ${addir}/Emacs.bak
-	mv ${addir}/Emacs.bak ${addir}/Emacs
-	exit 0
-else
-	exit 0
-fi
diff --git a/www/w3-4/files/patch-aa b/www/w3-4/files/patch-aa
deleted file mode 100644
index a1b9742daad1..000000000000
--- a/www/w3-4/files/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.orig	Sun Oct 29 01:21:56 1995
-+++ Makefile	Sat May 31 19:15:25 1997
-@@ -1,19 +1,19 @@
- # what emacs is called on your system
--EMACS = emacs
-+EMACS = ${EMACSCMD}
- 
- # How to make a directory
- # need a -p if you want to make the parents!
--MKDIR = mkdir
-+MKDIR ?= mkdir
- 
- # Various other stuff used
- RM    = rm -f
--CP    = cp
-+CP    ?= cp
- 
- # where the Info file should go
--INFODIR = ../info
-+INFODIR ?= ../info
- 
- # where the w3 lisp files should go
--LISPDIR = $$HOME/lisp
-+LISPDIR = ${ELISPDIR}/w3
- 
- # Change this to be where your .emacs file is stored
- DOTEMACS      = $$HOME/.emacs
-@@ -57,16 +57,16 @@
- w3:	docomp.el $(OBJECTS)
- 	@echo Build of w3 complete...
- 
--all:	w3.info w3 emacs
-+all:	w3.info w3
- 
- install: all
- 	@echo Installing in $(LISPDIR)
- 	if [ ! -d $(LISPDIR) ] ; then $(MKDIR) $(LISPDIR) ; fi
--	(cd $(LISPDIR) ; $(RM) -f $(SOURCES) $(OBJECTS) w3-sysdp.el*)
--	$(CP) $(SOURCES) $(OBJECTS) $(LISPDIR)
-+	(cd $(LISPDIR) ; $(RM) $(SOURCES) $(OBJECTS) w3-sysdp.el*)
-+	${INSTALL_DATA} $(SOURCES) $(OBJECTS) $(LISPDIR)
- 	if [ ! -d $(INFODIR) ] ; then $(MKDIR) $(INFODIR) ; fi
--	(cd $(INFODIR) ; $(RM) -f w3.info*)
--	$(CP) w3.info* $(INFODIR)
-+	(cd $(INFODIR) ; $(RM) w3.info*)
-+	${INSTALL_DATA} w3.info* $(INFODIR)
- 
- emacs:	
- 	@echo Adding w3 setup to $(DOTEMACS)
diff --git a/www/w3-4/files/user-install.tmpl b/www/w3-4/files/user-install.tmpl
index 118f0b23da11..8043dab30988 100644
--- a/www/w3-4/files/user-install.tmpl
+++ b/www/w3-4/files/user-install.tmpl
@@ -6,6 +6,9 @@ if [ ! -f ${HOME}/.mosaic-hotlist-default ]; then
 	cp ${SAMPLEDIR}/dot.mosaic-hotlist-default ${HOME}/.mosaic-hotlist-default
 fi
 
-mv ${HOME}/.emacs ${HOME}/.emacs.org.$$
-sed -e '/^;;* Emacs-w3 ;*$/,/^;; *Emacs-w3 end$/d' < ${HOME}/.emacs.org.$$ > ${HOME}/.emacs
+if [ -f ${HOME}/.emacs ]; then
+	mv ${HOME}/.emacs ${HOME}/.emacs.org.$$ ;
+	sed -e '/^;;* Emacs-w3 ;*$/,/^;; *Emacs-w3 end$/d' < ${HOME}/.emacs.org.$$ > ${HOME}/.emacs ;
+fi
+
 cat ${SAMPLEDIR}/dot.emacs >> ${HOME}/.emacs
diff --git a/www/w3-4/pkg-descr b/www/w3-4/pkg-descr
index 4a4cf1de01f1..5e36ef078a20 100644
--- a/www/w3-4/pkg-descr
+++ b/www/w3-4/pkg-descr
@@ -1,27 +1,10 @@
-w3-2.2.26 package is WWW browser package for emacs.
-
-Info path and elisp load path would be set as follows :
-
-    Info path - /usr/local/info
-    load path - /usr/local/share/emacs/site-lisp/w3
-
-You may be happy by adding following lines to your .emacs file:
-
-	(setq url-keep-history t)
-	(setq url-be-asynchronous t)
-	(setq w3-default-homepage
-		"file://localhost/usr/share/doc/handbook/handbook.html")
-
-and copying .mosaic-hotlist-default file from /usr/local/share/examples/w3
-directory to your home directory.
-
-Setting above user environment would be only executed by
-/usr/local/share/examples/w3/user-install on your home directory. 
-
-If you want to get an typesetting manual, copy Makefile and w3.texi from
-/usr/local/share/doc/w3 and 'make w3.dvi'.
-
-If you have installed correctly, type "M-x w3". Enjoy!
-
-- Kiriyama Kazuhiko
-kiri@kiri.toba-cmt.ac.jp
+Emacs/W3 is a full-featured web browser, written entirely in Emacs-Lisp,
+that supports all the bells and whistles you will find in use on the web
+today, including frames, tables, stylesheets, and much more. Emacs/W3
+runs on most major operating systems, including almost any flavor of Unix,
+Windows NT/95, AmigaDOS, OS/2, and VMS. 
+
+Emacs/W3 4.0 is the first major release of Emacs/W3 in almost a year, and
+is a major upgrade. Please read the documentation carefully if you are
+upgrading. If you run into any problems, please read the FAQ to see if
+you have run into a common problem. 
diff --git a/www/w3-4/pkg-plist b/www/w3-4/pkg-plist
index fc5171711519..14fb868310e7 100644
--- a/www/w3-4/pkg-plist
+++ b/www/w3-4/pkg-plist
@@ -1,73 +1,143 @@
+@unexec install-info --delete %D/info/w3-faq.info %D/info/dir
+@unexec install-info --delete %D/info/w3.info %D/info/dir
+info/w3-faq.info
 info/w3.info
 info/w3.info-1
 info/w3.info-2
 info/w3.info-3
 info/w3.info-4
-share/doc/w3/clean-cache
-share/doc/w3/w3.txi
-share/doc/w3/Makefile
-share/doc/w3/W3.ad
-share/examples/w3/user-install
+info/w3.info-5
+share/emacs/site-lisp/mule-sysdp.el
+share/emacs/site-lisp/w3-widget.el
+share/emacs/site-lisp/devices.el
+share/emacs/site-lisp/w3-imap.el
+share/emacs/site-lisp/css.el
+share/emacs/site-lisp/dsssl.el
+share/emacs/site-lisp/dsssl-flow.el
+share/emacs/site-lisp/font.el
+share/emacs/site-lisp/images.el
+share/emacs/site-lisp/w3-vars.el
+share/emacs/site-lisp/w3-cus.el
+share/emacs/site-lisp/w3-style.el
+share/emacs/site-lisp/w3-keyword.el
+share/emacs/site-lisp/w3-forms.el
+share/emacs/site-lisp/w3-emulate.el
+share/emacs/site-lisp/w3-props.el
+share/emacs/site-lisp/w3-menu.el
+share/emacs/site-lisp/w3-mouse.el
+share/emacs/site-lisp/w3-toolbar.el
+share/emacs/site-lisp/w3-speak.el
+share/emacs/site-lisp/w3-latex.el
+share/emacs/site-lisp/w3-parse.el
+share/emacs/site-lisp/w3-display.el
+share/emacs/site-lisp/w3-print.el
+share/emacs/site-lisp/w3-about.el
+share/emacs/site-lisp/w3-hotindex.el
+share/emacs/site-lisp/w3-hot.el
+share/emacs/site-lisp/w3-e19.el
+share/emacs/site-lisp/w3-xemac.el
+share/emacs/site-lisp/w3.el
+share/emacs/site-lisp/w3-script.el
+share/emacs/site-lisp/w3-jscript.el
+share/emacs/site-lisp/w3-elisp.el
+share/emacs/site-lisp/w3-e20.el
+share/emacs/site-lisp/w3-speak-table.el
+share/emacs/site-lisp/w3-java.el
+share/emacs/site-lisp/url-nfs.el
+share/emacs/site-lisp/url-file.el
+share/emacs/site-lisp/url-cookie.el
+share/emacs/site-lisp/url-parse.el
+share/emacs/site-lisp/url-irc.el
+share/emacs/site-lisp/url-gopher.el
+share/emacs/site-lisp/url-http.el
+share/emacs/site-lisp/url-mail.el
+share/emacs/site-lisp/url-misc.el
+share/emacs/site-lisp/url-news.el
+share/emacs/site-lisp/url-vars.el
+share/emacs/site-lisp/url-auth.el
+share/emacs/site-lisp/mm.el
+share/emacs/site-lisp/md5.el
+share/emacs/site-lisp/url-gw.el
+share/emacs/site-lisp/ssl.el
+share/emacs/site-lisp/base64.el
+share/emacs/site-lisp/url.el
+share/emacs/site-lisp/socks.el
+share/emacs/site-lisp/url-cache.el
+share/emacs/site-lisp/url-ns.el
+share/emacs/site-lisp/url-ldap.el
+share/emacs/site-lisp/auto-autoloads.el
+share/emacs/site-lisp/custom-load.el
+share/emacs/site-lisp/w3-auto.el
+share/emacs/site-lisp/w3-cfg.el
+share/emacs/site-lisp/w3-sysdp.el
+share/emacs/site-lisp/docomp.el
+share/emacs/site-lisp/url-cid.el
+share/emacs/site-lisp/mule-sysdp.elc
+share/emacs/site-lisp/w3-widget.elc
+share/emacs/site-lisp/devices.elc
+share/emacs/site-lisp/w3-imap.elc
+share/emacs/site-lisp/css.elc
+share/emacs/site-lisp/dsssl.elc
+share/emacs/site-lisp/dsssl-flow.elc
+share/emacs/site-lisp/font.elc
+share/emacs/site-lisp/images.elc
+share/emacs/site-lisp/w3-vars.elc
+share/emacs/site-lisp/w3-cus.elc
+share/emacs/site-lisp/w3-style.elc
+share/emacs/site-lisp/w3-keyword.elc
+share/emacs/site-lisp/w3-forms.elc
+share/emacs/site-lisp/w3-emulate.elc
+share/emacs/site-lisp/w3-props.elc
+share/emacs/site-lisp/w3-menu.elc
+share/emacs/site-lisp/w3-mouse.elc
+share/emacs/site-lisp/w3-toolbar.elc
+share/emacs/site-lisp/w3-speak.elc
+share/emacs/site-lisp/w3-latex.elc
+share/emacs/site-lisp/w3-parse.elc
+share/emacs/site-lisp/w3-display.elc
+share/emacs/site-lisp/w3-print.elc
+share/emacs/site-lisp/w3-about.elc
+share/emacs/site-lisp/w3-hotindex.elc
+share/emacs/site-lisp/w3-hot.elc
+share/emacs/site-lisp/w3-e19.elc
+share/emacs/site-lisp/w3-xemac.elc
+share/emacs/site-lisp/w3.elc
+share/emacs/site-lisp/w3-script.elc
+share/emacs/site-lisp/w3-jscript.elc
+share/emacs/site-lisp/w3-elisp.elc
+share/emacs/site-lisp/w3-e20.elc
+share/emacs/site-lisp/w3-speak-table.elc
+share/emacs/site-lisp/w3-java.elc
+share/emacs/site-lisp/url-nfs.elc
+share/emacs/site-lisp/url-file.elc
+share/emacs/site-lisp/url-cookie.elc
+share/emacs/site-lisp/url-parse.elc
+share/emacs/site-lisp/url-irc.elc
+share/emacs/site-lisp/url-gopher.elc
+share/emacs/site-lisp/url-http.elc
+share/emacs/site-lisp/url-mail.elc
+share/emacs/site-lisp/url-misc.elc
+share/emacs/site-lisp/url-news.elc
+share/emacs/site-lisp/url-vars.elc
+share/emacs/site-lisp/url-auth.elc
+share/emacs/site-lisp/mm.elc
+share/emacs/site-lisp/md5.elc
+share/emacs/site-lisp/url-gw.elc
+share/emacs/site-lisp/ssl.elc
+share/emacs/site-lisp/base64.elc
+share/emacs/site-lisp/url.elc
+share/emacs/site-lisp/socks.elc
+share/emacs/site-lisp/url-cache.elc
+share/emacs/site-lisp/url-ns.elc
+share/emacs/site-lisp/url-ldap.elc
+share/emacs/site-lisp/auto-autoloads.elc
+share/emacs/site-lisp/custom-load.elc
+share/emacs/site-lisp/w3-auto.elc
+share/emacs/site-lisp/w3-cfg.elc
 share/examples/w3/dot.emacs
 share/examples/w3/dot.mosaic-hotlist-default
-share/emacs/site-lisp/w3/base64.el
-share/emacs/site-lisp/w3/base64.elc
-share/emacs/site-lisp/w3/font.el
-share/emacs/site-lisp/w3/font.elc
-share/emacs/site-lisp/w3/md5.el
-share/emacs/site-lisp/w3/md5.elc
-share/emacs/site-lisp/w3/mm.el
-share/emacs/site-lisp/w3/mm.elc
-share/emacs/site-lisp/w3/ssl.el
-share/emacs/site-lisp/w3/ssl.elc
-share/emacs/site-lisp/w3/url-hash.el
-share/emacs/site-lisp/w3/url-hash.elc
-share/emacs/site-lisp/w3/url.el
-share/emacs/site-lisp/w3/url.elc
-share/emacs/site-lisp/w3/urlauth.el
-share/emacs/site-lisp/w3/urlauth.elc
-share/emacs/site-lisp/w3/w3-about.el
-share/emacs/site-lisp/w3/w3-about.elc
-share/emacs/site-lisp/w3/w3-beta.el
-share/emacs/site-lisp/w3/w3-beta.elc
-share/emacs/site-lisp/w3/w3-draw.el
-share/emacs/site-lisp/w3/w3-draw.elc
-share/emacs/site-lisp/w3/w3-e19.el
-share/emacs/site-lisp/w3/w3-e19.elc
-share/emacs/site-lisp/w3/w3-emacs.el
-share/emacs/site-lisp/w3/w3-emacs.elc
-share/emacs/site-lisp/w3/w3-epoch.el
-share/emacs/site-lisp/w3/w3-epoch.elc
-share/emacs/site-lisp/w3/w3-hot.el
-share/emacs/site-lisp/w3/w3-hot.elc
-share/emacs/site-lisp/w3/w3-mac.el
-share/emacs/site-lisp/w3/w3-mac.elc
-share/emacs/site-lisp/w3/w3-mule.el
-share/emacs/site-lisp/w3/w3-mule.elc
-share/emacs/site-lisp/w3/w3-next.el
-share/emacs/site-lisp/w3/w3-next.elc
-share/emacs/site-lisp/w3/w3-parse.el
-share/emacs/site-lisp/w3/w3-parse.elc
-share/emacs/site-lisp/w3/w3-print.el
-share/emacs/site-lisp/w3/w3-print.elc
-share/emacs/site-lisp/w3/w3-srch.el
-share/emacs/site-lisp/w3/w3-srch.elc
-share/emacs/site-lisp/w3/w3-style.el
-share/emacs/site-lisp/w3/w3-style.elc
-share/emacs/site-lisp/w3/w3-sysdp.el
-share/emacs/site-lisp/w3/w3-sysdp.elc
-share/emacs/site-lisp/w3/w3-vars.el
-share/emacs/site-lisp/w3/w3-vars.elc
-share/emacs/site-lisp/w3/w3-wemac.el
-share/emacs/site-lisp/w3/w3-wemac.elc
-share/emacs/site-lisp/w3/w3-xemac.el
-share/emacs/site-lisp/w3/w3-xemac.elc
-share/emacs/site-lisp/w3/w3.el
-share/emacs/site-lisp/w3/w3.elc
-share/emacs/site-lisp/w3/xbm-button.el
-share/emacs/site-lisp/w3/xbm-button.elc
-share/emacs/site-lisp/w3/xpm-button.el
-share/emacs/site-lisp/w3/xpm-button.elc
-@dirrm share/emacs/site-lisp/w3
+share/examples/w3/user-install
+share/default.css
 @dirrm share/examples/w3
-@dirrm share/doc/w3
+@exec install-info %D/info/w3-faq.info %D/info/dir
+@exec install-info %D/info/w3.info %D/info/dir