Attachment 48046 Details for Bug 73550 – file.diff

[patch] file.diff

file.diff (text/plain), 3.16 KB, created by Hideyuki KURASHINA on 2004-11-05 00:50:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hideyuki KURASHINA

Created: 2004-11-05 00:50:21 UTC

Size: 3.16 KB

patch

obsolete

>Index: UPDATING
>===================================================================
>RCS file: /home/ncvs/ports/UPDATING,v
>retrieving revision 1.90
>diff -u -r1.90 UPDATING
>--- UPDATING	4 Nov 2004 22:53:09 -0000	1.90
>+++ UPDATING	5 Nov 2004 00:44:07 -0000
>@@ -20,7 +20,7 @@
>   The format of PREFIX/etc/rskkserv.conf has changed in version 2.95.
>   Please update your configuration file before restarting the server
>   using PREFIX/share/examples/rskkserv/conf-o2n.rb and referring to
>-  PREFIX/etc/rskkserv.conf.sample.
>+  PREFIX/share/examples/rskkserv/rskkserv.conf.sample.
> 
> 20041031:
>   AFFECTS: users of databases/mysql40-server
>Index: japanese/rskkserv/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/japanese/rskkserv/Makefile,v
>retrieving revision 1.19
>diff -u -r1.19 Makefile
>--- japanese/rskkserv/Makefile	4 Nov 2004 02:51:41 -0000	1.19
>+++ japanese/rskkserv/Makefile	4 Nov 2004 23:32:31 -0000
>@@ -61,7 +61,6 @@
> 		${WRKSRC}/doc/conf-o2n.rb
> 
> post-install:
>-	${INSTALL_DATA} ${WRKSRC}/doc/rskkserv.conf.sample ${PREFIX}/etc/
> 	@if [ ! -f ${STARTUP_SCRIPT} ]; then \
> 		${ECHO} "Installing ${STARTUP_SCRIPT} file."; \
> 		( \
>@@ -102,5 +101,7 @@
> .endif
> 	${MKDIR} ${EXAMPLESDIR}
> 	${INSTALL_SCRIPT} ${WRKSRC}/doc/conf-o2n.rb ${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/rskkserv.conf ${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/doc/rskkserv.conf.sample ${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>Index: japanese/rskkserv/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/japanese/rskkserv/pkg-plist,v
>retrieving revision 1.7
>diff -u -r1.7 pkg-plist
>--- japanese/rskkserv/pkg-plist	4 Nov 2004 02:51:41 -0000	1.7
>+++ japanese/rskkserv/pkg-plist	4 Nov 2004 23:56:23 -0000
>@@ -1,6 +1,5 @@
> etc/rc.d/rskkserv.sh
>-etc/rskkserv.conf
>-etc/rskkserv.conf.sample
>+@unexec if cmp -s %D/etc/rskkserv.conf %D/%%EXAMPLESDIR%%/rskkserv.conf; then rm -f %D/etc/rskkserv.conf; fi
> %%RUBY_SITEARCHLIBDIR%%/skkserv/skkdic.so
> @dirrm %%RUBY_SITEARCHLIBDIR%%/skkserv
> %%RUBY_SITELIBDIR%%/skkserv/bdbdic.rb
>@@ -16,4 +15,7 @@
> %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
> %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
> %%EXAMPLESDIR%%/conf-o2n.rb
>+%%EXAMPLESDIR%%/rskkserv.conf
>+@exec [ -f %D/etc/rskkserv.conf ] || cp %B/%f %D/etc/rskkserv.conf
>+%%EXAMPLESDIR%%/rskkserv.conf.sample
> @dirrm %%EXAMPLESDIR%%
>Index: japanese/rskkserv/files/patch-Makefile.in
>===================================================================
>RCS file: japanese/rskkserv/files/patch-Makefile.in
>diff -N japanese/rskkserv/files/patch-Makefile.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ japanese/rskkserv/files/patch-Makefile.in	5 Nov 2004 00:12:25 -0000
>@@ -0,0 +1,13 @@
>+--- Makefile.in.orig	Thu Nov  4 02:08:36 2004
>++++ Makefile.in	Fri Nov  5 09:05:02 2004
>+@@ -75,7 +75,9 @@
>+ install: all installdirs
>+ 	cd ext; make DESTDIR=$(DESTDIR) rss-install; cd ..
>+ 	$(INSTALL) -m0755 $(SKKSERV) $(DESTDIR)$(sbindir)/$(SKKSERV)
>+-	$(INSTALL) -m0644 $(CONFFILE) $(DESTDIR)$(sysconfdir)/$(CONFFILE)
>++	if [ ! -f $(DESTDIR)$(sysconfdir)/$(CONFFILE) ]; then \
>++	    $(INSTALL) -m0644 $(CONFFILE) $(DESTDIR)$(sysconfdir)/; \
>++	fi
>+ 
>+ installdirs:
>+ 	mkdir -p $(DESTDIR)$(sbindir)

Actions: View | Diff

Attachments on bug 73550: 48046