From 60cf0aedd01eeabec08193611d3dfd1a0bb633db Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Mon, 29 Sep 2003 07:44:28 +0000 Subject: Update sary to 1.1.0 and ruby-sary to 0.5. Increase p5-Search-Saryer's PORTREVISION for the shared library version bump. Submitted by: Gen Otsuji --- textproc/p5-Search-Saryer/Makefile | 3 +- textproc/p5-Search-Saryer/files/patch-Makefile.PL | 13 ++ textproc/p5-Search-Saryer/files/patch-Saryer.xs | 137 ++++++++++++++++++++++ textproc/ruby-sary/Makefile | 6 +- textproc/ruby-sary/distinfo | 2 +- textproc/sary/Makefile | 14 ++- textproc/sary/distinfo | 2 +- textproc/sary/files/patch-Makefile.am | 16 +++ textproc/sary/files/patch-Makefile.in | 11 -- textproc/sary/pkg-plist | 6 +- 10 files changed, 184 insertions(+), 26 deletions(-) create mode 100644 textproc/p5-Search-Saryer/files/patch-Makefile.PL create mode 100644 textproc/p5-Search-Saryer/files/patch-Saryer.xs create mode 100644 textproc/sary/files/patch-Makefile.am delete mode 100644 textproc/sary/files/patch-Makefile.in (limited to 'textproc') diff --git a/textproc/p5-Search-Saryer/Makefile b/textproc/p5-Search-Saryer/Makefile index c08ad8b5616f..8986d7f70694 100644 --- a/textproc/p5-Search-Saryer/Makefile +++ b/textproc/p5-Search-Saryer/Makefile @@ -7,6 +7,7 @@ PORTNAME= Search-Saryer PORTVERSION= 0.10 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= ftp://ftp.namazu.org/sary/perl/ PKGNAMEPREFIX= p5- @@ -14,7 +15,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= knu@FreeBSD.org COMMENT= Perl interface to the Sary library -LIB_DEPENDS= sary.8:${PORTSDIR}/textproc/sary +LIB_DEPENDS= sary.9:${PORTSDIR}/textproc/sary PERL_CONFIGURE= yes diff --git a/textproc/p5-Search-Saryer/files/patch-Makefile.PL b/textproc/p5-Search-Saryer/files/patch-Makefile.PL new file mode 100644 index 000000000000..7ee722cc26aa --- /dev/null +++ b/textproc/p5-Search-Saryer/files/patch-Makefile.PL @@ -0,0 +1,13 @@ +--- Makefile.PL.orig Wed Sep 17 21:05:42 2003 ++++ Makefile.PL Wed Sep 17 21:06:03 2003 +@@ -8,8 +8,8 @@ + + use ExtUtils::MakeMaker; + +-$cflags = `sary-config --cflags`; +-$libs = `sary-config --libs`; ++$cflags = `pkg-config --cflags sary`; ++$libs = `pkg-config --libs sary`; + + WriteMakefile( + 'NAME' => 'Search::Saryer', diff --git a/textproc/p5-Search-Saryer/files/patch-Saryer.xs b/textproc/p5-Search-Saryer/files/patch-Saryer.xs new file mode 100644 index 000000000000..a3f69a6600b3 --- /dev/null +++ b/textproc/p5-Search-Saryer/files/patch-Saryer.xs @@ -0,0 +1,137 @@ +--- Saryer.xs.orig Mon Dec 18 13:32:42 2000 ++++ Saryer.xs Wed Sep 17 21:50:19 2003 +@@ -36,11 +36,11 @@ + char *filename + + PREINIT: +- Saryer *saryer; ++ SarySearcher *saryer; + SV *sv; + + CODE: +- saryer = saryer_new(filename); ++ saryer = sary_searcher_new(filename); + if (saryer == NULL) { + RETVAL = &PL_sv_undef; + } else { +@@ -56,22 +56,22 @@ + IV saryer + + PREINIT: +- Saryer *ps; ++ SarySearcher *ps; + + CODE: +- ps = (Saryer *) saryer; +- saryer_destroy(ps); ++ ps = (SarySearcher *) saryer; ++ sary_searcher_destroy(ps); + + void + perl_saryer_enable_cache(saryer) + IV saryer + + PREINIT: +- Saryer *ps; ++ SarySearcher *ps; + + CODE: +- ps = (Saryer *) saryer; +- saryer_enable_cache(ps); ++ ps = (SarySearcher *) saryer; ++ sary_searcher_enable_cache(ps); + + SV * + perl_saryer_search(saryer, pat) +@@ -79,12 +79,12 @@ + char *pat + + PREINIT: +- Saryer *ps; ++ SarySearcher *ps; + gboolean ret; + + CODE: +- ps = (Saryer *) saryer; +- ret = saryer_search(ps, pat); ++ ps = (SarySearcher *) saryer; ++ ret = sary_searcher_search(ps, pat); + if (ret) { + RETVAL = newSVnv(1); + } else { +@@ -100,12 +100,12 @@ + char *pat + + PREINIT: +- Saryer *ps; ++ SarySearcher *ps; + gboolean ret; + + CODE: +- ps = (Saryer *) saryer; +- ret = saryer_icase_search(ps, pat); ++ ps = (SarySearcher *) saryer; ++ ret = sary_searcher_icase_search(ps, pat); + if (ret) { + RETVAL = newSVnv(1); + } else { +@@ -120,12 +120,12 @@ + IV saryer + + PREINIT: +- Saryer *ps; ++ SarySearcher *ps; + char *ret; + + CODE: +- ps = (Saryer *) saryer; +- ret = saryer_get_next_line(ps); ++ ps = (SarySearcher *) saryer; ++ ret = sary_searcher_get_next_line(ps); + if (ret) { + RETVAL = newSVpv(ret, 0); + g_free(ret); +@@ -143,12 +143,12 @@ + int fw + + PREINIT: +- Saryer *ps; ++ SarySearcher *ps; + char *ret; + + CODE: +- ps = (Saryer *) saryer; +- ret = saryer_get_next_context_lines(ps, bw, fw); ++ ps = (SarySearcher *) saryer; ++ ret = sary_searcher_get_next_context_lines(ps, bw, fw); + if (ret) { + RETVAL = newSVpv(ret, 0); + g_free(ret); +@@ -166,12 +166,12 @@ + char *etag + + PREINIT: +- Saryer *ps; ++ SarySearcher *ps; + char *ret; + + CODE: +- ps = (Saryer *) saryer; +- ret = saryer_get_next_tagged_region(ps, stag, etag); ++ ps = (SarySearcher *) saryer; ++ ret = sary_searcher_get_next_tagged_region(ps, stag, etag); + if (ret) { + RETVAL = newSVpv(ret, 0); + g_free(ret); +@@ -187,8 +187,8 @@ + IV saryer + + PREINIT: +- Saryer *ps; ++ SarySearcher *ps; + + CODE: +- ps = (Saryer *) saryer; +- saryer_sort_occurrences(ps); ++ ps = (SarySearcher *) saryer; ++ sary_searcher_sort_occurrences(ps); diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile index 0778b2695d0c..329cc0db7af0 100644 --- a/textproc/ruby-sary/Makefile +++ b/textproc/ruby-sary/Makefile @@ -6,9 +6,9 @@ # PORTNAME= sary -PORTVERSION= 0.4 +PORTVERSION= 0.5 CATEGORIES= textproc ruby -MASTER_SITES= ftp://ftp.namazu.org/sary/ruby/ +MASTER_SITES= http://prime.sourceforge.jp/freebsd/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-ruby-${PORTVERSION} DIST_SUBDIR= ruby @@ -16,7 +16,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= A Ruby interface to the Sary library -LIB_DEPENDS= sary.8:${PORTSDIR}/textproc/sary +LIB_DEPENDS= sary.9:${PORTSDIR}/textproc/sary USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/textproc/ruby-sary/distinfo b/textproc/ruby-sary/distinfo index 22ac249a0cd1..996f995dfb82 100644 --- a/textproc/ruby-sary/distinfo +++ b/textproc/ruby-sary/distinfo @@ -1 +1 @@ -MD5 (ruby/sary-ruby-0.4.tar.gz) = 755868feefbc530e9e0211d1448ffcaa +MD5 (ruby/sary-ruby-0.5.tar.gz) = de28199330d8b5d95a2eaba4f019b79a diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile index fb9880d76c16..7c202072170c 100644 --- a/textproc/sary/Makefile +++ b/textproc/sary/Makefile @@ -6,9 +6,9 @@ # PORTNAME= sary -PORTVERSION= 1.0.4 +PORTVERSION= 1.1.0 CATEGORIES= textproc -MASTER_SITES= http://sary.namazu.org/stable/ +MASTER_SITES= http://prime.sourceforge.jp/freebsd/ MAINTAINER= knu@FreeBSD.org COMMENT= A suffix array library and tools, which provide fast full-text search @@ -17,16 +17,20 @@ USE_GNOME= glib12 gnomehack USE_REINPLACE= yes GNU_CONFIGURE= yes +USE_AUTOMAKE_VER= 15 +AUTOMAKE_ARGS= -a USE_LIBTOOL= yes +LIBTOOLFILES= INSTALLS_SHLIB= yes MAN1= sary.1 mksary.1 +pre-configure: + @cd ${WRKSRC} && ${ACLOCAL} && ${LIBTOOLIZE} && ${AUTOHEADER} + post-patch: - ${REINPLACE_CMD} -e 's,glib-config,${GLIB_CONFIG},g' \ - ${WRKSRC}/configure ${WRKSRC}/sary-config.in .if !defined(NOPORTDOCS) - ${FIND} ${WRKSRC}/docs -type f -name 'Makefile.in' | \ + ${FIND} ${WRKSRC}/docs -type f -name 'Makefile.am' | \ ${XARGS} ${REINPLACE_CMD} \ -e 's,^docsdir = .*,docsdir = \$$(datadir)/doc/sary,' .endif diff --git a/textproc/sary/distinfo b/textproc/sary/distinfo index 104a6aa39e90..212ea5f4254c 100644 --- a/textproc/sary/distinfo +++ b/textproc/sary/distinfo @@ -1 +1 @@ -MD5 (sary-1.0.4.tar.gz) = 07ee632e18b8f761acc6c095d4cb549a +MD5 (sary-1.1.0.tar.gz) = 842117e74ec01756d86ef9201ccef0af diff --git a/textproc/sary/files/patch-Makefile.am b/textproc/sary/files/patch-Makefile.am new file mode 100644 index 000000000000..6228c57c688b --- /dev/null +++ b/textproc/sary/files/patch-Makefile.am @@ -0,0 +1,16 @@ +--- Makefile.am.orig Tue Oct 22 11:18:18 2002 ++++ Makefile.am Mon Sep 15 00:32:46 2003 +@@ -5,11 +5,11 @@ + + AUTOMAKE_OPTIONS = 1.4 no-dependencies + +-SUBDIRS = . docs man sary src tests debian ++SUBDIRS = . man sary src + + include_HEADERS = sary.h + +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = sary.pc + + EXTRA_DIST = sary.pc.in sary.spec.in sary.spec diff --git a/textproc/sary/files/patch-Makefile.in b/textproc/sary/files/patch-Makefile.in deleted file mode 100644 index d3c3f06d1822..000000000000 --- a/textproc/sary/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Fri Aug 23 01:39:41 2002 -+++ Makefile.in Tue Oct 8 21:43:06 2002 -@@ -90,7 +90,7 @@ - - AUTOMAKE_OPTIONS = 1.4 no-dependencies - --SUBDIRS = . docs man sary src tests debian -+SUBDIRS = . man sary src - - include_HEADERS = sary.h - diff --git a/textproc/sary/pkg-plist b/textproc/sary/pkg-plist index f5e66d521862..c8cb5a79c717 100644 --- a/textproc/sary/pkg-plist +++ b/textproc/sary/pkg-plist @@ -1,6 +1,5 @@ bin/mksary bin/sary -bin/sary-config include/sary.h include/sary/array.h include/sary/bsearch.h @@ -13,7 +12,7 @@ include/sary/mkqsort.h include/sary/mmap.h include/sary/progress.h include/sary/saryconfig.h -include/sary/saryer.h +include/sary/searcher.h include/sary/sorter.h include/sary/str.h include/sary/text.h @@ -22,10 +21,9 @@ include/sary/writer.h lib/libsary.a lib/libsary.la lib/libsary.so -lib/libsary.so.8 +lib/libsary.so.9 libdata/pkgconfig/sary.pc @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true -share/aclocal/sary.m4 %%PORTDOCS%%share/doc/sary/en/libsary.html %%PORTDOCS%%share/doc/sary/en/suffix-array.html %%PORTDOCS%%share/doc/sary/images/figure1.png -- cgit v1.2.3