change the installed path from /usr/local/lib/mule/site-lisp to

/usr/local/share/mule/site-lisp

PR:            ports/10276
Submitted by:  MIHIRA Yoshiro <sanpei@sanpei.org>

14 files changed, 88 insertions, 52 deletions

diff --git a/japanese/diclookup-emacs20/Makefile b/japanese/diclookup-emacs20/Makefile
index c1bf2e92fe80..ca294cc22488 100644
--- a/japanese/diclookup-emacs20/Makefile
+++ b/japanese/diclookup-emacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Jan 1998
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.4 1998/10/20 12:41:01 asami Exp $
+# $Id: Makefile,v 1.5 1998/11/15 12:21:55 kuriyama Exp $
 #
 
 DISTNAME=	diclookup-mule-2.3.3
@@ -16,8 +16,6 @@ PATCHFILES=	diclookup-mule-2.3.3-wave-patch.gz
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-BROKEN=		tries to install in /usr/local/lib/mule/site-lisp
-
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/non-cjk/fonts.dir:${PORTSDIR}/x11-fonts/etlfonts
 BUILD_DEPENDS=	mule:${PORTSDIR}/japanese/mule-wnn4
 
diff --git a/japanese/diclookup-emacs20/files/README.diclookup-setup.txt b/japanese/diclookup-emacs20/files/README.diclookup-setup.txt
index f1c653b36723..4fab25a09caf 100644
--- a/japanese/diclookup-emacs20/files/README.diclookup-setup.txt
+++ b/japanese/diclookup-emacs20/files/README.diclookup-setup.txt
@@ -29,14 +29,14 @@ One of mule (ja-*mule-2.3 or mule-2.3) is necessary for this program.
      |                                                                   |
      | You have to install appropreate startup code for diclookup-mule.  |
      | This setup script automatically it to:                            |
-     | /usr/local/lib/mule/site-lisp/site-start.el.                      |
+     | /usr/local/share/mule/19.34/site-lisp/site-start.el.              |
      |                                                                   |
      | Are you sure?                                                     |
      |-------------------------------------------------------------------|
      |                       [ Yes ]         No                          |
      |-------------------------------------------------------------------|
 	By answering [ Yes ], startup code is automatically added to
-	/usr/local/lib/mule/site-lisp/site-start.el
+	/usr/local/share/mule/19.34/site-lisp/site-start.el
 	(Deinstallation is possible by deinstall-diclookup.sh)
 
 2. Usage.
@@ -81,7 +81,7 @@ diclookup-mule は, mule の上で, 電子辞書を引けるようにするための
     
 I. 起動の準備.
 
-    ~/.emacs もしくは ${PREFIX}/lib/mule/site-lisp/site-start.el などの,
+    ~/.emacs もしくは ${PREFIX}/share/mule/19.34/site-lisp/site-start.el などの,
     初期設定ファイルに, diclookup-mule 起動のためのエントリを追加します.
     [${PREFIX}/lib/dserver/setup-diclookup.sh] を起動すると, 自動的に
    設定をsite-start.el に追加してくれます．
@@ -95,7 +95,7 @@ II. site-start.el の再編集.
 
    setup-diclookup.sh を起動すれば, 自動的に設定を追加してくれるのですが,
    一点だけ修正するところがあります.
