From b90338386ac6ab26515ce8bf10029ee8e30d723e Mon Sep 17 00:00:00 2001 From: rafan Date: Fri, 19 Jan 2007 11:05:14 +0000 Subject: - Update to 2.25.6 - Add patches to fix build on gcc 4.x - Update WWW --- chinese/vflib/Makefile | 8 +++--- chinese/vflib/distinfo | 6 ++--- chinese/vflib/files/patch-src-VF_FNTWV.c | 39 +++++++++++++++++++++++++++++ chinese/vflib/files/patch-src-fman.c | 43 ++++++++++++++++++++++++++++++++ chinese/vflib/pkg-descr | 4 +-- chinese/vflib/pkg-plist | 1 - 6 files changed, 91 insertions(+), 10 deletions(-) create mode 100644 chinese/vflib/files/patch-src-VF_FNTWV.c create mode 100644 chinese/vflib/files/patch-src-fman.c (limited to 'chinese') diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile index 7da99e542603..a4e8102d498f 100644 --- a/chinese/vflib/Makefile +++ b/chinese/vflib/Makefile @@ -23,7 +23,7 @@ COMMENT= Vector font library with free vector font, BIG5 and GB supported BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} -VFLIB_VERSION= 2.25.1 +VFLIB_VERSION= 2.25.6 PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION} DATADIR= ${TARGETDIR}/share/VFlib @@ -34,6 +34,7 @@ CONFIGURE_ARGS= --with-freetype \ USE_FREETYPE= yes USE_XLIB= yes USE_LDCONFIG= yes +USE_GETTEXT= yes .include @@ -42,16 +43,15 @@ pre-patch: post-patch: ${REINPLACE_CMD} -e "s,varargs.h,stdarg.h," ${WRKSRC}/tools/disol.c + ${REINPLACE_CMD} -e "s,^vflib2_version=.*,vflib2_version='${VFLIB_VERSION}'," ${WRKSRC}/configure -pre-install: +post-install: @(cd ${WRKSRC}/tools; \ ${INSTALL_SCRIPT} fmtest disol kban vfperf vftest ${TARGETDIR}/bin) @(cd ${WRKSRC}; \ ${MKDIR} ${DATADIR}/${VFLIB_VERSION} ;\ ${CP} COPYING COPYING.LIB README.txt.JP_EUC \ ${DATADIR}/${VFLIB_VERSION}) - -post-install: ${MV} ${DATADIR}/${VFLIB_VERSION}/VF.h ${TARGETDIR}/include .include diff --git a/chinese/vflib/distinfo b/chinese/vflib/distinfo index 668ded533343..cffe455e8151 100644 --- a/chinese/vflib/distinfo +++ b/chinese/vflib/distinfo @@ -1,6 +1,6 @@ -MD5 (VFlib2-2.25.1.tar.gz) = 533bd3b39e1e2b883b5a6b5c14443c93 -SHA256 (VFlib2-2.25.1.tar.gz) = e53cf5e8a7284ad857492ac9b7f12f24e97fd9c6a15aa0389355419c16af682d -SIZE (VFlib2-2.25.1.tar.gz) = 653886 +MD5 (VFlib2-2.25.6.tar.gz) = 64899702c94ce059069a5532098d5937 +SHA256 (VFlib2-2.25.6.tar.gz) = 034055126e446b6b9d148d49a536e975f84e631669b0d3cb3840e37a31c565b0 +SIZE (VFlib2-2.25.6.tar.gz) = 677784 MD5 (zh-vfontcap.in) = 4738e8c2cb06f46f9c0d03b8babcc77d SHA256 (zh-vfontcap.in) = c900043141f2fb154aeaa617588b5b069db786dee4c31329c4d5c3d25fefe7c8 SIZE (zh-vfontcap.in) = 27007 diff --git a/chinese/vflib/files/patch-src-VF_FNTWV.c b/chinese/vflib/files/patch-src-VF_FNTWV.c new file mode 100644 index 000000000000..ec90219606b7 --- /dev/null +++ b/chinese/vflib/files/patch-src-VF_FNTWV.c @@ -0,0 +1,39 @@ +--- src/VF_FNTWV.c.orig Fri Jan 19 03:46:07 2007 ++++ src/VF_FNTWV.c Fri Jan 19 03:47:04 2007 +@@ -175,7 +175,9 @@ + Private int read_word(); + Private long read_long(); + +- ++Private int ReadCapa(); ++Private int FNTWVOpenFont(); ++Private int FNTWVCloseFont(); + + Public FontObj* + CreateFont_FontWave(ent) +@@ -183,7 +185,6 @@ + { + Font *font; + FontObj *fobj; +- Private int ReadCapa(); + + if ((font = (Font*) malloc(sizeof(Font))) == NULL){ + printf("in CreateFont malloc() Error!\n"); +@@ -221,8 +222,6 @@ + OpenFont(obj) + FontObj *obj; + { +- Private int FNTWVOpenFont(); +- + return FNTWVOpenFont((Font*) obj->Locals); + } + +@@ -231,8 +230,6 @@ + CloseFont(obj) + FontObj *obj; + { +- Private int FNTWVCloseFont(); +- + return FNTWVCloseFont((Font*) obj->Locals); + } + diff --git a/chinese/vflib/files/patch-src-fman.c b/chinese/vflib/files/patch-src-fman.c new file mode 100644 index 000000000000..fdf4eff14121 --- /dev/null +++ b/chinese/vflib/files/patch-src-fman.c @@ -0,0 +1,43 @@ +--- src/fman.c.orig Fri Jan 19 03:42:46 2007 ++++ src/fman.c Fri Jan 19 03:44:56 2007 +@@ -392,13 +392,13 @@ + Private CACHE *RequireCache(); + Private int LRUMoveTop(); + Private int LRUPutTop(); ++Private int LRUPutTop2(); + Private int LRUDeleteTail(); ++Private void ReturnCache(); + Private CACHE *HashIsInterned(); + Private int HashInternIt(); + Private int HashUninternIt(); + +- +- + /* + * InitCache() - Init cache. Must specify cache size and hash table size. + * Returns FALSE if out of memory or other fatal error. +@@ -480,7 +480,6 @@ + int port; + { + CACHE *cptr; +- Private void ReturnCache(); + + if ((cptr = RequireCache()) == (CACHE*)NULL){ + fprintf(stderr, "VFlib: CacheIt() - error\n"); +@@ -542,7 +541,6 @@ + CACHE *cptr; + { + CACHE *cptr_b, *cptr_f; +- Private int LRUPutTop2(); + + cptr_b = cptr->l_back; + cptr_f = cptr->l_forw; +@@ -558,8 +556,6 @@ + LRUPutTop(cptr) + CACHE *cptr; + { +- Private int LRUPutTop2(); +- + return LRUPutTop2(cptr, TRUE); + } + diff --git a/chinese/vflib/pkg-descr b/chinese/vflib/pkg-descr index 50112bcd593f..48829dc1c4fc 100644 --- a/chinese/vflib/pkg-descr +++ b/chinese/vflib/pkg-descr @@ -5,6 +5,6 @@ hinting information in TrueType, so clearer output is possible. See /usr/local/lib/VFlib/doc/man.ps (in Japanese) or the following URL for more details. -WWW: http://TypeHack.aial.hiroshima-u.ac.jp/VFlib/ - This port can use Chinese BIG5 and GB encoded fonts. + +WWW: http://www-masu.ist.osaka-u.ac.jp/~kakugawa/VFlib/ diff --git a/chinese/vflib/pkg-plist b/chinese/vflib/pkg-plist index 390f4e4f2679..c85bf9c48c0c 100644 --- a/chinese/vflib/pkg-plist +++ b/chinese/vflib/pkg-plist @@ -7,7 +7,6 @@ %%DATADIR%%/%%VFLIB_VERSION%%/man.dvi %%DATADIR%%/%%VFLIB_VERSION%%/man.ps %%DATADIR%%/%%VFLIB_VERSION%%/vfontcap -%%DATADIR%%/%%VFLIB_VERSION%%/vfontcap.ORG %%DATADIR%%/%%VFLIB_VERSION%%/vfontcap.bdf %%DATADIR%%/%%VFLIB_VERSION%%/vfontcap.comp2 %%DATADIR%%/%%VFLIB_VERSION%%/vfontcap.mgp -- cgit