summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasafumi Max NAKANE <max@FreeBSD.org>2002-05-16 07:49:43 +0000
committerMasafumi Max NAKANE <max@FreeBSD.org>2002-05-16 07:49:43 +0000
commit60db3026133753bec531207af02423f7861146f7 (patch)
tree51777e55abfe3a566e8fe18224e07bc74304fe85
parentUpgrade to version 2.1 RC2. (diff)
- Canna doesn't use /var/run any longer.
- Improve the startup script. - Modify the pkg-plist so that pkg_delete won't complain even when user dictionaries are installed. - Use correct syntax for chown (bin.bin -> bin:bin) Credits: nyan@jp.FreeBSD.org nork@FreeBSD.org takachan@running-dog.net knu@iDaemons.org
Notes
Notes: svn path=/head/; revision=59233
Diffstat
-rw-r--r--japanese/Canna/Makefile9
-rw-r--r--japanese/Canna/files/canna.sh.in21
-rw-r--r--japanese/Canna/pkg-plist15
-rw-r--r--japanese/canna-lib/Makefile9
-rw-r--r--japanese/canna-lib/files/canna.sh.in21
-rw-r--r--japanese/canna-lib/pkg-plist15
-rw-r--r--japanese/canna-server/Makefile9
-rw-r--r--japanese/canna-server/files/canna.sh.in21
-rw-r--r--japanese/canna-server/pkg-plist15
9 files changed, 69 insertions, 66 deletions
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index a41f7b1c7d15..bf73421eeb8e 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -48,16 +48,17 @@ MLINKS= uilib.3 XKanjiControl.3 uilib.3 XLookupKanjiString.3 \
STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/canna.sh
+post-build:
+ @${SED} -e "s,@RM@,${RM},g; s,@TOUCH@,${TOUCH},g; \
+ s,@CHOWN@,${CHOWN},g" ${FILESDIR}/canna.sh.in \
+ > ${WRKDIR}/canna.sh
+
post-install:
- ${MKDIR} /var/run/canna
- ${CHOWN} bin:bin /var/run/canna
.for f in user user/user group
${MKDIR} ${PREFIX}/lib/canna/dic/$f
${CHOWN} bin:bin ${PREFIX}/lib/canna/dic/$f
${CHMOD} 775 ${PREFIX}/lib/canna/dic/$f
.endfor
- @${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
- >${WRKDIR}/canna.sh
if [ ! -f ${STARTUP_SCRIPT} ]; then \
${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \
${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \
diff --git a/japanese/Canna/files/canna.sh.in b/japanese/Canna/files/canna.sh.in
index a44a0b7df8e2..950751f81cc2 100644
--- a/japanese/Canna/files/canna.sh.in
+++ b/japanese/Canna/files/canna.sh.in
@@ -1,19 +1,22 @@
#!/bin/sh
-canna=@PREFIX@/sbin/cannaserver
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then
+ echo "$0: Cannot determine the PREFIX" >&2
+ exit 64
+fi
+
case "$1" in
start)
- if [ -f $canna ]; then
- rm -f /var/run/canna/Canna.pid
- mkdir -p /var/run/canna
- touch /var/log/CANNA0msgs
- chown bin:bin /var/run/canna /var/log/CANNA0msgs
- echo -n ' Canna'
- $canna
+ if [ -x ${PREFIX}/sbin/cannaserver ]; then
+ @RM@ -f /tmp/.iroha_unix/IROHA
+ @TOUCH@ /var/log/CANNA0msgs
+ @CHOWN@ bin:bin /var/log/CANNA0msgs
+ ${PREFIX}/sbin/cannaserver && echo -n ' canna'
fi
;;
stop)
- @PREFIX@/sbin/cannakill && echo -n ' Canna'
+ ${PREFIX}/sbin/cannakill && echo -n ' canna'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist
index 5b2eecaf85e5..ca5fbe3b89ce 100644
--- a/japanese/Canna/pkg-plist
+++ b/japanese/Canna/pkg-plist
@@ -109,18 +109,15 @@ lib/libcanna16.so
lib/libcanna16.so.1
sbin/cannaserver
sbin/cannakill
-@exec mkdir /var/run/canna
-@exec chown bin.bin /var/run/canna
@exec mkdir -p %D/lib/canna/dic/user/user %D/lib/canna/dic/group
-@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
+@exec chown bin:bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
-@unexec /bin/rmdir /var/run/canna
@dirrm lib/canna/sample/src
@dirrm lib/canna/sample
-@dirrm lib/canna/dic/user/user
-@dirrm lib/canna/dic/user
-@dirrm lib/canna/dic/group
@dirrm lib/canna/dic/canna
-@dirrm lib/canna/dic
-@dirrm lib/canna
@dirrm include/canna
+@unexec rmdir %D/lib/canna/dic/user/user 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic/user 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic/group 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic 2>/dev/null || true
+@unexec rmdir %D/lib/canna 2>/dev/null || true
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index a41f7b1c7d15..bf73421eeb8e 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -48,16 +48,17 @@ MLINKS= uilib.3 XKanjiControl.3 uilib.3 XLookupKanjiString.3 \
STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/canna.sh
+post-build:
+ @${SED} -e "s,@RM@,${RM},g; s,@TOUCH@,${TOUCH},g; \
+ s,@CHOWN@,${CHOWN},g" ${FILESDIR}/canna.sh.in \
+ > ${WRKDIR}/canna.sh
+
post-install:
- ${MKDIR} /var/run/canna
- ${CHOWN} bin:bin /var/run/canna
.for f in user user/user group
${MKDIR} ${PREFIX}/lib/canna/dic/$f
${CHOWN} bin:bin ${PREFIX}/lib/canna/dic/$f
${CHMOD} 775 ${PREFIX}/lib/canna/dic/$f
.endfor
- @${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
- >${WRKDIR}/canna.sh
if [ ! -f ${STARTUP_SCRIPT} ]; then \
${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \
${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \
diff --git a/japanese/canna-lib/files/canna.sh.in b/japanese/canna-lib/files/canna.sh.in
index a44a0b7df8e2..950751f81cc2 100644
--- a/japanese/canna-lib/files/canna.sh.in
+++ b/japanese/canna-lib/files/canna.sh.in
@@ -1,19 +1,22 @@
#!/bin/sh
-canna=@PREFIX@/sbin/cannaserver
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then
+ echo "$0: Cannot determine the PREFIX" >&2
+ exit 64
+fi
+
case "$1" in
start)
- if [ -f $canna ]; then
- rm -f /var/run/canna/Canna.pid
- mkdir -p /var/run/canna
- touch /var/log/CANNA0msgs
- chown bin:bin /var/run/canna /var/log/CANNA0msgs
- echo -n ' Canna'
- $canna
+ if [ -x ${PREFIX}/sbin/cannaserver ]; then
+ @RM@ -f /tmp/.iroha_unix/IROHA
+ @TOUCH@ /var/log/CANNA0msgs
+ @CHOWN@ bin:bin /var/log/CANNA0msgs
+ ${PREFIX}/sbin/cannaserver && echo -n ' canna'
fi
;;
stop)
- @PREFIX@/sbin/cannakill && echo -n ' Canna'
+ ${PREFIX}/sbin/cannakill && echo -n ' canna'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/japanese/canna-lib/pkg-plist b/japanese/canna-lib/pkg-plist
index 5b2eecaf85e5..ca5fbe3b89ce 100644
--- a/japanese/canna-lib/pkg-plist
+++ b/japanese/canna-lib/pkg-plist
@@ -109,18 +109,15 @@ lib/libcanna16.so
lib/libcanna16.so.1
sbin/cannaserver
sbin/cannakill
-@exec mkdir /var/run/canna
-@exec chown bin.bin /var/run/canna
@exec mkdir -p %D/lib/canna/dic/user/user %D/lib/canna/dic/group
-@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
+@exec chown bin:bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
-@unexec /bin/rmdir /var/run/canna
@dirrm lib/canna/sample/src
@dirrm lib/canna/sample
-@dirrm lib/canna/dic/user/user
-@dirrm lib/canna/dic/user
-@dirrm lib/canna/dic/group
@dirrm lib/canna/dic/canna
-@dirrm lib/canna/dic
-@dirrm lib/canna
@dirrm include/canna
+@unexec rmdir %D/lib/canna/dic/user/user 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic/user 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic/group 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic 2>/dev/null || true
+@unexec rmdir %D/lib/canna 2>/dev/null || true
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index a41f7b1c7d15..bf73421eeb8e 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -48,16 +48,17 @@ MLINKS= uilib.3 XKanjiControl.3 uilib.3 XLookupKanjiString.3 \
STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/canna.sh
+post-build:
+ @${SED} -e "s,@RM@,${RM},g; s,@TOUCH@,${TOUCH},g; \
+ s,@CHOWN@,${CHOWN},g" ${FILESDIR}/canna.sh.in \
+ > ${WRKDIR}/canna.sh
+
post-install:
- ${MKDIR} /var/run/canna
- ${CHOWN} bin:bin /var/run/canna
.for f in user user/user group
${MKDIR} ${PREFIX}/lib/canna/dic/$f
${CHOWN} bin:bin ${PREFIX}/lib/canna/dic/$f
${CHMOD} 775 ${PREFIX}/lib/canna/dic/$f
.endfor
- @${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/canna.sh.in \
- >${WRKDIR}/canna.sh
if [ ! -f ${STARTUP_SCRIPT} ]; then \
${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \
${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \
diff --git a/japanese/canna-server/files/canna.sh.in b/japanese/canna-server/files/canna.sh.in
index a44a0b7df8e2..950751f81cc2 100644
--- a/japanese/canna-server/files/canna.sh.in
+++ b/japanese/canna-server/files/canna.sh.in
@@ -1,19 +1,22 @@
#!/bin/sh
-canna=@PREFIX@/sbin/cannaserver
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then
+ echo "$0: Cannot determine the PREFIX" >&2
+ exit 64
+fi
+
case "$1" in
start)
- if [ -f $canna ]; then
- rm -f /var/run/canna/Canna.pid
- mkdir -p /var/run/canna
- touch /var/log/CANNA0msgs
- chown bin:bin /var/run/canna /var/log/CANNA0msgs
- echo -n ' Canna'
- $canna
+ if [ -x ${PREFIX}/sbin/cannaserver ]; then
+ @RM@ -f /tmp/.iroha_unix/IROHA
+ @TOUCH@ /var/log/CANNA0msgs
+ @CHOWN@ bin:bin /var/log/CANNA0msgs
+ ${PREFIX}/sbin/cannaserver && echo -n ' canna'
fi
;;
stop)
- @PREFIX@/sbin/cannakill && echo -n ' Canna'
+ ${PREFIX}/sbin/cannakill && echo -n ' canna'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index 5b2eecaf85e5..ca5fbe3b89ce 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -109,18 +109,15 @@ lib/libcanna16.so
lib/libcanna16.so.1
sbin/cannaserver
sbin/cannakill
-@exec mkdir /var/run/canna
-@exec chown bin.bin /var/run/canna
@exec mkdir -p %D/lib/canna/dic/user/user %D/lib/canna/dic/group
-@exec chown bin.bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
+@exec chown bin:bin %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
@exec chmod 775 %D/lib/canna/dic/user/user %D/lib/canna/dic/user %D/lib/canna/dic/group
-@unexec /bin/rmdir /var/run/canna
@dirrm lib/canna/sample/src
@dirrm lib/canna/sample
-@dirrm lib/canna/dic/user/user
-@dirrm lib/canna/dic/user
-@dirrm lib/canna/dic/group
@dirrm lib/canna/dic/canna
-@dirrm lib/canna/dic
-@dirrm lib/canna
@dirrm include/canna
+@unexec rmdir %D/lib/canna/dic/user/user 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic/user 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic/group 2>/dev/null || true
+@unexec rmdir %D/lib/canna/dic 2>/dev/null || true
+@unexec rmdir %D/lib/canna 2>/dev/null || true
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 08:57:02 +0000