svn commit: r381682 - in head/japanese/cannadic: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Mar 19 19:52:30 2015
New Revision: 381682
URL: https://svnweb.freebsd.org/changeset/ports/381682
QAT: https://qat.redports.org/buildarchive/r381682/

Log:
  - Cleanup installation
  - Fix LOCALBASE refeences in pkg-message and readme
  - Fix permissions and installation from non-root

Modified:
  head/japanese/cannadic/Makefile
  head/japanese/cannadic/files/README.FreeBSD.in   (contents, props changed)
  head/japanese/cannadic/files/pkg-message.in
  head/japanese/cannadic/pkg-plist

Modified: head/japanese/cannadic/Makefile
==============================================================================
--- head/japanese/cannadic/Makefile	Thu Mar 19 19:47:44 2015	(r381681)
+++ head/japanese/cannadic/Makefile	Thu Mar 19 19:52:30 2015	(r381682)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cannadic
 PORTVERSION=	0.95c
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	http://cannadic.oucrc.org/
 
@@ -20,15 +20,15 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 DICS=		gcanna.cbd gcanna.cld gcannaf.ctd
 DICSFILE=	dics.dir.gpl_canna
-DICDIR=		${LOCALBASE}/share/canna/dic/canna
+DICDIR=		share/canna/dic/canna
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DICDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${DICDIR}
 	cd ${WRKSRC} && \
-	${INSTALL} -c -g bin -m 664 -o bin ${DICS} ${DICSFILE} ${STAGEDIR}${DICDIR}
+		${INSTALL_DATA} ${DICS} ${DICSFILE} ${STAGEDIR}${PREFIX}/${DICDIR}
 	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${WRKSRC}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/japanese/cannadic/files/README.FreeBSD.in
==============================================================================
--- head/japanese/cannadic/files/README.FreeBSD.in	Thu Mar 19 19:47:44 2015	(r381681)
+++ head/japanese/cannadic/files/README.FreeBSD.in	Thu Mar 19 19:52:30 2015	(r381682)
@@ -4,23 +4,23 @@
 ¼êÆ°¤Ç¹Ô¤ï¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤ò¡¤¤«¤ó¤Ê¼­½ñ¤Î¥Þ¥Ë¥å¥¢¥ë¤«¤éÈ´¿è¤·¤¿¤â¤Î¤Ç¤¹¡¥
 
 
-1) ¼­½ñÅÐÏ¿¥Õ¥¡¥¤¥ë¤Î %%LOCALBASE%%/share/canna/dic/canna/dics.dir ¤Ë¡¢
-   %%LOCALBASE%%/share/canna/dic/canna/dics.dir.gpl_canna ¤ÎÆâÍƤòÄɲä·¤Þ¤¹¡£
+1) ¼­½ñÅÐÏ¿¥Õ¥¡¥¤¥ë¤Î %%PREFIX%%/share/canna/dic/canna/dics.dir ¤Ë¡¢
+   %%PREFIX%%/share/canna/dic/canna/dics.dir.gpl_canna ¤ÎÆâÍƤòÄɲä·¤Þ¤¹¡£
 
-# cd %%LOCALBASE%%/share/canna/dic/canna
+# cd %%PREFIX%%/share/canna/dic/canna
 # cp dics.dir dics.dir.orig
 # cat dics.dir.gpl_canna >> dics.dir
 
 2) cannaserver ¤òÄä»ß¡¤µ¯Æ°¤·¤Þ¤¹¡£
 
 (¤«¤ó¤Ê¥µ¡¼¥ÐÄä»ß)
-# %%LOCALBASE%%/etc/rc.d/canna stop
+# %%PREFIX%%/etc/rc.d/canna stop
 
 (cannaserver¤¬Ää»ß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£Ää»ß¤·¤Æ¤¤¤Ê¤±¤ì¤Ð
  kill¥³¥Þ¥ó¥É¤Ç¥×¥í¥»¥¹¤òÄä»ß¤µ¤»¤Æ¤¯¤À¤µ¤¤)
 
 (¤«¤ó¤Ê¥µ¡¼¥Ðµ¯Æ°)
-# %%LOCALBASE%%/etc/rc.d/canna start
+# %%PREFIX%%/etc/rc.d/canna start
 
 3) ¥æ¡¼¥¶¸¢¸Â¤ËÌá¤Ã¤Æ¡¢¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë¸ºß¤¹¤ë³Æ¥æ¡¼¥¶¤Î .canna ¤Î
    (use-dictionary ...) ¤ÎÉôʬ¤Ë "gcanna" "gcannaf" ¤ÎÆó¹Ô¤òÉÕ¤±Â­¤·¤Æ

Modified: head/japanese/cannadic/files/pkg-message.in
==============================================================================
--- head/japanese/cannadic/files/pkg-message.in	Thu Mar 19 19:47:44 2015	(r381681)
+++ head/japanese/cannadic/files/pkg-message.in	Thu Mar 19 19:52:30 2015	(r381682)
@@ -1,3 +1,3 @@
 
 You should do set up after the installation.
-See %%LOCALBASE%%/share/doc/cannadic/README.FreeBSD
+See %%PREFIX%%/share/doc/cannadic/README.FreeBSD

Modified: head/japanese/cannadic/pkg-plist
==============================================================================
--- head/japanese/cannadic/pkg-plist	Thu Mar 19 19:47:44 2015	(r381681)
+++ head/japanese/cannadic/pkg-plist	Thu Mar 19 19:52:30 2015	(r381682)
@@ -1,4 +1,4 @@
-share/canna/dic/canna/dics.dir.gpl_canna
-share/canna/dic/canna/gcanna.cld
-share/canna/dic/canna/gcanna.cbd
-share/canna/dic/canna/gcannaf.ctd
+@(bin,bin,664) share/canna/dic/canna/dics.dir.gpl_canna
+@(bin,bin,664) share/canna/dic/canna/gcanna.cld
+@(bin,bin,664) share/canna/dic/canna/gcanna.cbd
+@(bin,bin,664) share/canna/dic/canna/gcannaf.ctd