- Update to 0.30

- Update MASTER_SITES

PR:		ports/106600
Submitted by:	MURAOKA Daisuke <raia@muj.biglobe.ne.jp>

5 files changed, 12 insertions, 179 deletions

diff --git a/textproc/p5-Search-Saryer/Makefile b/textproc/p5-Search-Saryer/Makefile
index 3c6c6938..4ba1e50 100644
--- a/textproc/p5-Search-Saryer/Makefile
+++ b/textproc/p5-Search-Saryer/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	Search-Saryer
-PORTVERSION=	0.10
-PORTREVISION=	6
+PORTVERSION=	0.30
 CATEGORIES=	textproc perl5
-MASTER_SITES=	ftp://ftp.namazu.org/sary/perl/
+MASTER_SITES=	http://namazu.org/~tsuchiya/perl/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,9 +16,6 @@ COMMENT=	Perl interface to the Sary library
 
 LIB_DEPENDS=	sary.10:${PORTSDIR}/textproc/sary
 
-DEPRECATED=	distfile disappeared
-EXPIRATION_DATE=	2007-01-01
-
 PERL_CONFIGURE=	yes
 
 MAN3=		Search::Saryer.3
diff --git a/textproc/p5-Search-Saryer/distinfo b/textproc/p5-Search-Saryer/distinfo
index f3996fc..40fc140 100644
--- a/textproc/p5-Search-Saryer/distinfo
+++ b/textproc/p5-Search-Saryer/distinfo
@@ -1,3 +1,3 @@
-MD5 (Search-Saryer-0.10.tar.gz) = 7a075732bdcfe36c72481b9d6b36f03f
-SHA256 (Search-Saryer-0.10.tar.gz) = 434a761017ab7b4e2a6565fc0b7dab49d37d38348184132cc44e6a96897846b7
-SIZE (Search-Saryer-0.10.tar.gz) = 2910
+MD5 (Search-Saryer-0.30.tar.gz) = 3becb1bdc083e99c5641d7a83847ff66
+SHA256 (Search-Saryer-0.30.tar.gz) = 787f536df1ec2bab7304ae4de95ca1b88584f1125104c575bf626cd3d329908a
+SIZE (Search-Saryer-0.30.tar.gz) = 4578
diff --git a/textproc/p5-Search-Saryer/files/patch-Makefile.PL b/textproc/p5-Search-Saryer/files/patch-Makefile.PL
deleted file mode 100644
index 7ee722c..0000000
--- a/textproc/p5-Search-Saryer/files/patch-Makefile.PL
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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.pm b/textproc/p5-Search-Saryer/files/patch-Saryer.pm
index 192adc8..d910b25 100644
--- a/textproc/p5-Search-Saryer/files/patch-Saryer.pm
+++ b/textproc/p5-Search-Saryer/files/patch-Saryer.pm
@@ -1,24 +1,11 @@
---- Saryer.pm.orig	Mon Dec 18 14:10:08 2000
-+++ Saryer.pm	Tue Oct  8 23:04:36 2002
-@@ -13,10 +13,10 @@
+--- Saryer.pm.orig	Mon Jul 11 02:19:01 2005
++++ Saryer.pm	Fri Jun 23 13:38:04 2006
+@@ -13,7 +13,7 @@
  
  =head1 SYNOPSIS
  
--  my $saryer = Search::Saryer::new(filename->'search.txt');
-+  my $saryer = Search::Saryer::new(filename=>'search.txt');
+-  my $saryer = new Search::Saryer(filename->'search.txt');
++  my $saryer = new Search::Saryer(filename=>'search.txt');
+   print $saryer->grep($pattern)
  
-   if (defined $saryer->search($pattern)) {
--    while (defined ($line = saryer->get_next_line())) {
-+    while (defined ($line = $saryer->get_next_line())) {
-       print $line;
-     }
-   }
-@@ -27,7 +27,7 @@
- 
- =head2 new
- 
--  $saryer->new('filename'->'file.txt')
-+  $saryer->new('filename'=>'file.txt')
- 
- Create saryer object.
- If creation process was failed, it returns undef.
+ =head1 CONSTRUCTOR
diff --git a/textproc/p5-Search-Saryer/files/patch-Saryer.xs b/textproc/p5-Search-Saryer/files/patch-Saryer.xs
deleted file mode 100644
index a3f69a6..0000000
--- a/textproc/p5-Search-Saryer/files/patch-Saryer.xs
+++ /dev/null
@@ -1,137 +0,0 @@
---- 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);