1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

- 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
This commit is contained in:
Masafumi Max NAKANE 2002-05-16 07:49:43 +00:00
parent 5982ff47b1
commit 60db302613
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=59233
9 changed files with 69 additions and 66 deletions

View File

@ -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}; \

View File

@ -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

View File

@ -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

View File

@ -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}; \

View File

@ -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

View File

@ -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

View File

@ -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}; \

View File

@ -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

View File

@ -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