diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2015-03-20 03:52:30 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2015-03-20 03:52:30 +0800 |
| commit | 4442e744945e2408ccc6c94e647a7a25b4ff0f07 (patch) | |
| tree | f44c623eb52c15e3becb4fea7e8ebf0f77841438 /japanese | |
| parent | 75d033a23727b788202179fd3dbf1e24d8a33580 (diff) | |
| download | freebsd-ports-gnome-4442e744945e2408ccc6c94e647a7a25b4ff0f07.tar.gz freebsd-ports-gnome-4442e744945e2408ccc6c94e647a7a25b4ff0f07.tar.zst freebsd-ports-gnome-4442e744945e2408ccc6c94e647a7a25b4ff0f07.zip | |
- Cleanup installation
- Fix LOCALBASE refeences in pkg-message and readme
- Fix permissions and installation from non-root
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/cannadic/Makefile | 10 | ||||
| -rw-r--r-- | japanese/cannadic/files/README.FreeBSD.in | 10 | ||||
| -rw-r--r-- | japanese/cannadic/files/pkg-message.in | 2 | ||||
| -rw-r--r-- | japanese/cannadic/pkg-plist | 8 |
4 files changed, 15 insertions, 15 deletions
diff --git a/japanese/cannadic/Makefile b/japanese/cannadic/Makefile index 70cb17305a1a..72c371f11f24 100644 --- a/japanese/cannadic/Makefile +++ b/japanese/cannadic/Makefile @@ -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> diff --git a/japanese/cannadic/files/README.FreeBSD.in b/japanese/cannadic/files/README.FreeBSD.in index 79d3dcf4c4f7..582e2cb380ee 100644 --- a/japanese/cannadic/files/README.FreeBSD.in +++ b/japanese/cannadic/files/README.FreeBSD.in @@ -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" の二行を付け足して diff --git a/japanese/cannadic/files/pkg-message.in b/japanese/cannadic/files/pkg-message.in index 463f2fc01691..450a0e3a3650 100644 --- a/japanese/cannadic/files/pkg-message.in +++ b/japanese/cannadic/files/pkg-message.in @@ -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 diff --git a/japanese/cannadic/pkg-plist b/japanese/cannadic/pkg-plist index b31858aac7f5..e584c7baade7 100644 --- a/japanese/cannadic/pkg-plist +++ b/japanese/cannadic/pkg-plist @@ -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 |