-   ${PREFIX}/lib/mule/site-lisp/site-start.el の次の行です.
+   ${PREFIX}/share/mule/19.34/site-lisp/site-start.el の次の行です.
 
 --------
 (setq od-dictfile-list '("od-chujiten" "od-kojien" "od-readers" "od-crown")) ; diclookup-mule
diff --git a/japanese/diclookup-emacs20/files/deinstall-diclookup.sh b/japanese/diclookup-emacs20/files/deinstall-diclookup.sh
index add03bf16586..2735c2b69593 100644
--- a/japanese/diclookup-emacs20/files/deinstall-diclookup.sh
+++ b/japanese/diclookup-emacs20/files/deinstall-diclookup.sh
@@ -6,8 +6,8 @@ Are you sure?" -1 -1
 RETVAL=$?
 
 if [ "X${RETVAL}" = "X0" ] ; then # answer is `Yes'. hack diclookup-mule.
-cp PREFIX_DIR/lib/mule/site-lisp/site-start.el PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak
-grep -v diclookup-mule PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak > PREFIX_DIR/lib/mule/site-lisp/site-start.el
+cp PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el.bak
+grep -v diclookup-mule PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el.bak > PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el
 
 /usr/bin/dialog --title "Message" --clear \
 	--msgbox "Thank you for using diclookup-mule.  A bientot." -1 -1
diff --git a/japanese/diclookup-emacs20/files/patch-ab b/japanese/diclookup-emacs20/files/patch-ab
new file mode 100644
index 000000000000..1a2b8872de03
--- /dev/null
+++ b/japanese/diclookup-emacs20/files/patch-ab
@@ -0,0 +1,10 @@
+--- Makefile.org	Sat Feb 20 20:14:36 1999
++++ Makefile	Sat Feb 20 20:14:44 1999
+@@ -1,6 +1,6 @@
+ EMACS = mule
+ 
+-LISPDIR = /usr/local/lib/mule/site-lisp
++LISPDIR = /usr/local/share/mule/19.34/site-lisp
+ 
+ RM = rm -f
+ 
diff --git a/japanese/diclookup-emacs20/files/patch-ac b/japanese/diclookup-emacs20/files/patch-ac
new file mode 100644
index 000000000000..670545580f5e
--- /dev/null
+++ b/japanese/diclookup-emacs20/files/patch-ac
@@ -0,0 +1,10 @@
+--- lib/Makefile.org	Sat Feb 20 20:15:09 1999
++++ lib/Makefile	Sat Feb 20 20:15:15 1999
+@@ -1,6 +1,6 @@
+ EMACS = mule
+ 
+-LISPDIR = /usr/local/lib/mule/site-lisp
++LISPDIR = /usr/local/share/mule/19.34/site-lisp
+ 
+ RM = rm -f
+ 
diff --git a/japanese/diclookup-emacs20/files/setup-diclookup.sh b/japanese/diclookup-emacs20/files/setup-diclookup.sh
index e0d033b901d6..ecde9f684544 100644
--- a/japanese/diclookup-emacs20/files/setup-diclookup.sh
+++ b/japanese/diclookup-emacs20/files/setup-diclookup.sh
@@ -3,14 +3,14 @@
 	--yesno "\n\
 You have to install appropreate startup code for diclookup-mule. \n\
 This setup script automatically it to: \n\
-PREFIX_DIR/lib/mule/site-lisp/site-start.el. \n\n\
+PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el. \n\n\
 Are you sure?" -1 -1
 RETVAL=$?
 # RETVAL=0 for yes, 1 for no, 255 for ESC.
 
 if [ "X${RETVAL}" = "X0" ] ; then # answer is `Yes'. hack diclookup-mule.
 
-# Hack PREFIX_DIR/lib/mule/site-lisp/site-start.el
+# Hack PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el
 rm -f /tmp/hack-site-start.el
 echo "(defun hack-site-start ()" >> /tmp/hack-site-start.el
 echo "  (interactive)" >> /tmp/hack-site-start.el
@@ -47,12 +47,12 @@ echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
 echo "      (write-file fname))))" >> /tmp/hack-site-start.el
 
 mule -batch -q -l /tmp/hack-site-start.el -f hack-site-start \
-		PREFIX_DIR/lib/mule/site-lisp/site-start.el ;
+		PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el ;
 rm -f /tmp/hack-site-start.el
 
 /usr/bin/dialog --title "ja-diclookup setup" --clear \
 	--msgbox "\n\
-original file is saved in PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak" -1 -1
+original file is saved in PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el.bak" -1 -1
 
 else
 /usr/bin/dialog --title "ja-diclookup setup" --clear \
diff --git a/japanese/diclookup-emacs20/pkg-plist b/japanese/diclookup-emacs20/pkg-plist
index 67a470c9a180..b0180e7180e1 100644
--- a/japanese/diclookup-emacs20/pkg-plist
+++ b/japanese/diclookup-emacs20/pkg-plist
@@ -4,16 +4,16 @@ lib/dserver/doc/README.sirup
 lib/dserver/doc/README.diclookup-mule.lib
 lib/dserver/setup-diclookup.sh
 lib/dserver/deinstall-diclookup.sh
-lib/mule/site-lisp/od-eiwa.elc
-lib/mule/site-lisp/od-oxford.elc
-lib/mule/site-lisp/od-italian.elc
-lib/mule/site-lisp/od-crown.elc
-lib/mule/site-lisp/od-kojien.elc
-lib/mule/site-lisp/od-chujiten64-epw.elc
-lib/mule/site-lisp/od-chujiten64.elc
-lib/mule/site-lisp/od-chujiten.elc
-lib/mule/site-lisp/od-readers.elc
-lib/mule/site-lisp/diclookup-mule.elc
-lib/mule/site-lisp/sirup-doc.elc
-lib/mule/site-lisp/sirup.elc
-lib/mule/site-lisp/ndtp.elc
+share/mule/19.34/site-lisp/od-eiwa.elc
+share/mule/19.34/site-lisp/od-oxford.elc
+share/mule/19.34/site-lisp/od-italian.elc
+share/mule/19.34/site-lisp/od-crown.elc
+share/mule/19.34/site-lisp/od-kojien.elc
+share/mule/19.34/site-lisp/od-chujiten64-epw.elc
+share/mule/19.34/site-lisp/od-chujiten64.elc
+share/mule/19.34/site-lisp/od-chujiten.elc
+share/mule/19.34/site-lisp/od-readers.elc
+share/mule/19.34/site-lisp/diclookup-mule.elc
+share/mule/19.34/site-lisp/sirup-doc.elc
+share/mule/19.34/site-lisp/sirup.elc
+share/mule/19.34/site-lisp/ndtp.elc
diff --git a/japanese/diclookup-mule/Makefile b/japanese/diclookup-mule/Makefile
index c1bf2e92fe80..ca294cc22488 100644
--- a/japanese/diclookup-mule/Makefile
+++ b/japanese/diclookup-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Jan 1998
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.4 1998/10/20 12:41:01 asami Exp $
+# $Id: Makefile,v 1.5 1998/11/15 12:21:55 kuriyama Exp $
 #
 
 DISTNAME=	diclookup-mule-2.3.3
@@ -16,8 +16,6 @@ PATCHFILES=	diclookup-mule-2.3.3-wave-patch.gz
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-BROKEN=		tries to install in /usr/local/lib/mule/site-lisp
-
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/non-cjk/fonts.dir:${PORTSDIR}/x11-fonts/etlfonts
 BUILD_DEPENDS=	mule:${PORTSDIR}/japanese/mule-wnn4
 
diff --git a/japanese/diclookup-mule/files/README.diclookup-setup.txt b/japanese/diclookup-mule/files/README.diclookup-setup.txt
index f1c653b36723..4fab25a09caf 100644
--- a/japanese/diclookup-mule/files/README.diclookup-setup.txt
+++ b/japanese/diclookup-mule/files/README.diclookup-setup.txt
@@ -29,14 +29,14 @@ One of mule (ja-*mule-2.3 or mule-2.3) is necessary for this program.
      |                                                                   |
      | You have to install appropreate startup code for diclookup-mule.  |
      | This setup script automatically it to:                            |
-     | /usr/local/lib/mule/site-lisp/site-start.el.                      |
+     | /usr/local/share/mule/19.34/site-lisp/site-start.el.              |
      |                                                                   |
      | Are you sure?                                                     |
      |-------------------------------------------------------------------|
      |                       [ Yes ]         No                          |
      |-------------------------------------------------------------------|
 	By answering [ Yes ], startup code is automatically added to
-	/usr/local/lib/mule/site-lisp/site-start.el
+	/usr/local/share/mule/19.34/site-lisp/site-start.el
 	(Deinstallation is possible by deinstall-diclookup.sh)
 
 2. Usage.
@@ -81,7 +81,7 @@ diclookup-mule は, mule の上で, 電子辞書を引けるようにするための
     
 I. 起動の準備.
 
-    ~/.emacs もしくは ${PREFIX}/lib/mule/site-lisp/site-start.el などの,
+    ~/.emacs もしくは ${PREFIX}/share/mule/19.34/site-lisp/site-start.el などの,
     初期設定ファイルに, diclookup-mule 起動のためのエントリを追加します.
     [${PREFIX}/lib/dserver/setup-diclookup.sh] を起動すると, 自動的に
    設定をsite-start.el に追加してくれます．
@@ -95,7 +95,7 @@ II. site-start.el の再編集.
 
    setup-diclookup.sh を起動すれば, 自動的に設定を追加してくれるのですが,
    一点だけ修正するところがあります.
-   ${PREFIX}/lib/mule/site-lisp/site-start.el の次の行です.
+   ${PREFIX}/share/mule/19.34/site-lisp/site-start.el の次の行です.
 
 --------
 (setq od-dictfile-list '("od-chujiten" "od-kojien" "od-readers" "od-crown")) ; diclookup-mule
diff --git a/japanese/diclookup-mule/files/deinstall-diclookup.sh b/japanese/diclookup-mule/files/deinstall-diclookup.sh
index add03bf16586..2735c2b69593 100644
--- a/japanese/diclookup-mule/files/deinstall-diclookup.sh
+++ b/japanese/diclookup-mule/files/deinstall-diclookup.sh
@@ -6,8 +6,8 @@ Are you sure?" -1 -1
 RETVAL=$?
 
 if [ "X${RETVAL}" = "X0" ] ; then # answer is `Yes'. hack diclookup-mule.
-cp PREFIX_DIR/lib/mule/site-lisp/site-start.el PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak
-grep -v diclookup-mule PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak > PREFIX_DIR/lib/mule/site-lisp/site-start.el
+cp PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el.bak
+grep -v diclookup-mule PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el.bak > PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el
 
 /usr/bin/dialog --title "Message" --clear \
 	--msgbox "Thank you for using diclookup-mule.  A bientot." -1 -1
diff --git a/japanese/diclookup-mule/files/patch-ab b/japanese/diclookup-mule/files/patch-ab
new file mode 100644
index 000000000000..1a2b8872de03
--- /dev/null
+++ b/japanese/diclookup-mule/files/patch-ab
@@ -0,0 +1,10 @@
+--- Makefile.org	Sat Feb 20 20:14:36 1999
++++ Makefile	Sat Feb 20 20:14:44 1999
+@@ -1,6 +1,6 @@
+ EMACS = mule
+ 
+-LISPDIR = /usr/local/lib/mule/site-lisp
++LISPDIR = /usr/local/share/mule/19.34/site-lisp
+ 
+ RM = rm -f
+ 
diff --git a/japanese/diclookup-mule/files/patch-ac b/japanese/diclookup-mule/files/patch-ac
new file mode 100644
index 000000000000..670545580f5e
--- /dev/null
+++ b/japanese/diclookup-mule/files/patch-ac
@@ -0,0 +1,10 @@
+--- lib/Makefile.org	Sat Feb 20 20:15:09 1999
++++ lib/Makefile	Sat Feb 20 20:15:15 1999
+@@ -1,6 +1,6 @@
+ EMACS = mule
+ 
+-LISPDIR = /usr/local/lib/mule/site-lisp
++LISPDIR = /usr/local/share/mule/19.34/site-lisp
+ 
+ RM = rm -f
+ 
diff --git a/japanese/diclookup-mule/files/setup-diclookup.sh b/japanese/diclookup-mule/files/setup-diclookup.sh
index e0d033b901d6..ecde9f684544 100644
--- a/japanese/diclookup-mule/files/setup-diclookup.sh
+++ b/japanese/diclookup-mule/files/setup-diclookup.sh
@@ -3,14 +3,14 @@
 	--yesno "\n\
 You have to install appropreate startup code for diclookup-mule. \n\
 This setup script automatically it to: \n\
-PREFIX_DIR/lib/mule/site-lisp/site-start.el. \n\n\
+PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el. \n\n\
 Are you sure?" -1 -1
 RETVAL=$?
 # RETVAL=0 for yes, 1 for no, 255 for ESC.
 
 if [ "X${RETVAL}" = "X0" ] ; then # answer is `Yes'. hack diclookup-mule.
 
-# Hack PREFIX_DIR/lib/mule/site-lisp/site-start.el
+# Hack PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el
 rm -f /tmp/hack-site-start.el
 echo "(defun hack-site-start ()" >> /tmp/hack-site-start.el
 echo "  (interactive)" >> /tmp/hack-site-start.el
@@ -47,12 +47,12 @@ echo "      (insert \"; diclookup-mule\n\")" >> /tmp/hack-site-start.el
 echo "      (write-file fname))))" >> /tmp/hack-site-start.el
 
 mule -batch -q -l /tmp/hack-site-start.el -f hack-site-start \
-		PREFIX_DIR/lib/mule/site-lisp/site-start.el ;
+		PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el ;
 rm -f /tmp/hack-site-start.el
 
 /usr/bin/dialog --title "ja-diclookup setup" --clear \
 	--msgbox "\n\
-original file is saved in PREFIX_DIR/lib/mule/site-lisp/site-start.el.bak" -1 -1
+original file is saved in PREFIX_DIR/share/mule/19.34/site-lisp/site-start.el.bak" -1 -1
 
 else
 /usr/bin/dialog --title "ja-diclookup setup" --clear \
diff --git a/japanese/diclookup-mule/pkg-plist b/japanese/diclookup-mule/pkg-plist
index 67a470c9a180..b0180e7180e1 100644
--- a/japanese/diclookup-mule/pkg-plist
+++ b/japanese/diclookup-mule/pkg-plist
@@ -4,16 +4,16 @@ lib/dserver/doc/README.sirup
 lib/dserver/doc/README.diclookup-mule.lib
 lib/dserver/setup-diclookup.sh
 lib/dserver/deinstall-diclookup.sh
-lib/mule/site-lisp/od-eiwa.elc
-lib/mule/site-lisp/od-oxford.elc
-lib/mule/site-lisp/od-italian.elc
-lib/mule/site-lisp/od-crown.elc
-lib/mule/site-lisp/od-kojien.elc
-lib/mule/site-lisp/od-chujiten64-epw.elc
-lib/mule/site-lisp/od-chujiten64.elc
-lib/mule/site-lisp/od-chujiten.elc
-lib/mule/site-lisp/od-readers.elc
-lib/mule/site-lisp/diclookup-mule.elc
-lib/mule/site-lisp/sirup-doc.elc
-lib/mule/site-lisp/sirup.elc
-lib/mule/site-lisp/ndtp.elc
+share/mule/19.34/site-lisp/od-eiwa.elc
+share/mule/19.34/site-lisp/od-oxford.elc
+share/mule/19.34/site-lisp/od-italian.elc
+share/mule/19.34/site-lisp/od-crown.elc
+share/mule/19.34/site-lisp/od-kojien.elc
+share/mule/19.34/site-lisp/od-chujiten64-epw.elc
+share/mule/19.34/site-lisp/od-chujiten64.elc
+share/mule/19.34/site-lisp/od-chujiten.elc
+share/mule/19.34/site-lisp/od-readers.elc
+share/mule/19.34/site-lisp/diclookup-mule.elc
+share/mule/19.34/site-lisp/sirup-doc.elc
+share/mule/19.34/site-lisp/sirup.elc
+share/mule/19.34/site-lisp/ndtp.elc