Rename files/.{emacs,mosaic-hotlist-default} to

dot.{emacs,mosaic-hotlist-default}.
  Install sample files into share/examples/w3 instead of to share/doc/w3.
  Use PKG_PREFIX in the installation/deinstallation scripts.
  Some Makefile cleanup.
  Submitted by: (Kiriyama Kazuhiko) <kiri@kiri.toba-cmt.ac.jp>

8 files changed, 88 insertions, 30 deletions

diff --git a/www/w3-4/Makefile b/www/w3-4/Makefile
index a303be9cc242..974cea267372 100644
--- a/www/w3-4/Makefile
+++ b/www/w3-4/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for: w3 on Emacs
 # Version required:	2.2.26	
-# Date created:		30 November 1996
+# Date created:		31 December 1996
 # Whom:			MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/12/18 05:26:32 asami Exp $
 #
 
 DISTNAME=	w3-2.2.26
@@ -19,18 +19,20 @@ RUN_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
 WRKSRC=		${WRKDIR}/w3
 
 DOCDIR=		${PREFIX}/share/doc/w3
+SAMPLEDIR=	${PREFIX}/share/examples/w3
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@if [ ! -d ${DOCDIR} ]; then mkdir -p ${DOCDIR}; fi
-.for f in .emacs .mosaic-hotlist-default 
-	@${CP} ${FILESDIR}/${f} ${DOCDIR}
+	@${MKDIR} ${DOCDIR}
+	@${MKDIR} ${SAMPLEDIR}
+.for f in dot.emacs dot.mosaic-hotlist-default 
+	@${INSTALL_DATA} ${FILESDIR}/${f} ${SAMPLEDIR}
 .endfor
-	@${INSTALL_SCRIPT} ${FILESDIR}/user-install ${DOCDIR}
+	@${INSTALL_SCRIPT} ${FILESDIR}/user-install ${SAMPLEDIR}
 .for f in W3.ad clean-cache Makefile w3.txi
-	@${CP} ${WRKSRC}/${f}  ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${f}  ${DOCDIR}
 .endfor
 .endif
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/www/w3-4/files/dot.mosaic-hotlist-default b/www/w3-4/files/dot.mosaic-hotlist-default
new file mode 100644
index 000000000000..3384e691f42e
--- /dev/null
+++ b/www/w3-4/files/dot.mosaic-hotlist-default
@@ -0,0 +1,27 @@
+ncsa-xmosaic-hotlist-format-1
+Default
+
+ftp://localhost/usr/share/doc/handbook/handbook.html Fri Jun 28 00:22:54 1996
+FreeBSD Handbook
+http://www.sra.co.jp/public/doc/bsd/ Fri Jun 28 00:54:37 1996
+index to BSD UNIX information (in Japanese)
+http://www.ee.t.u-tokyo.ac.jp/%7Emita/FreeBSD/FreeBSD.html Fri Jun 28 00:57:49 1996
+Easy Way to Setup FreeBSD
+http://zephyr.elcom.nitech.ac.jp/%7Eyuki/FreeBSD/search.html Fri Jun 28 01:03:03 1996
+FreeBSD Search
+http://www.cs.orst.edu/%7Etakikawm/fj/ Fri Jun 28 21:23:27 1996
+fj Home Page
+http://www.fujitsu.co.jp/hypertext/NetNews/fj.net.infosystems.www.html Fri Jun 28 21:39:08 1996
+Search of /public/wais/fj.net.infosystems.www
+http://www.lycos.com/ Fri Jun 28 22:00:17 1996
+Lycos, Inc. Home Page
+http://altavista.digital.com/ Fri Jun 28 22:01:14 1996
+AltaVista: Main Page
+http://www. Overview.html Fri Jun 28 22:02:41 1996
+The World-Wide Web Virtual Library: Subject Catalogue
+http://www.cs.orst.edu/%7Etakikawm/fj/retrieval.html Fri Jun 28 22:08:52 1996
+fj Article Retrieval
+http://www.yahoo.co.jp/ Sat Jun 29 18:02:35 1996
+Yahoo! JAPAN
+http://www.cs.indiana.edu/elisp/ docs.html Mon Jul  1 14:05:51 1996
+The Emacs World Wide Web Browser
diff --git a/www/w3-4/pkg-descr b/www/w3-4/pkg-descr
index 98848a562c48..82f149270d5e 100644
--- a/www/w3-4/pkg-descr
+++ b/www/w3-4/pkg-descr
@@ -12,11 +12,11 @@ You may be happy by adding following lines to your .emacs file:
 	(setq w3-default-homepage
 		"file://localhost/usr/share/doc/handbook/handbook.html")
 
-and copying .mosaic-hotlist-default file from /usr/local/share/doc/w3
+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/doc/mew/user-install on your home directory. 
+/usr/local/share/examples/mew/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'.
diff --git a/www/w3-4/pkg-plist b/www/w3-4/pkg-plist
index a456f9923b40..260007213564 100644
--- a/www/w3-4/pkg-plist
+++ b/www/w3-4/pkg-plist
@@ -3,13 +3,13 @@ info/w3.info-1
 info/w3.info-2
 info/w3.info-3
 info/w3.info-4
-share/doc/w3/.emacs
-share/doc/w3/.mosaic-hotlist-default
-share/doc/w3/Makefile
-share/doc/w3/W3.ad
 share/doc/w3/clean-cache
