Skip site navigation (1)Skip section navigation (2)
Date:      26 May 2006 20:39:03 -0000
From:      David Thiel <lx@redundancy.redundancy.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/97987: Maintainer Update: japanese/xyaku cleanup, take edict-utf-8
Message-ID:  <20060526203903.6456.qmail@redundancy.redundancy.org>
Resent-Message-ID: <200605262050.k4QKoG44081379@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         97987
>Category:       ports
>Synopsis:       Maintainer Update: japanese/xyaku cleanup, take edict-utf-8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 26 20:50:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     David Thiel
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD redundancy.redundancy.org 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386


>Description:

Updating japanese/xyaku with the following:

- Add mirror site
- OPTIONS-ify, adding UTF-8 edict as the default instead of EUC
- Remove obsolete netscape configure arg
- Use DOCSDIR macro

Also taking ownership of and unbreaking edict-utf-8, since this is a
dependency and needs a maintainer.

>How-To-Repeat:
>Fix:

diff -ruN xyaku.old/Makefile xyaku/Makefile
--- xyaku.old/Makefile	Thu May 25 14:57:01 2006
+++ xyaku/Makefile	Fri May 26 13:30:35 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@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,12 @@
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/xyaku/ja
+	${MKDIR} ${DOCSDIR}
 .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%%


diff -u edict-utf-8.old/Makefile edict-utf-8/Makefile
--- edict-utf-8.old/Makefile	Fri May 26 10:38:32 2006
+++ edict-utf-8/Makefile	Fri May 26 13:44:33 2006
@@ -7,7 +7,7 @@
 
 PORTNAME=	edict-utf-8
 PORTVERSION=	20050310
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.cc.monash.edu.au/pub/nihongo/ \
 		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
@@ -21,12 +21,10 @@
 DISTFILES=	${DICTFILES}
 EXTRACT_ONLY=	# intentionally left blank
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	Japanese-English edict UTF-8 dictionaries
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
-BROKEN=		Size mismatch
 
 USE_ICONV=	yes
 ICONV?=		iconv
diff -u edict-utf-8.old/distinfo edict-utf-8/distinfo
--- edict-utf-8.old/distinfo	Fri May 26 10:38:32 2006
+++ edict-utf-8/distinfo	Fri May 26 10:41:42 2006
@@ -1,38 +1,54 @@
-MD5 (edict/edict.gz) = f5c447af4eaf1e073804f0d935d84435
-SIZE (edict/edict.gz) = 1995732
+MD5 (edict/edict.gz) = 63d0759ca1dc5c1e266427bb7eac8d9e
+SHA256 (edict/edict.gz) = 0d3acd5c72fbf29525f345c297fb62ed07421d57564a6a8d83f243a104a4e7d3
+SIZE (edict/edict.gz) = 2184695
 MD5 (edict/edicth) = 522c9d10d8f1fa3e7ff0824c8f3a3eb7
+SHA256 (edict/edicth) = b1e50500cdff7005bb1155e82ed920e2f8e6648fbda10bf05d23242840621b1d
 SIZE (edict/edicth) = 3965
-MD5 (edict/enamdict.gz) = 83b56fc76b3027f26bcacf695cf7d027
-SIZE (edict/enamdict.gz) = 3898517
 MD5 (edict/compdic.gz) = 5e44bfbf35f976c6053eaaf70d960447
+SHA256 (edict/compdic.gz) = 9c33ceb7ef3c8a0ff30e58b138aa8f116ba99b5d65a8282fe8d758810471f0f5
 SIZE (edict/compdic.gz) = 225252
 MD5 (edict/jddict.v02.gz) = 54feca633fc2f1e29b673cb70f85b276
+SHA256 (edict/jddict.v02.gz) = 064687764f97fc344fcdaf8370d5c1792b08b5e48ed0ce78b9e817d504690e66
 SIZE (edict/jddict.v02.gz) = 201223
 MD5 (edict/j_places.gz) = a5241530ecfa6b415358cf0f472edfb1
