Date: Tue, 22 Feb 2000 15:56:34 +0900 From: "Akinori -Aki- MUSHA" <knu@idaemons.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16902: japanese/esecanna-vje30: cosmetic changes plus Message-ID: <86k8jxybbx.wl@archon.local.idaemons.org>
next in thread | raw e-mail | index | archive | help
>Number: 16902
>Category: ports
>Synopsis: cosmetic changes plus
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 21 23:00:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: "Akinori -Aki- MUSHA" <knu@idaemons.org>
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Associated I. Daemons
>Environment:
FreeBSD archon.local.idaemons.org 4.0-CURRENT FreeBSD 4.0-CURRENT #29: Sat Feb 19 02:21:47 JST 2000 root@archon.local.idaemons.org:/usr/src/sys/compile/ARCHON i386
>Description:
In consideration of the upcoming japanese/esecanna-wnn6 port by
Honda-san, I'd better change my -vje30 port in a cosmetic sense.
This avoids future confliction of some file/directory names, etc.
>How-To-Repeat:
>Fix:
Apply the patch below.
Also, I'd mention that I renamed files/vjeesecannaserver.sh to
files/esecannaserver.sh for the convenience.
diff -ruN esecanna-vje30.orig/Makefile esecanna-vje30/Makefile
--- esecanna-vje30.orig/Makefile Tue Feb 22 00:44:51 2000
+++ esecanna-vje30/Makefile Tue Feb 22 15:30:36 2000
@@ -16,18 +16,30 @@
#RUN_DEPENDS= ${LOCALBASE}/vje30/bin/vjed:${PORTSDIR}/japanese/vje30-trial
-DOCDIR= ${PREFIX}/share/doc/esecanna
-
+DOCDIR= esecanna-vje30
+PROG= esecannaserver_vje30
+RCFILE= esecannarc_vje30
# Make sure of naming it proper so as to be invoked *after* vje.sh on startup
-STARTER= vjeesecannaserver.sh
+STARTER= vje_esecannaserver.sh
+
+PLIST_SUB= DOCDIR="${DOCDIR}" \
+ PROG="${PROG}" \
+ RCFILE="${RCFILE}" \
+ STARTER="${STARTER}"
post-extract:
- @perl -pe "s,!!PREFIX!!,${PREFIX},g" ${FILESDIR}/${STARTER} > ${WRKSRC}/${STARTER}
+ @perl -pe " \
+ s,!!PREFIX!!,${PREFIX},g; \
+ s,!!PROG!!,${PROG},g; \
+ s,!!RCFILE!!,${RCFILE},g; \
+ s,!!STARTER!!,${STARTER},g; \
+ " \
+ ${FILESDIR}/esecannaserver.sh > ${WRKSRC}/${STARTER}
do-configure:
@cd ${WRKSRC} && perl -i -pe " \
- s,/etc/esecannarc,${PREFIX}/etc/esecannarc,g; \
s,/etc/vje30,${PREFIX}/etc/vje30,g; \
+ s,/etc/esecannarc,${PREFIX}/etc/${RCFILE},g; \
s,/usr/lib/vje30,${PREFIX}/vje30,g; \
s,/usr/sbin/vjed,${PREFIX}/vje30/bin/vjed,g; \
" \
@@ -37,12 +49,12 @@
vjewrapper.c
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/esecannaserver ${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKSRC}/esecannarc ${PREFIX}/etc
+ ${INSTALL_PROGRAM} ${WRKSRC}/esecannaserver ${PREFIX}/sbin/${PROG}
+ ${INSTALL_DATA} ${WRKSRC}/esecannarc ${PREFIX}/etc/${RCFILE}
${INSTALL_SCRIPT} ${WRKSRC}/${STARTER} ${PREFIX}/etc/rc.d
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/4DEVELOPERS.jp ${WRKSRC}/README.jp ${DOCDIR}
+ ${MKDIR} ${PREFIX}/share/doc/${DOCDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} 4DEVELOPERS.jp README.jp ${PREFIX}/share/doc/${DOCDIR}
.endif
post-install:
diff -ruN esecanna-vje30.orig/files/esecannaserver.sh esecanna-vje30/files/esecannaserver.sh
--- esecanna-vje30.orig/files/esecannaserver.sh Thu Jan 1 09:00:00 1970
+++ esecanna-vje30/files/esecannaserver.sh Tue Feb 22 15:20:15 2000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if grep -qw 'FREE TRIAL VERSION' !!PREFIX!!/vje30/.version && [ X"$1" != X"-f" ]; then
+ echo ""
+ echo "esecanna:"
+ echo " Using VJE-Delta 3.0 trial, it is unable to connect to vjed on startup."
+ echo " Please execute \`!!PREFIX!!/etc/rc.d/!!STARTER!! -f' manually"
+ echo " after once you run vje."
+ exit
+fi
+
+esecannaserver="!!PREFIX!!/sbin/!!PROG!!"
+
+if [ -x $esecannaserver ]; then
+ rm -f /tmp/.iroha_unix/IROHA
+ echo -n ' esecanna'
+ $esecannaserver 2> /var/log/esecannaserver.log &
+fi
diff -ruN esecanna-vje30.orig/files/vjeesecannaserver.sh esecanna-vje30/files/vjeesecannaserver.sh
--- esecanna-vje30.orig/files/vjeesecannaserver.sh Thu Feb 3 18:57:56 2000
+++ esecanna-vje30/files/vjeesecannaserver.sh Thu Jan 1 09:00:00 1970
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if grep -qw 'FREE TRIAL VERSION' !!PREFIX!!/vje30/.version && [ X"$1" != X"-f" ]; then
- echo ""
- echo "esecanna:"
- echo " Using VJE-Delta 3.0 trial, it is unable to connect to vjed on startup."
- echo " Please execute \`!!PREFIX!!/etc/rc.d/vjeesecannaserver.sh -f' manually"
- echo " after once you run vje."
- exit
-fi
-
-if [ -x !!PREFIX!!/sbin/esecannaserver ]; then
- rm -f /tmp/.iroha_unix/IROHA
- echo -n ' esecanna'
- !!PREFIX!!/sbin/esecannaserver 2> /var/log/esecannaserver.log &
-fi
diff -ruN esecanna-vje30.orig/pkg/COMMENT esecanna-vje30/pkg/COMMENT
--- esecanna-vje30.orig/pkg/COMMENT Thu Feb 3 02:08:34 2000
+++ esecanna-vje30/pkg/COMMENT Tue Feb 22 14:42:38 2000
@@ -1 +1 @@
-Pseudo cannaserver which wraps VJE-delta server
+Pseudo cannaserver which wraps VJE-Delta 3.0 server
diff -ruN esecanna-vje30.orig/pkg/DESCR esecanna-vje30/pkg/DESCR
--- esecanna-vje30.orig/pkg/DESCR Thu Feb 3 02:08:34 2000
+++ esecanna-vje30/pkg/DESCR Tue Feb 22 14:43:50 2000
@@ -1,22 +1,22 @@
-Esecanna-vje listens to canna clients as cannaserver,
-interprets to the VJE-Delta server what they say, and
-passes what it results to them.
+Esecanna-vje30 listens to canna clients as cannaserver,
+interprets to the VJE-Delta 3.0 server what they say,
+and passes what it results to them.
-With this, you can use VJE-Delta's smart input engine
+With this, you can use VJE-Delta 3.0's smart input engine
also from the console applications.
[ Canna clients ] (mule, jvim, etc.)
|| /\
\/ ||
- [ esecanna-vje ] (esecannaserver)
+ [ esecanna-vje30 ] (esecannaserver_vje30)
|| /\
\/ ||
[ VJE-Delta server ] (vjed)
-Before running esecannaserver, don't forget to stop
+Before running esecannaserver_vje30, don't forget to stop
the "real" cannaserver, if running.
-Further documentation is under /usr/local/share/doc/esecanna,
+Further documentation is under /usr/local/share/doc/esecanna-vje30/
and the following web site:
WWW: http://plaza.harmonix.ne.jp/~redstar/esecanna.html
diff -ruN esecanna-vje30.orig/pkg/MESSAGE esecanna-vje30/pkg/MESSAGE
--- esecanna-vje30.orig/pkg/MESSAGE Mon Feb 21 13:48:43 2000
+++ esecanna-vje30/pkg/MESSAGE Tue Feb 22 14:44:45 2000
@@ -2,10 +2,10 @@
NOTE THAT THIS VERSION IS A VERY DEVELOPMENT RELEASE.
First of all, never forget to read the documents located in
-/usr/local/share/doc/esecanna carefully. When and if you
-meet with any problem or strange behavior, please refer to
-the debug log stored in /var/log/esecannaserver.log or
-output to stderr if run by hand, and report it immediately
+/usr/local/share/doc/esecanna-vje30 carefully. When and if
+you meet with any problem or strange behavior, please refer
+to the debug log stored in /var/log/esecannaserver_vje30.log
+or output to stderr if run by hand, and report it immediately
to the author of esecanna, or the maintainer of the port.
Thank you for understanding.
@@ -14,7 +14,7 @@
* connect to vjed before once you run vje.
Quick Setup:
- Run /usr/local/etc/rc.d/vjeesecannaserver.sh as root.
+ Run /usr/local/etc/rc.d/vje_esecannaserver.sh as root.
Each user may want to configure the behavior by editing
- `~/.esecannarc', copied after `/usr/local/etc/esecannarc'.
+ `~/.esecannarc', copied after `/usr/local/etc/esecannarc_vje30'.
************************************************************
diff -ruN esecanna-vje30.orig/pkg/PLIST esecanna-vje30/pkg/PLIST
--- esecanna-vje30.orig/pkg/PLIST Thu Feb 3 02:08:34 2000
+++ esecanna-vje30/pkg/PLIST Tue Feb 22 15:22:48 2000
@@ -1,5 +1,6 @@
-sbin/esecannaserver
-share/doc/esecanna/4DEVELOPERS.jp
-share/doc/esecanna/README.jp
-etc/rc.d/vjeesecannaserver.sh
-@dirrm share/doc/esecanna
+sbin/%%PROG%%
+etc/%%RCFILE%%
+share/doc/%%DOCDIR%%/4DEVELOPERS.jp
+share/doc/%%DOCDIR%%/README.jp
+etc/rc.d/%%STARTER%%
+@dirrm share/doc/%%DOCDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86k8jxybbx.wl>