ports/97987: Maintainer Update: japanese/xyaku cleanup, take edict-utf-8

[David Thiel]

The following reply was made to PR ports/97987; it has been noted by GNATS.

From: David Thiel <lx at redundancy.redundancy.org>
To: FreeBSD-gnats-submit at FreeBSD.org, freebsd-ports-bugs at FreeBSD.org
Cc:  
Subject: Re: ports/97987: Maintainer Update: japanese/xyaku cleanup, take edict-utf-8
Date: Fri, 26 May 2006 13:57:03 -0659

 Actually, please use this diff for xyaku instead - I forgot a mkdir,
 but somehow "port test" passed successfully.
 
 diff -ruN xyaku.old/Makefile xyaku/Makefile
 --- xyaku.old/Makefile	Thu May 25 14:57:01 2006
 +++ xyaku/Makefile	Fri May 26 14:01:05 2006
 @@ -7,24 +7,32 @@
  
  PORTNAME=	xyaku
  PORTVERSION=	1.4.0
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	japanese textproc
 -MASTER_SITES=	http://home.catv.ne.jp/pp/ginoue/software/xyaku/
 +MASTER_SITES=	http://home.catv.ne.jp/pp/ginoue/software/xyaku/ \
 +		http://redundancy.redundancy.org/mirror/
  
  MAINTAINER=	lx at redundancy.redundancy.org
  COMMENT=	A general dictionary/search engine front-end for X
  
 -RUN_DEPENDS=	${EDICT_FILE}:${PORTSDIR}/japanese/edict \
 -		${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb
 +RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb
 +
 +OPTIONS=	UTF8 "Use UTF-8 edict dictionaries" on
 +
 +.if !defined(WITHOUT_UTF8)
 +EDICT_FILE=	${LOCALBASE}/share/dict/edict-utf-8/edict
 +RUN_DEPENDS+=	${EDICT_FILE}:${PORTSDIR}/japanese/edict-utf-8
 +.else
 +EDICT_FILE=	${LOCALBASE}/share/dict/edict/edict
 +RUN_DEPENDS+=	${EDICT_FILE}:${PORTSDIR}/japanese/edict
 +.endif
  
  USE_X_PREFIX=	yes
  USE_RUBY=	yes
  USE_AUTOTOOLS=	autoconf:213 libtool:15
  CONFIGURE_ARGS=	--with-edict="${EDICT_FILE}" \
 -		--with-ruby="${RUBY}" \
 -		--with-netscape="${LOCALBASE}/bin/netscape"
 +		--with-ruby="${RUBY}"
  
 -EDICT_FILE=	${LOCALBASE}/share/dict/edict/edict
  DOCS_EN=	AUTHORS ChangeLog INSTALL NEWS README TODO \
  		addin/ADDIN.ChangeLog addin/ADDIN.txt
  DOCS_JA=	addin/README.searcheb.ja
 @@ -34,12 +42,13 @@
  
  post-install:
  .if !defined(NOPORTDOCS)
 -	${MKDIR} ${PREFIX}/share/doc/xyaku/ja
 +	${MKDIR} ${DOCSDIR}
 +	${MKDIR} ${DOCSDIR}/ja
  .for f in ${DOCS_EN}
 -	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/xyaku/
 +	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
  .endfor
  .for f in ${DOCS_JA}
 -	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/xyaku/ja/
 +	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ja
  .endfor
  .endif
  
 diff -ruN xyaku.old/pkg-plist xyaku/pkg-plist
 --- xyaku.old/pkg-plist	Wed Jan  1 08:27:35 2003
 +++ xyaku/pkg-plist	Fri May 26 13:26:38 2006
 @@ -11,14 +11,14 @@
  libexec/xyaku/websearch.sh
  libexec/xyaku/xyakurc
  @dirrm libexec/xyaku
 -%%PORTDOCS%%share/doc/xyaku/ADDIN.txt
 -%%PORTDOCS%%share/doc/xyaku/ADDIN.ChangeLog
 -%%PORTDOCS%%share/doc/xyaku/AUTHORS
 -%%PORTDOCS%%share/doc/xyaku/ChangeLog
 -%%PORTDOCS%%share/doc/xyaku/INSTALL
 -%%PORTDOCS%%share/doc/xyaku/NEWS
 -%%PORTDOCS%%share/doc/xyaku/README
 -%%PORTDOCS%%share/doc/xyaku/TODO
 -%%PORTDOCS%%share/doc/xyaku/ja/README.searcheb.ja
 -%%PORTDOCS%%@dirrm share/doc/xyaku/ja
 -%%PORTDOCS%%@dirrm share/doc/xyaku
 +%%PORTDOCS%%%%DOCSDIR%%/ADDIN.txt
 +%%PORTDOCS%%%%DOCSDIR%%/ADDIN.ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 +%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 +%%PORTDOCS%%%%DOCSDIR%%/NEWS
 +%%PORTDOCS%%%%DOCSDIR%%/README
 +%%PORTDOCS%%%%DOCSDIR%%/TODO
 +%%PORTDOCS%%%%DOCSDIR%%/ja/README.searcheb.ja
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
 +%%PORTDOCS%%@dirrm %%DOCSDIR%%