+SHA256 (edict/j_places.gz) = 6fab609585c71bbd41de5832fb726090722c1309e40dbcb0043145755f2107fd
 SIZE (edict/j_places.gz) = 964036
 MD5 (edict/ediclsd3.zip) = f5619e83d73f3aab768c3483ca9be346
+SHA256 (edict/ediclsd3.zip) = 1812c90b4e373631a936921a538bd0b0eaccf250e1200c9ff730d3f0848863cf
 SIZE (edict/ediclsd3.zip) = 991369
 MD5 (edict/kanjidic.gz) = 19e69f226a1108ea3bd9a5657163465c
+SHA256 (edict/kanjidic.gz) = 94bf827894948c8e48a5724683d4bd6028d0cf3043c4354ebca1bb9a009a95b5
 SIZE (edict/kanjidic.gz) = 499608
 MD5 (edict/kanjd212.gz) = 04e9c0afb90c7f925a395c21354bd28d
+SHA256 (edict/kanjd212.gz) = 83ad11f62fa09047e2362135da6175e152516b673b8c66dafa068b9764813ec1
 SIZE (edict/kanjd212.gz) = 198415
 MD5 (edict/lawgledt.zip) = 5d55da32d03bdaf9ad92ee3b096ff320
+SHA256 (edict/lawgledt.zip) = b70584156499980dcaca540284c2f8bb24dbb476a57e6d7f6a644260bd3cff6a
 SIZE (edict/lawgledt.zip) = 133100
 MD5 (edict/lingdic.zip) = 1de53397af823ace8e296d3d8883a558
+SHA256 (edict/lingdic.zip) = c6ebb6567df6b841d6120f2de866881bd102b489215a52398f39f26058cfba37
 SIZE (edict/lingdic.zip) = 50837
 MD5 (edict/geodic.gz) = a0477c4f6fe10209e46ad433e85ea902
+SHA256 (edict/geodic.gz) = 48cf59a75366c35b1628d13994da9b23e091c9b66619ea0031b4cb5dfc665829
 SIZE (edict/geodic.gz) = 20982
 MD5 (edict/pandpdic.zip) = 22f73642e22aa90af9e0f5400100db5c
+SHA256 (edict/pandpdic.zip) = 183d8e05fc53cfbc02d09dee2cd6cf509aa11572ebe35421a8606ba4acb23ef6
 SIZE (edict/pandpdic.zip) = 14800
 MD5 (edict/aviation.zip) = 5092ece80ff75a087a7f3beb2a45ef96
+SHA256 (edict/aviation.zip) = 99cc61fee51ae963d6eb52c34fa8f52f2d966de6348efe208bbae2fdced318e9
 SIZE (edict/aviation.zip) = 27432
 MD5 (edict/findic.zip) = 0e8aedecf217eb696801b0528b04a63e
+SHA256 (edict/findic.zip) = ccded1ac5894089fb65a13dda0e09bdf8e38b1f7b9712d10a6478bd61282715d
 SIZE (edict/findic.zip) = 25093
 MD5 (edict/mktdic.zip) = e7719d9cd89b4dfe6efa57d43475d908
+SHA256 (edict/mktdic.zip) = 0c36e4c73354b9c5c184d41c578401757be25471407459002f58687d1dbbc096
 SIZE (edict/mktdic.zip) = 18560
 MD5 (edict/compverb.gz) = ae795bec98d24738c4279a8bfad6498b
+SHA256 (edict/compverb.gz) = 5c9be9a2cda979e394b5ba02d6ea598463c630d9caacd5ff960c007761bfdd91
 SIZE (edict/compverb.gz) = 28727
 MD5 (edict/4jwords.gz) = b6d3fb814a9df2e26aa7462b71633d7b
+SHA256 (edict/4jwords.gz) = 8c6d079ec7f2bd7a18d32859a93ecf1fae287da3de81e00cbd85d59ad5a680f1
 SIZE (edict/4jwords.gz) = 13608
 MD5 (edict/concrete.zip) = d70fec1ded1a93362940725abb10b8e5
+SHA256 (edict/concrete.zip) = 9691d1d6219747d656f6f778b554ad89be879e131d151c7d1b8089632b74b2cb
 SIZE (edict/concrete.zip) = 37491
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060526203903.6456.qmail>