From 3615f9feb27eecad690e2ceb47115c4f32c4c631 Mon Sep 17 00:00:00 2001 From: uebayasi Date: Thu, 14 Mar 2002 13:54:04 +0000 Subject: Update EB from 3.0 to 3.2.1. * Fix a bug in text read routine when using 'appendix'. * Import zlib-1.1.4. * If the EB_DEBUG environment variable is defined, EB Library outputs messages for debugging. `--enable-debug' option of configure is removed. * Fix a critical bug in decompression of EBZIP compression format. * The maximum compression level of ebzip is changed from 3 to 5. * Implement eb_backward_text() and revise eb_forward_text(). * The EB Library programming document (Japanese edition) is back. * Fix bugs in compressed S-EBXA support. * Add debug codes. Those codes are enabled by `configure --enable-debug'. * Rename eb_initialize_all_subbooks() to eb_load_all_subbooks(), and eb_initialize_all_appendix_subbooks() to eb_load_all_appendix_subbooks(). For backward compatibility, the old function names are defined as cpp macros. * Support for DUDEN EBG CD-ROMs is back. * Fix a bug in handling of CD-ROM mounted on the root directory. * Overhaul initialization and finalization routines in the library. * Support compressed S-EBXA CD-ROM book. Support Nippon daihyakka zensho, accessories to Sony DataDiscMan DP-S1000. * New appendices (crownfj2, crowngj). * And many bug fixes. Besides, add a brand new buildlink.mk. --- textproc/eb/Makefile | 42 +++++++++++++++++++++---------------- textproc/eb/PLIST | 54 ++++++++++++++++++++++++++++-------------------- textproc/eb/buildlink.mk | 36 ++++++++++++++++++++++++++++++++ textproc/eb/distinfo | 10 ++++++--- 4 files changed, 99 insertions(+), 43 deletions(-) create mode 100644 textproc/eb/buildlink.mk (limited to 'textproc/eb') diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile index 6d77ef56169..2cdf153f328 100644 --- a/textproc/eb/Makefile +++ b/textproc/eb/Makefile @@ -1,27 +1,30 @@ -# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:42 seb Exp $ +# $NetBSD: Makefile,v 1.6 2002/03/14 13:54:04 uebayasi Exp $ # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp -DISTNAME= eb-3.0 +DISTNAME= eb-3.2.1 CATEGORIES= textproc japanese MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/appendix/ \ ftp://ftp.sra.co.jp/pub/misc/eb/ -DISTFILES= ${EBFILES} \ - ${LISTFILES} \ - ${APPENDIXFILES} +DISTFILES= ${EB_DISTFILES} \ + ${EB_LISTS} \ + ${EB_APPENDICES} MAINTAINER= uebayasi@soum.co.jp HOMEPAGE= http://www.sra.co.jp/people/m-kasahr/eb/ COMMENT= C library for accessing EB, EBG, EBXA and EPWING CD-ROM dictionaries -EBFILES= ${DISTNAME}${EXTRACT_SUFX} -LISTFILES= LIST \ +EB_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +EB_LISTS= LIST \ LIST-ja -APPENDIXFILES= cencro-1.0.tar.gz \ +EB_APPENDICES= \ + cencro-1.0.tar.gz \ chujiten-2.3.tar.gz \ chujiten2-2.0.tar.gz \ chujiten6-2.3.tar.gz \ colloc-2.0.tar.gz \ crownfj-2.0.tar.gz \ + crownfj2-1.0.tar.gz \ + crowngj-1.0.tar.gz \ daihyakka-1.0.tar.gz \ daijirin-2.0.tar.gz \ dd75-2.0.tar.gz \ @@ -41,26 +44,29 @@ APPENDIXFILES= cencro-1.0.tar.gz \ readers-2.2.tar.gz \ readers2-2.0.tar.gz \ superdic98-1.0.tar.gz -EXTRACT_ONLY= ${EBFILES} +EXTRACT_ONLY= ${EB_DISTFILES} DIST_SUBDIR= eb -USE_BUILDLINK_ONLY= yes -USE_LIBTOOL= yes -GNU_CONFIGURE= yes +USE_BUILDLINK_ONLY= # Defined +USE_LIBTOOL= # Defined +GNU_CONFIGURE= # Defined CONFIGURE_ARGS+= --with-zlib -USE_GMAKE= yes +USE_GMAKE= # Defined +TEXINFO_OVERRIDE= YES +# For patterns like '... (install-info ...) ...' +TEXINFO_SUBST_SED+= -e "s!^\( .*\)\([ '(]\)install-info\([ ]\)!\1\2${INSTALL_INFO}\3!g" -APPENDIXDIR= ${PREFIX}/share/eb/appendix +EB_APPENDIXDIR= ${PREFIX}/share/eb/appendix post-extract: cd ${WRKSRC} && ${RM} -rf zlib post-install: - for f in ${LISTFILES}; do \ - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$f ${APPENDIXDIR}; \ + for f in ${EB_LISTS}; do \ + ${INSTALL_DATA} ${_DISTDIR}/$${f} ${EB_APPENDIXDIR}; \ done - for f in ${APPENDIXFILES}; do \ - ${GTAR} -C ${APPENDIXDIR} -zxmf ${DISTDIR}/${DIST_SUBDIR}/$$f; \ + for f in ${EB_APPENDICES}; do \ + ${GTAR} -C ${EB_APPENDIXDIR} -zxmf ${_DISTDIR}/$${f}; \ done .include "../../devel/gettext-lib/buildlink.mk" diff --git a/textproc/eb/PLIST b/textproc/eb/PLIST index 9e37e56f9e9..a757e500777 100644 --- a/textproc/eb/PLIST +++ b/textproc/eb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:43 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/03/14 13:54:04 uebayasi Exp $ bin/ebappendix bin/ebfont bin/ebinfo @@ -6,6 +6,7 @@ bin/ebrefile bin/ebunzip bin/ebzip bin/ebzipinfo +etc/eb.conf include/eb/appendix.h include/eb/binary.h include/eb/defs.h @@ -14,14 +15,14 @@ include/eb/error.h include/eb/font.h include/eb/text.h include/eb/zio.h -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebfont-ja.info -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebfont.info -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebinfo-ja.info -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebinfo.info -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebrefile-ja.info -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebrefile.info -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebzip-ja.info -@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebzip.info +@unexec install-info --delete --info-dir=%D/info %D/info/ebfont-ja.info +@unexec install-info --delete --info-dir=%D/info %D/info/ebfont.info +@unexec install-info --delete --info-dir=%D/info %D/info/ebinfo-ja.info +@unexec install-info --delete --info-dir=%D/info %D/info/ebinfo.info +@unexec install-info --delete --info-dir=%D/info %D/info/ebrefile-ja.info +@unexec install-info --delete --info-dir=%D/info %D/info/ebrefile.info +@unexec install-info --delete --info-dir=%D/info %D/info/ebzip-ja.info +@unexec install-info --delete --info-dir=%D/info %D/info/ebzip.info info/ebfont-ja.info info/ebfont.info info/ebinfo-ja.info @@ -30,19 +31,19 @@ info/ebrefile-ja.info info/ebrefile.info info/ebzip-ja.info info/ebzip.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebzip-ja.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebrefile.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebrefile-ja.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebinfo.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebinfo-ja.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebfont.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebfont-ja.info -@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebzip.info +@exec install-info --info-dir=%D/info %D/info/ebzip-ja.info +@exec install-info --info-dir=%D/info %D/info/ebrefile.info +@exec install-info --info-dir=%D/info %D/info/ebrefile-ja.info +@exec install-info --info-dir=%D/info %D/info/ebinfo.info +@exec install-info --info-dir=%D/info %D/info/ebinfo-ja.info +@exec install-info --info-dir=%D/info %D/info/ebfont.info +@exec install-info --info-dir=%D/info %D/info/ebfont-ja.info +@exec install-info --info-dir=%D/info %D/info/ebzip.info lib/libeb.a lib/libeb.la lib/libeb.so -lib/libeb.so.4 -lib/libeb.so.4.0 +lib/libeb.so.6 +lib/libeb.so.6.1 share/eb/appendix/LIST share/eb/appendix/LIST-ja share/eb/appendix/cencro-1.0/catalog @@ -73,6 +74,14 @@ share/eb/appendix/crownfj-2.0/crown_fj.app share/eb/appendix/crownfj-2.0/crown_fj/data/furoku share/eb/appendix/crownfj-2.0/daily_ei.app share/eb/appendix/crownfj-2.0/daily_ei/data/furoku +share/eb/appendix/crownfj2-1.0/catalog +share/eb/appendix/crownfj2-1.0/catalog.app +share/eb/appendix/crownfj2-1.0/crfre.app +share/eb/appendix/crownfj2-1.0/crfre/appendix +share/eb/appendix/crowngj-1.0/catalog.app +share/eb/appendix/crowngj-1.0/crger.app +share/eb/appendix/crowngj-1.0/catalog +share/eb/appendix/crowngj-1.0/crger/appendix share/eb/appendix/daihyakka-1.0/catalog share/eb/appendix/daihyakka-1.0/catalog.app share/eb/appendix/daihyakka-1.0/dhk01.app @@ -201,9 +210,6 @@ share/eb/appendix/superdic98-1.0/kanjigen/data/furoku share/eb/appendix/superdic98-1.0/koujien.app share/eb/appendix/superdic98-1.0/koujien/data/furoku share/eb/eb3.m4 -share/eb/ssizet.m4 -share/locale/ja/LC_MESSAGES/eb.mo -share/locale/ja/LC_MESSAGES/ebutils.mo @dirrm share/eb/appendix/superdic98-1.0/koujien/data @dirrm share/eb/appendix/superdic98-1.0/koujien @dirrm share/eb/appendix/superdic98-1.0/kanjigen/data @@ -289,6 +295,10 @@ share/locale/ja/LC_MESSAGES/ebutils.mo @dirrm share/eb/appendix/daijirin-2.0 @dirrm share/eb/appendix/daihyakka-1.0/dhk01 @dirrm share/eb/appendix/daihyakka-1.0 +@dirrm share/eb/appendix/crowngj-1.0/crger +@dirrm share/eb/appendix/crowngj-1.0 +@dirrm share/eb/appendix/crownfj2-1.0/crfre +@dirrm share/eb/appendix/crownfj2-1.0 @dirrm share/eb/appendix/crownfj-2.0/daily_ei/data @dirrm share/eb/appendix/crownfj-2.0/daily_ei @dirrm share/eb/appendix/crownfj-2.0/crown_fj/data diff --git a/textproc/eb/buildlink.mk b/textproc/eb/buildlink.mk new file mode 100644 index 00000000000..a77817543ac --- /dev/null +++ b/textproc/eb/buildlink.mk @@ -0,0 +1,36 @@ +# $NetBSD: buildlink.mk,v 1.1 2002/03/14 13:54:04 uebayasi Exp $ +# +# This Makefile fragment is included by packages that use EB. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.eb to the dependency pattern +# for the version of eb desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(EB_BUILDLINK_MK) +EB_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +# 3.2.0 had an 'appendix' bug, so bump the base version. +BUILDLINK_DEPENDS.eb?= eb>=3.2.1 + +EVAL_PREFIX+= BUILDLINK_PREFIX.eb=eb +#BUILDLINK_PREFIX.png_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.eb= include/eb/*.h +BUILDLINK_FILES.eb+= lib/libeb.* + +BUILDLINK_TARGETS.eb= eb-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.eb} + +.include "../../mk/bsd.prefs.mk" + +pre-configure: ${BUILDLINK_TARGETS.eb} +eb-buildlink: _BUILDLINK_USE + +.endif # EB_BUILDLINK_MK diff --git a/textproc/eb/distinfo b/textproc/eb/distinfo index 2d5cf2c37ea..65192507c4a 100644 --- a/textproc/eb/distinfo +++ b/textproc/eb/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/06/20 06:27:19 jtb Exp $ +$NetBSD: distinfo,v 1.3 2002/03/14 13:54:05 uebayasi Exp $ -SHA1 (eb/eb-3.0.tar.gz) = e9899310fc4e111c568373b43ca88fc6c15ea4dd -Size (eb/eb-3.0.tar.gz) = 869167 bytes +SHA1 (eb/eb-3.2.1.tar.gz) = 1e34957cbb8e689e7e48f0d54c912acef7ddd455 +Size (eb/eb-3.2.1.tar.gz) = 998191 bytes SHA1 (eb/LIST) = 03cc7f7c41b415fd7ea9c119ee1cb9c445617cdd Size (eb/LIST) = 9136 bytes SHA1 (eb/LIST-ja) = f21e7765c637ad13beb8171edf70b0587f298e19 @@ -18,6 +18,10 @@ SHA1 (eb/colloc-2.0.tar.gz) = 48159f17792416d55b5055b7b02136e756357a3b Size (eb/colloc-2.0.tar.gz) = 1313 bytes SHA1 (eb/crownfj-2.0.tar.gz) = 19317cc4c0391ee0c6f95f552b1c47a56c4484f5 Size (eb/crownfj-2.0.tar.gz) = 4463 bytes +SHA1 (eb/crownfj2-1.0.tar.gz) = 04fb0ebd074a51091d8e45000ac429fafcbd6168 +Size (eb/crownfj2-1.0.tar.gz) = 2164 bytes +SHA1 (eb/crowngj-1.0.tar.gz) = 2d3318c878cba97f8d2b31e42025f2d9e7651306 +Size (eb/crowngj-1.0.tar.gz) = 2155 bytes SHA1 (eb/daihyakka-1.0.tar.gz) = 99ad06bb7dcd68ea6713f5d9d71ecc567f9bb2cd Size (eb/daihyakka-1.0.tar.gz) = 3748 bytes SHA1 (eb/daijirin-2.0.tar.gz) = 0a4dd911fb196155fae32904873bd3a21060f4d5 -- cgit v1.2.3