Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Jun 1997 20:02:15 +0900 (JST)
From:      Kazuhiko Kiriyama(System administrator) <kiri@kiri.toba-cmt.ac.jp>
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/3793: Update port jp-w3-2.2.26 (japanese/w3).
Message-ID:  <199706051102.UAA17603@kiri.toba-cmt.ac.jp>
Resent-Message-ID: <199706051110.EAA08228@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         3793
>Category:       ports
>Synopsis:       Update port jp-w3-2.2.26 (japanese/w3).
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Class:          support
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun  5 04:10:05 PDT 1997
>Last-Modified:
>Originator:     Kazuhiko Kiriyama
>Organization:
Toba National College of Maritime Technology.
                 Department of Electronic Mechanical Engineering
>Release:        FreeBSD 2.2.2-RELEASE i386
>Environment:
>Description:

	I've updated the port jp-w3-2.2.26 (japanese/w3).

	Current modifications is

		(1) Change dir installation with install-info.
		(2) Slave to www/w3

	Delete and Update files are respecively

	[Delete] :
		files/		(Whole directory)
		files/dot.emacs
		files/dot.mosaic-hotlist-default
		files/md5
		files/user-install
		patches/	(Whole directory)
		patches/patch-aa
		pkg/DEINSTALL
		pkg/INSTALL

	[Update] :
		Makefile
		pkg/PLIST

	I put the diff from ports-current(japanese/w3) in "Fix:".

>How-To-Repeat:
>Fix:
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/japanese/w3/Makefile ./Makefile
--- ../../current/ports/japanese/w3/Makefile	Sun Feb 16 17:22:20 1997
+++ ./Makefile	Sat May 31 21:45:28 1997
@@ -6,36 +6,18 @@
 # $Id: Makefile,v 1.3 1997/02/15 07:42:32 max Exp $
 #
 
-DISTNAME=	w3-2.2.26
 PKGNAME=	jp-w3-2.2.26
 CATEGORIES=	www japanese
-MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/elisp/w3/ \
-		ftp://ftp.iij.ad.jp/pub/network/WWW/w3/
-
-MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
+FILESDIR=	${.CURDIR}/../../www/w3/files
+PATCHDIR=	${.CURDIR}/../../www/w3/patches
 
 # Don't RUN_DEPENDS on mule because we don't know which version the
 # user would want.  We can't omit the BUILD_DEPENDS because it needs
 # to byte-compile .el files.
 BUILD_DEPENDS=	mule:${PORTSDIR}/editors/mule
+RUN_DEPENDS=
 