-share/doc/w3/user-install
 share/doc/w3/w3.txi
+share/doc/w3/Makefile
+share/doc/w3/W3.ad
+share/examples/w3/user-install
+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
diff --git a/www/w3/Makefile b/www/w3/Makefile
index a303be9cc242..974cea267372 100644
--- a/www/w3/Makefile
+++ b/www/w3/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for: w3 on Emacs
 # Version required:	2.2.26	
-# Date created:		30 November 1996
+# Date created:		31 December 1996
 # Whom:			MITA Yoshio <mita@ee.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/12/18 05:26:32 asami Exp $
 #
 
 DISTNAME=	w3-2.2.26
@@ -19,18 +19,20 @@ RUN_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
 WRKSRC=		${WRKDIR}/w3
 
 DOCDIR=		${PREFIX}/share/doc/w3
+SAMPLEDIR=	${PREFIX}/share/examples/w3
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@if [ ! -d ${DOCDIR} ]; then mkdir -p ${DOCDIR}; fi
-.for f in .emacs .mosaic-hotlist-default 
-	@${CP} ${FILESDIR}/${f} ${DOCDIR}
+	@${MKDIR} ${DOCDIR}
+	@${MKDIR} ${SAMPLEDIR}
+.for f in dot.emacs dot.mosaic-hotlist-default 
+	@${INSTALL_DATA} ${FILESDIR}/${f} ${SAMPLEDIR}
 .endfor
-	@${INSTALL_SCRIPT} ${FILESDIR}/user-install ${DOCDIR}
+	@${INSTALL_SCRIPT} ${FILESDIR}/user-install ${SAMPLEDIR}
 .for f in W3.ad clean-cache Makefile w3.txi
-	@${CP} ${WRKSRC}/${f}  ${DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${f}  ${DOCDIR}
 .endfor
 .endif
-	@/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/www/w3/files/dot.mosaic-hotlist-default b/www/w3/files/dot.mosaic-hotlist-default
new file mode 100644
index 000000000000..3384e691f42e
--- /dev/null
+++ b/www/w3/files/dot.mosaic-hotlist-default
@@ -0,0 +1,27 @@
+ncsa-xmosaic-hotlist-format-1
+Default
+
+ftp://localhost/usr/share/doc/handbook/handbook.html Fri Jun 28 00:22:54 1996
+FreeBSD Handbook
+http://www.sra.co.jp/public/doc/bsd/ Fri Jun 28 00:54:37 1996
+index to BSD UNIX information (in Japanese)
+http://www.ee.t.u-tokyo.ac.jp/%7Emita/FreeBSD/FreeBSD.html Fri Jun 28 00:57:49 1996
+Easy Way to Setup FreeBSD
+http://zephyr.elcom.nitech.ac.jp/%7Eyuki/FreeBSD/search.html Fri Jun 28 01:03:03 1996
+FreeBSD Search
+http://www.cs.orst.edu/%7Etakikawm/fj/ Fri Jun 28 21:23:27 1996
+fj Home Page
+http://www.fujitsu.co.jp/hypertext/NetNews/fj.net.infosystems.www.html Fri Jun 28 21:39:08 1996
+Search of /public/wais/fj.net.infosystems.www
+http://www.lycos.com/ Fri Jun 28 22:00:17 1996
+Lycos, Inc. Home Page
+http://altavista.digital.com/ Fri Jun 28 22:01:14 1996
+AltaVista: Main Page
+http://www. Overview.html Fri Jun 28 22:02:41 1996
+The World-Wide Web Virtual Library: Subject Catalogue
+http://www.cs.orst.edu/%7Etakikawm/fj/retrieval.html Fri Jun 28 22:08:52 1996
+fj Article Retrieval
+http://www.yahoo.co.jp/ Sat Jun 29 18:02:35 1996
+Yahoo! JAPAN
+http://www.cs.indiana.edu/elisp/ docs.html Mon Jul  1 14:05:51 1996
+The Emacs World Wide Web Browser
diff --git a/www/w3/pkg-descr b/www/w3/pkg-descr
index 98848a562c48..82f149270d5e 100644
--- a/www/w3/pkg-descr
+++ b/www/w3/pkg-descr
@@ -12,11 +12,11 @@ You may be happy by adding following lines to your .emacs file:
 	(setq w3-default-homepage
 		"file://localhost/usr/share/doc/handbook/handbook.html")
 
-and copying .mosaic-hotlist-default file from /usr/local/share/doc/w3
+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/doc/mew/user-install on your home directory. 
+/usr/local/share/examples/mew/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'.
diff --git a/www/w3/pkg-plist b/www/w3/pkg-plist
index a456f9923b40..260007213564 100644
--- a/www/w3/pkg-plist
+++ b/www/w3/pkg-plist
@@ -3,13 +3,13 @@ info/w3.info-1
 info/w3.info-2
 info/w3.info-3
 info/w3.info-4
-share/doc/w3/.emacs
-share/doc/w3/.mosaic-hotlist-default
-share/doc/w3/Makefile
-share/doc/w3/W3.ad
 share/doc/w3/clean-cache
-share/doc/w3/user-install
 share/doc/w3/w3.txi
+share/doc/w3/Makefile
+share/doc/w3/W3.ad
+share/examples/w3/user-install
+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