svn commit: r355055 - in head/japanese: canna-lib canna-lib/files canna-server canna-server/files
Hiroki Sato
hrs at FreeBSD.org
Sat May 24 17:14:59 UTC 2014
Author: hrs
Date: Sat May 24 17:14:56 2014
New Revision: 355055
URL: http://svnweb.freebsd.org/changeset/ports/355055
QAT: https://qat.redports.org/buildarchive/r355055/
Log:
- STAGEDIR support.
- Add LICENSE.
- Remove GCC dependency.
Added:
head/japanese/canna-lib/files/patch-dic-phono-newjis.kpdef (contents, props changed)
Modified:
head/japanese/canna-lib/Makefile
head/japanese/canna-lib/files/patch-Canna.conf
head/japanese/canna-lib/pkg-plist (contents, props changed)
head/japanese/canna-server/Makefile
head/japanese/canna-server/files/patch-Canna.conf
head/japanese/canna-server/pkg-message
head/japanese/canna-server/pkg-plist
Modified: head/japanese/canna-lib/Makefile
==============================================================================
--- head/japanese/canna-lib/Makefile Sat May 24 17:12:13 2014 (r355054)
+++ head/japanese/canna-lib/Makefile Sat May 24 17:14:56 2014 (r355055)
@@ -3,7 +3,7 @@
PORTNAME= canna
PORTVERSION= 3.7p3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= canna/9565/
@@ -13,23 +13,14 @@ DISTNAME= Canna${PORTVERSION:S/.//g}
MAINTAINER= hrs at FreeBSD.org
COMMENT= A Kana-to-Kanji conversion system, library part
-USES= imake:notall
-USE_BZIP2= yes
-USE_GCC= any
-USE_LDCONFIG= yes
-NO_INSTALL_MANPAGES=yes
-MAKE_JOBS_UNSAFE= yes
-PLIST_SUB= METAFILE="${METAFILE}" \
- MTREE_CMD="${MTREE_CMD}"
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+USES= imake:notall tar:bzip2
+USE_LDCONFIG= yes
ALL_TARGET= canna
INSTALL_TARGET= instsgs
-
-METAFILE= ${DATADIR_REL}/canna-lib-dic.meta
-
-NO_STAGE= yes
-post-install:
- ${MTREE_CMD} -cdink uname,gname,mode,nochange \
- -p ${DATADIR}/dic > ${PREFIX}/${METAFILE}
+NO_INSTALL_MANPAGES=yes
+MAKE_JOBS_UNSAFE= yes
.include <bsd.port.mk>
Modified: head/japanese/canna-lib/files/patch-Canna.conf
==============================================================================
--- head/japanese/canna-lib/files/patch-Canna.conf Sat May 24 17:12:13 2014 (r355054)
+++ head/japanese/canna-lib/files/patch-Canna.conf Sat May 24 17:14:56 2014 (r355055)
@@ -1,5 +1,5 @@
---- Canna.conf.orig Fri Jan 2 21:26:27 2004
-+++ Canna.conf Thu Jan 22 18:42:43 2004
+--- Canna.conf.orig 2004-05-20 00:48:47.000000000 +0900
++++ Canna.conf 2014-04-06 04:16:39.000000000 +0900
@@ -109,7 +109,8 @@
# define DefErrDir $(cannaPrefix)/log
# define DefLibCannaDir $(cannaExecPrefix)/lib
@@ -10,3 +10,25 @@
# ifdef ObsoleteInstallDir
# define DefErrDir /usr/spool/canna
# define DefLibCannaDir /usr/lib
+@@ -175,7 +176,7 @@
+ #ifdef InstallAsUser
+ cannaOwnerGroup =
+ #else
+-cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
++cannaOwnerGroup =
+ #endif
+
+ cannaDsoRev = 1.2
+@@ -199,9 +200,9 @@
+ CHGRP = :
+ CHMOD = :
+ #else
+-CHOWN = chown
+-CHGRP = chgrp
+-CHMOD = chmod
++CHOWN = :
++CHGRP = :
++CHMOD = :
+ #endif
+
+ /* ÆüËܸì¥Þ¥Ë¥å¥¢¥ë¤ò»È¤ï¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¥³¥á¥ó¥È¥¢¥¦¥È */
Added: head/japanese/canna-lib/files/patch-dic-phono-newjis.kpdef
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/canna-lib/files/patch-dic-phono-newjis.kpdef Sat May 24 17:14:56 2014 (r355055)
@@ -0,0 +1,11 @@
+--- dic/phono/newjis.kpdef.orig 2014-04-06 04:09:21.000000000 +0900
++++ dic/phono/newjis.kpdef 2014-04-06 04:09:30.000000000 +0900
+@@ -70,7 +70,7 @@
+ O ¤ä
+ #ifndef ASCII
+ + ¤æ
+-#else/* ASCII */
++#else /* ASCII */
+ : ¤æ
+ #endif /* ASCII */
+ G ¤è
Modified: head/japanese/canna-lib/pkg-plist
==============================================================================
--- head/japanese/canna-lib/pkg-plist Sat May 24 17:12:13 2014 (r355054)
+++ head/japanese/canna-lib/pkg-plist Sat May 24 17:14:56 2014 (r355055)
@@ -1,3 +1,4 @@
+ at comment $FreeBSD$
include/canna/RK.h
include/canna/jrkanji.h
include/canna/keydef.h
@@ -17,6 +18,8 @@ lib/libcanna16.a
lib/libcanna16.so
lib/libcanna16.so.1
%%DATADIR%%/default.canna
+ at owner bin
+ at group bin
%%DATADIR%%/dic/default.cbp
%%DATADIR%%/dic/english.cbp
%%DATADIR%%/dic/jdaemon.cbp
@@ -31,6 +34,10 @@ lib/libcanna16.so.1
%%DATADIR%%/dic/tut.cbp
%%DATADIR%%/dic/vje.cbp
%%DATADIR%%/dic/wx2+.cbp
+ at exec chown bin:bin %D/%%DATADIR%%/dic
+ at exec chmod 0775 %D/%%DATADIR%%/dic
+ at owner root
+ at group wheel
%%DATADIR%%/sample/1.1.canna
%%DATADIR%%/sample/1.2.canna
%%DATADIR%%/sample/fixer.canna
@@ -61,8 +68,6 @@ lib/libcanna16.so.1
%%DATADIR%%/sample/verbose.canna
%%DATADIR%%/sample/vje.canna
%%DATADIR%%/sample/wx2+.canna
-%%METAFILE%%
- at exec %%MTREE_CMD%% -qU -f %D/%%METAFILE%% -p %D/%%DATADIR%%/dic > /dev/null 2>&1
@dirrm include/canna
@dirrm %%DATADIR%%/sample/src
@dirrm %%DATADIR%%/sample
Modified: head/japanese/canna-server/Makefile
==============================================================================
--- head/japanese/canna-server/Makefile Sat May 24 17:12:13 2014 (r355054)
+++ head/japanese/canna-server/Makefile Sat May 24 17:14:56 2014 (r355055)
@@ -3,7 +3,7 @@
PORTNAME= canna
PORTVERSION= 3.7p3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= canna/9565/
@@ -13,48 +13,21 @@ DISTNAME= Canna${PORTVERSION:S/.//g}
MAINTAINER= hrs at FreeBSD.org
COMMENT= A Kana-to-Kanji conversion system, binary part
-LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/canna-lib
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-USES= imake
-USE_GCC= any
+LIB_DEPENDS= libcanna.so:${PORTSDIR}/japanese/canna-lib
+
+USES= imake tar:bzip2
USE_RC_SUBR= canna
-USE_BZIP2= yes
INSTALL_TARGET= instserver instclient
-PLIST_SUB= METAFILE="${METAFILE}" \
- MTREE_CMD="${MTREE_CMD}"
-
PORTDOCS= canna.bib canna.sty Imakefile README.jp Makefile \
intern lisp man
-MANLANG= "" ja
-MANCOMPRESSED= no
-MAN1= addwords.1 cannacheck.1 cannakill.1 cannaserver.1 cannastat.1 \
- catdic.1 chmoddic.1 cpdic.1 cshost.1 ctow.1 delwords.1 dicar.1 \
- dpbindic.1 dpromdic.1 lsdic.1 mkbindic.1 mkdic.1 mkromdic.1 \
- mvdic.1 rmdic.1 splitword.1 wtoc.1
-MAN3= RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.3 \
- RkCvtRoma.3 RkCvtZen.3 RkDefineDic.3 RkDeleteDic.3 RkEndBun.3 \
- RkEnlarge.3 RkFinalize.3 RkGetDicList.3 RkGetKanji.3 \
- RkGetLex.3 RkGetStat.3 RkGetYomi.3 RkGoto.3 RkInitialize.3 \
- RkIntro.3 RkLeft.3 RkMapPhonogram.3 RkMapRoma.3 RkMountDic.3 \
- RkNext.3 RkNfer.3 RkOpenRoma.3 RkPrev.3 RkRemountDic.3 \
- RkResize.3 RkBgnBun.3 RkRight.3 RkShorten.3 RkStoreYomi.3 \
- RkUnmountDic.3 RkXfer.3 cannalib.3 uilib.3
-MLINKS= uilib.3 XKanjiControl.3 uilib.3 XLookupKanjiString.3 uilib.3 \
- jrKanjiControl.3 uilib.3 jrKanjiString.3
-
-METAFILE= ${DATADIR_REL}/canna-server-dic.meta
-
-NO_STAGE= yes
post-install:
- @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man
- ${MTREE_CMD} -cdink uname,gname,mode,nochange \
- -p ${DATADIR}/dic > ${PREFIX}/${METAFILE}
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- cd ${WRKSRC}/doc && ${CP} -R ${PORTDOCS} ${DOCSDIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-.endif
- @${CAT} ${PKGMESSAGE}
+ @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${MAKE_ARGS} install.man
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/doc && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/japanese/canna-server/files/patch-Canna.conf
==============================================================================
--- head/japanese/canna-server/files/patch-Canna.conf Sat May 24 17:12:13 2014 (r355054)
+++ head/japanese/canna-server/files/patch-Canna.conf Sat May 24 17:14:56 2014 (r355055)
@@ -1,5 +1,5 @@
---- Canna.conf.orig Fri Jan 2 21:26:27 2004
-+++ Canna.conf Thu Jan 22 18:42:43 2004
+--- Canna.conf.orig 2004-05-20 00:48:47.000000000 +0900
++++ Canna.conf 2014-04-06 04:16:39.000000000 +0900
@@ -109,7 +109,8 @@
# define DefErrDir $(cannaPrefix)/log
# define DefLibCannaDir $(cannaExecPrefix)/lib
@@ -10,3 +10,25 @@
# ifdef ObsoleteInstallDir
# define DefErrDir /usr/spool/canna
# define DefLibCannaDir /usr/lib
+@@ -175,7 +176,7 @@
+ #ifdef InstallAsUser
+ cannaOwnerGroup =
+ #else
+-cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
++cannaOwnerGroup =
+ #endif
+
+ cannaDsoRev = 1.2
+@@ -199,9 +200,9 @@
+ CHGRP = :
+ CHMOD = :
+ #else
+-CHOWN = chown
+-CHGRP = chgrp
+-CHMOD = chmod
++CHOWN = :
++CHGRP = :
++CHMOD = :
+ #endif
+
+ /* ÆüËܸì¥Þ¥Ë¥å¥¢¥ë¤ò»È¤ï¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¥³¥á¥ó¥È¥¢¥¦¥È */
Modified: head/japanese/canna-server/pkg-message
==============================================================================
--- head/japanese/canna-server/pkg-message Sat May 24 17:12:13 2014 (r355054)
+++ head/japanese/canna-server/pkg-message Sat May 24 17:14:56 2014 (r355055)
@@ -2,11 +2,5 @@ Now the cannaserver uses a UNIX domain s
to use a TCP connection, please edit your /etc/rc.conf (or alike) and
add the -inet command-line option to canna_flags, i.e.:
- canna_flags="-u bin -inet"
-
-Also, note that canna startup script now uses the rcNG mechanism, so
-if you'd like to start Canna server on local system, enable it in your
-/etc/rc.conf, i.e.:
-
canna_enable="yes"
-
+ canna_flags="-u bin -inet"
Modified: head/japanese/canna-server/pkg-plist
==============================================================================
--- head/japanese/canna-server/pkg-plist Sat May 24 17:12:13 2014 (r355054)
+++ head/japanese/canna-server/pkg-plist Sat May 24 17:14:56 2014 (r355055)
@@ -1,3 +1,4 @@
+ at comment $FreeBSD$
bin/addwords
bin/canlisp
bin/cannacheck
@@ -29,6 +30,10 @@ bin/rmdic
bin/splitword
bin/syncdic
bin/wtoc
+sbin/cannaserver
+sbin/cannakill
+ at owner bin
+ at group bin
%%DATADIR%%/dic/canna/bushu.cld
%%DATADIR%%/dic/canna/chimei.ctd
%%DATADIR%%/dic/canna/dics.dir
@@ -44,10 +49,138 @@ bin/wtoc
%%DATADIR%%/dic/canna/number.ctd
%%DATADIR%%/dic/canna/software.ctd
%%DATADIR%%/dic/canna/suffix.ctd
-sbin/cannaserver
-sbin/cannakill
-%%METAFILE%%
- at exec %%MTREE_CMD%% -qU -f %D/%%METAFILE%% -p %D/%%DATADIR%%/dic > /dev/null 2>&1
+ at exec chown bin:bin %D/%%DATADIR%%/dic
+ at exec chmod 0775 %D/%%DATADIR%%/dic
+ at owner root
+ at group wheel
+man/ja/man1/addwords.1.gz
+man/ja/man1/cannacheck.1.gz
+man/ja/man1/cannakill.1.gz
+man/ja/man1/cannaserver.1.gz
+man/ja/man1/cannastat.1.gz
+man/ja/man1/catdic.1.gz
+man/ja/man1/chmoddic.1.gz
+man/ja/man1/cpdic.1.gz
+man/ja/man1/cshost.1.gz
+man/ja/man1/ctow.1.gz
+man/ja/man1/delwords.1.gz
+man/ja/man1/dicar.1.gz
+man/ja/man1/dpbindic.1.gz
+man/ja/man1/dpromdic.1.gz
+man/ja/man1/lsdic.1.gz
+man/ja/man1/mkbindic.1.gz
+man/ja/man1/mkdic.1.gz
+man/ja/man1/mkromdic.1.gz
+man/ja/man1/mvdic.1.gz
+man/ja/man1/rmdic.1.gz
+man/ja/man1/splitword.1.gz
+man/ja/man1/wtoc.1.gz
+man/ja/man3/RkBgnBun.3.gz
+man/ja/man3/RkCloseRoma.3.gz
+man/ja/man3/RkCvtEuc.3.gz
+man/ja/man3/RkCvtHan.3.gz
+man/ja/man3/RkCvtHira.3.gz
+man/ja/man3/RkCvtKana.3.gz
+man/ja/man3/RkCvtRoma.3.gz
+man/ja/man3/RkCvtZen.3.gz
+man/ja/man3/RkDefineDic.3.gz
+man/ja/man3/RkDeleteDic.3.gz
+man/ja/man3/RkEndBun.3.gz
+man/ja/man3/RkEnlarge.3.gz
+man/ja/man3/RkFinalize.3.gz
+man/ja/man3/RkGetDicList.3.gz
+man/ja/man3/RkGetKanji.3.gz
+man/ja/man3/RkGetLex.3.gz
+man/ja/man3/RkGetStat.3.gz
+man/ja/man3/RkGetYomi.3.gz
+man/ja/man3/RkGoto.3.gz
+man/ja/man3/RkInitialize.3.gz
+man/ja/man3/RkIntro.3.gz
+man/ja/man3/RkLeft.3.gz
+man/ja/man3/RkMapPhonogram.3.gz
+man/ja/man3/RkMapRoma.3.gz
+man/ja/man3/RkMountDic.3.gz
+man/ja/man3/RkNext.3.gz
+man/ja/man3/RkNfer.3.gz
+man/ja/man3/RkOpenRoma.3.gz
+man/ja/man3/RkPrev.3.gz
+man/ja/man3/RkRemountDic.3.gz
+man/ja/man3/RkResize.3.gz
+man/ja/man3/RkRight.3.gz
+man/ja/man3/RkShorten.3.gz
+man/ja/man3/RkStoreYomi.3.gz
+man/ja/man3/RkUnmountDic.3.gz
+man/ja/man3/RkXfer.3.gz
+man/ja/man3/XKanjiControl.3.gz
+man/ja/man3/XLookupKanjiString.3.gz
+man/ja/man3/cannalib.3.gz
+man/ja/man3/jrKanjiControl.3.gz
+man/ja/man3/jrKanjiString.3.gz
+man/ja/man3/uilib.3.gz
+man/man1/addwords.1.gz
+man/man1/cannacheck.1.gz
+man/man1/cannakill.1.gz
+man/man1/cannaserver.1.gz
+man/man1/cannastat.1.gz
+man/man1/catdic.1.gz
+man/man1/chmoddic.1.gz
+man/man1/cpdic.1.gz
+man/man1/cshost.1.gz
+man/man1/ctow.1.gz
+man/man1/delwords.1.gz
+man/man1/dicar.1.gz
+man/man1/dpbindic.1.gz
+man/man1/dpromdic.1.gz
+man/man1/lsdic.1.gz
+man/man1/mkbindic.1.gz
+man/man1/mkdic.1.gz
+man/man1/mkromdic.1.gz
+man/man1/mvdic.1.gz
+man/man1/rmdic.1.gz
+man/man1/splitword.1.gz
+man/man1/wtoc.1.gz
+man/man3/RkBgnBun.3.gz
+man/man3/RkCloseRoma.3.gz
+man/man3/RkCvtEuc.3.gz
+man/man3/RkCvtHan.3.gz
+man/man3/RkCvtHira.3.gz
+man/man3/RkCvtKana.3.gz
+man/man3/RkCvtRoma.3.gz
+man/man3/RkCvtZen.3.gz
+man/man3/RkDefineDic.3.gz
+man/man3/RkDeleteDic.3.gz
+man/man3/RkEndBun.3.gz
+man/man3/RkEnlarge.3.gz
+man/man3/RkFinalize.3.gz
+man/man3/RkGetDicList.3.gz
+man/man3/RkGetKanji.3.gz
+man/man3/RkGetLex.3.gz
+man/man3/RkGetStat.3.gz
+man/man3/RkGetYomi.3.gz
+man/man3/RkGoto.3.gz
+man/man3/RkInitialize.3.gz
+man/man3/RkIntro.3.gz
+man/man3/RkLeft.3.gz
+man/man3/RkMapPhonogram.3.gz
+man/man3/RkMapRoma.3.gz
+man/man3/RkMountDic.3.gz
+man/man3/RkNext.3.gz
+man/man3/RkNfer.3.gz
+man/man3/RkOpenRoma.3.gz
+man/man3/RkPrev.3.gz
+man/man3/RkRemountDic.3.gz
+man/man3/RkResize.3.gz
+man/man3/RkRight.3.gz
+man/man3/RkShorten.3.gz
+man/man3/RkStoreYomi.3.gz
+man/man3/RkUnmountDic.3.gz
+man/man3/RkXfer.3.gz
+man/man3/XKanjiControl.3.gz
+man/man3/XLookupKanjiString.3.gz
+man/man3/cannalib.3.gz
+man/man3/jrKanjiControl.3.gz
+man/man3/jrKanjiString.3.gz
+man/man3/uilib.3.gz
@dirrmtry %%DATADIR%%/dic/canna
@dirrmtry %%DATADIR%%/dic
@dirrmtry %%DATADIR%%
More information about the svn-ports-all
mailing list