-WRKSRC=		${WRKDIR}/w3
-
-DOCDIR=		${PREFIX}/share/doc/w3
-SAMPLEDIR=	${PREFIX}/share/examples/w3
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCDIR}
-	@${MKDIR} ${SAMPLEDIR}
-.for f in dot.emacs dot.mosaic-hotlist-default 
-	@${INSTALL_DATA} ${FILESDIR}/${f} ${SAMPLEDIR}
-.endfor
-	@${INSTALL_SCRIPT} ${FILESDIR}/user-install ${SAMPLEDIR}
-.for f in W3.ad clean-cache Makefile w3.txi
-	@${INSTALL_DATA} ${WRKSRC}/${f}  ${DOCDIR}
-.endfor
-.endif
-	@${SETENV} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+EMACSCMD=	mule
+ELISPDIR=	${PREFIX}/lib/mule/site-lisp
 
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../www/w3/Makefile"
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/japanese/w3/files/dot.emacs ./files/dot.emacs
--- ../../current/ports/japanese/w3/files/dot.emacs	Sat Jan  4 22:19:42 1997
+++ ./files/dot.emacs	Thu Jan  1 09:00:00 1970
@@ -1,8 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Emacs-w3 ;;;;
-;;        Emacs-w3(Ver.2.2.26)                                        ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(setq url-keep-history t)
-(setq url-be-asynchronous t)
-(setq w3-default-homepage 
-      "file://localhost/usr/share/doc/handbook/handbook.html")
-;;                                                       Emacs-w3 end
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/japanese/w3/files/dot.mosaic-hotlist-default ./files/dot.mosaic-hotlist-default
--- ../../current/ports/japanese/w3/files/dot.mosaic-hotlist-default	Sat Jan  4 22:19:42 1997
+++ ./files/dot.mosaic-hotlist-default	Thu Jan  1 09:00:00 1970
@@ -1,27 +0,0 @@
-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 -urN --exclude=CVS --exclude=*.orig ../../current/ports/japanese/w3/files/md5 ./files/md5
--- ../../current/ports/japanese/w3/files/md5	Sun Feb 16 17:22:20 1997
+++ ./files/md5	Thu Jan  1 09:00:00 1970
@@ -1 +0,0 @@
-MD5 (w3-2.2.26.tar.gz) = e12d158809b8084bd0dc3491610b0a43
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/japanese/w3/files/user-install ./files/user-install
--- ../../current/ports/japanese/w3/files/user-install	Sat Jan  4 22:19:42 1997
+++ ./files/user-install	Thu Jan  1 09:00:00 1970
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-PREFIX=/usr/local
-SAMPLEDIR=${PREFIX}/share/examples/w3
-
-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
-cat ${SAMPLEDIR}/dot.emacs >> ${HOME}/.emacs
diff -urN --exclude=CVS --exclude=*.orig ../../current/ports/japanese/w3/patches/patch-aa ./patches/patch-aa
--- ../../current/ports/japanese/w3/patches/patch-aa	Wed Dec 18 14:26:57 1996
+++ ./patches/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,47 +0,0 @@
---- Makefile.orig	Sun Oct 29 01:21:56 1995
-+++ Makefile	Sun Dec  1 00:08:26 1996
-@@ -1,5 +1,5 @@
- # what emacs is called on your system
--EMACS = emacs
-+EMACS = mule
- 
- # How to make a directory
- # need a -p if you want to make the parents!
-@@ -8,12 +8,13 @@
- # Various other stuff used
- RM    = rm -f
- CP    = cp
-+INSTALL_DATA =	/usr/bin/install -c -o bin -g bin -m 444
- 
- # where the Info file should go
--INFODIR = ../info
-+INFODIR = ${PREFIX}/info
- 
- # where the w3 lisp files should go
--LISPDIR = $$HOME/lisp
-+LISPDIR = ${PREFIX}/lib/mule/site-lisp/w3
- 
- # Change this to be where your .emacs file is stored
- DOTEMACS      = $$HOME/.emacs
-@@ -57,16 +58,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 -urN --exclude=CVS --exclude=*.orig ../../current/ports/japanese/w3/pkg/DEINSTALL ./pkg/DEINSTALL
--- ../../current/ports/japanese/w3/pkg/DEINSTALL	Sat Jan  4 22:07:21 1997
+++ ./pkg/DEINSTALL	Thu Jan  1 09:00:00 1970
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-infodir=${PKG_PREFIX}/info
-addir=/usr/X11R6/lib/X11/app-defaults
-elispdir=${PKG_PREFIX}/lib/mule/site-lisp
-
-OptionStart="Emacs-w3 configuration options"
-OptionEnd="End of Emacs-w3 configuration options"
-
-if [ "X$2" = X"DEINSTALL" ]; then
-	a=`grep "^\* w3:" ${infodir}/dir`
-	if  [ "${a}" ]; then 
-		echo "Deleting \"w3\" entry from ${infodir}/dir"
-		grep -v "^\* w3:" ${infodir}/dir> ${infodir}/dir.bak
-		mv ${infodir}/dir.bak ${infodir}/dir
-	fi
-	a=`grep "^;;; ${OptionStart}" ${elispdir}/site-start.el`
-	if  [ "${a}" ]; 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
-	a=`grep "^!!! ${OptionStart}"  ${addir}/Emacs`
-	if  [ "${a}" ]; 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 -urN --exclude=CVS --exclude=*.orig ../../current/ports/japanese/w3/pkg/INSTALL ./pkg/INSTALL
--- ../../current/ports/japanese/w3/pkg/INSTALL	Sat Jan  4 22:07:22 1997
+++ ./pkg/INSTALL	Thu Jan  1 09:00:00 1970
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-infodir=${PKG_PREFIX}/info
-addir=/usr/X11R6/lib/X11/app-defaults
-elispdir=${PKG_PREFIX}/lib/mule/site-lisp
-
-OptionStart="Emacs-w3 configuration options"
-OptionEnd="End of Emacs-w3 configuration options"
-
-if [ "X$2" = X"POST-INSTALL" ]; then
-	if [ ! -f ${infodir}/dir ]; then
-		cp ${FILESDIR}/dir ${infodir}
-	fi
-	grep -v "^\* w3:" ${infodir}/dir > ${infodir}/dir.bak
-	mv ${infodir}/dir.bak ${infodir}/dir
-	echo "Adding \"w3\" entry to ${infodir}/dir"
-	echo '* w3: (w3).             WWW browser.'	>> ${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 "		\"${PKG_PREFIX}/lib/mule/site-lisp/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 -urN --exclude=CVS --exclude=*.orig ../../current/ports/japanese/w3/pkg/PLIST ./pkg/PLIST
--- ../../current/ports/japanese/w3/pkg/PLIST	Sat Jan  4 22:07:22 1997
+++ ./pkg/PLIST	Sun May  4 14:06:06 1997
@@ -68,3 +68,6 @@
 share/examples/w3/dot.emacs
 share/examples/w3/dot.mosaic-hotlist-default
 share/examples/w3/user-install
+@dirrm lib/mule/site-lisp/w3
+@dirrm share/doc/w3
+@dirrm share/examples/w3
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199706051102.UAA17603>