From 3be1ecee1379a26e8c4953afde28d9d196c9be74 Mon Sep 17 00:00:00 2001
From: hrs <hrs@FreeBSD.org>
Date: Mon, 12 Apr 2010 04:14:10 +0000
Subject: Fix ownership/permissions of files in ${DATADIR}/dic when this port
 is added by pkg_add(1).

Spotted by:	WATANABE Kazuhiro
---
 japanese/canna-lib/Makefile     | 10 +++++++++-
 japanese/canna-lib/pkg-plist    |  2 ++
 japanese/canna-server/Makefile  |  8 +++++++-
 japanese/canna-server/pkg-plist |  2 ++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index b71794e..f0bf485 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	canna
 PORTVERSION=	3.7p3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	canna/9565/
@@ -24,11 +24,19 @@ USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 NO_INSTALL_MANPAGES=yes
 MAKE_JOBS_UNSAFE=	yes
+PLIST_SUB=	METAFILE="${METAFILE}" \
+		MTREE_CMD="${MTREE_CMD}"
 
 ALL_TARGET=	canna
 INSTALL_TARGET=	instsgs
 
+METAFILE=	${DATADIR_REL}/canna-lib-dic.meta
+
 post-configure:
 	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
 
+post-install:
+	${MTREE_CMD} -cdink uname,gname,mode,nochange \
+		-p ${DATADIR}/dic > ${PREFIX}/${METAFILE}
+
 .include <bsd.port.mk>
diff --git a/japanese/canna-lib/pkg-plist b/japanese/canna-lib/pkg-plist
index 26ec14a..7336315 100644
--- a/japanese/canna-lib/pkg-plist
+++ b/japanese/canna-lib/pkg-plist
@@ -62,6 +62,8 @@ lib/libcanna16.so.1
 %%DATADIR%%/sample/verbose.canna
 %%DATADIR%%/sample/vje.canna
 %%DATADIR%%/sample/wx2+.canna
+%%METAFILE%%
+@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
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index a8b54f2..4b47e56 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	canna
 PORTVERSION=	3.7p3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	canna/9565/
@@ -25,6 +25,8 @@ USE_RC_SUBR=	canna.sh
 USE_BZIP2=	yes
 ALL_TARGET=	canna
 INSTALL_TARGET=	instserver instclient
+PLIST_SUB=	METAFILE="${METAFILE}" \
+		MTREE_CMD="${MTREE_CMD}"
 
 PORTDOCS=	canna.bib canna.sty Imakefile README.jp Makefile \
 		intern lisp man
@@ -46,11 +48,15 @@ MAN3=	RkCloseRoma.3 RkCvtEuc.3 RkCvtHan.3 RkCvtHira.3 RkCvtKana.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
+
 post-configure:
 	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
 
 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}
diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index 0e5c383..490dc45 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -47,6 +47,8 @@ bin/wtoc
 %%DATADIR%%/dic/canna/suffix.ctd
 sbin/cannaserver
 sbin/cannakill
+%%METAFILE%%
+@exec %%MTREE_CMD%% -qU -f %D/%%METAFILE%% -p %D/%%DATADIR%%/dic > /dev/null 2>&1
 @dirrmtry %%DATADIR%%/dic/canna
 @dirrmtry %%DATADIR%%/dic/user/user
 @dirrmtry %%DATADIR%%/dic/user
-- 
cgit v1.1