Date: Thu, 19 Mar 2015 19:52:30 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381682 - in head/japanese/cannadic: . files Message-ID: <201503191952.t2JJqUVo042998@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503191952.t2JJqUVo042998>