| 1 |
matsuu 10/05/29 10:31:52 |
| 2 |
|
| 3 |
Modified: rskkserv-2.95.initd |
| 4 |
Added: rskkserv-2.95.4-gentoo.patch |
| 5 |
Removed: rskkserv.initd rskkserv-2.94.13-conf-gentoo.diff |
| 6 |
rskkserv-2.94.13-gentoo.diff |
| 7 |
Log: |
| 8 |
Convert to ruby-ng. Added ~amd64. |
| 9 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.2 app-i18n/rskkserv/files/rskkserv-2.95.initd |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/rskkserv/files/rskkserv-2.95.initd?rev=1.2&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/rskkserv/files/rskkserv-2.95.initd?rev=1.2&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/rskkserv/files/rskkserv-2.95.initd?r1=1.1&r2=1.2 |
| 17 |
|
| 18 |
Index: rskkserv-2.95.initd |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/files/rskkserv-2.95.initd,v |
| 21 |
retrieving revision 1.1 |
| 22 |
retrieving revision 1.2 |
| 23 |
diff -u -r1.1 -r1.2 |
| 24 |
--- rskkserv-2.95.initd 17 Nov 2004 04:08:30 -0000 1.1 |
| 25 |
+++ rskkserv-2.95.initd 29 May 2010 10:31:52 -0000 1.2 |
| 26 |
@@ -1,29 +1,30 @@ |
| 27 |
#!/sbin/runscript |
| 28 |
# Copyright 1999-2004 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/files/rskkserv-2.95.initd,v 1.1 2004/11/17 04:08:30 usata Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/rskkserv/files/rskkserv-2.95.initd,v 1.2 2010/05/29 10:31:52 matsuu Exp $ |
| 32 |
|
| 33 |
opts="${opts} reload" |
| 34 |
|
| 35 |
depend() { |
| 36 |
- need net |
| 37 |
+ need localmount net |
| 38 |
} |
| 39 |
|
| 40 |
start() { |
| 41 |
ebegin "Starting rskkserv" |
| 42 |
- start-stop-daemon --start --quiet --exec /usr/sbin/skkserv.rb |
| 43 |
- eend $? |
| 44 |
+ start-stop-daemon --start --quiet \ |
| 45 |
+ --pidfile /var/run/rskkserv.pid \ |
| 46 |
+ --exec /usr/sbin/skkserv.rb |
| 47 |
+ eend $? "Failed to start rskkserv" |
| 48 |
} |
| 49 |
|
| 50 |
stop() { |
| 51 |
ebegin "Stopping rskkserv" |
| 52 |
- if [ -r /var/run/rskkserv.pid ] ; then |
| 53 |
- kill -KILL `cat /var/run/rskkserv.pid` |
| 54 |
- else |
| 55 |
- eerror "rskkserv not running. Please run /etc/init.d/rskkserv zap" |
| 56 |
- die |
| 57 |
- fi |
| 58 |
- eend $? |
| 59 |
+ start-stop-daemon --stop --quiet \ |
| 60 |
+ --pidfile /var/run/rskkserv.pid |
| 61 |
+ local ret=$? |
| 62 |
+ eend ${ret} "Failed to stop rskkserv" |
| 63 |
+ rm -f "var/run/rskkserv.pid" |
| 64 |
+ eend ${ret} |
| 65 |
} |
| 66 |
|
| 67 |
reload() { |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.1 app-i18n/rskkserv/files/rskkserv-2.95.4-gentoo.patch |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/rskkserv/files/rskkserv-2.95.4-gentoo.patch?rev=1.1&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/rskkserv/files/rskkserv-2.95.4-gentoo.patch?rev=1.1&content-type=text/plain |
| 75 |
|
| 76 |
Index: rskkserv-2.95.4-gentoo.patch |
| 77 |
=================================================================== |
| 78 |
diff -Naur rskkserv-2.95.4.orig/Makefile.in rskkserv-2.95.4/Makefile.in |
| 79 |
--- rskkserv-2.95.4.orig/Makefile.in 2005-06-19 19:53:43.000000000 +0900 |
| 80 |
+++ rskkserv-2.95.4/Makefile.in 2010-05-29 17:22:16.000000000 +0900 |
| 81 |
@@ -29,7 +29,7 @@ |
| 82 |
|
| 83 |
|
| 84 |
all: $(SKKSERV) $(CONFFILE) ext/Makefile # README INSTALL |
| 85 |
- cd ext; make $@; cd .. |
| 86 |
+ cd ext; $(MAKE) $@; cd .. |
| 87 |
|
| 88 |
$(SKKSERV): $(SKKSERV).in @CONFIG_STATUS@ |
| 89 |
$(RUBY) -p -e 'sub %r%@RUBY\@%, %q%$(RUBY)%' \ |
| 90 |
@@ -61,7 +61,7 @@ |
| 91 |
cd ext; $(RUBY) extconf.rb |
| 92 |
|
| 93 |
distclean: clean |
| 94 |
- cd ext; make $@; cd .. |
| 95 |
+ cd ext; $(MAKE) $@; cd .. |
| 96 |
rm -f ext/extconf.rb ext/depend |
| 97 |
rm -f config.* configure Makefile README INSTALL rskkserv.spec |
| 98 |
rm -rf autom4te.cache |
| 99 |
@@ -69,11 +69,11 @@ |
| 100 |
|
| 101 |
clean: |
| 102 |
find ./ -name "*~" -exec rm {} \; |
| 103 |
- cd ext; make $@; cd .. |
| 104 |
+ cd ext; $(MAKE)$@; cd .. |
| 105 |
rm -f $(SKKSERV) $(CONFFILE) |
| 106 |
|
| 107 |
install: all installdirs |
| 108 |
- cd ext; make DESTDIR=$(DESTDIR) rss-install; cd .. |
| 109 |
+ cd ext; $(MAKE) DESTDIR=$(DESTDIR) rss-install; cd .. |
| 110 |
$(INSTALL) -m0755 $(SKKSERV) $(DESTDIR)$(sbindir)/$(SKKSERV) |
| 111 |
if [ ! -f $(DESTDIR)$(sysconfdir)/$(CONFFILE) ]; then \ |
| 112 |
$(INSTALL) -m0644 $(CONFFILE) $(DESTDIR)$(sysconfdir)/; \ |
Archives