o Upgrade to 0.36.

o Simplify dependency and unbreak.

5 files changed, 4 insertions, 55 deletions

diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile
index eb113176ae52..9a3df8bd5d01 100644
--- a/textproc/openfts/Makefile
+++ b/textproc/openfts/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openfts
-PORTVERSION=	0.34
-PORTREVISION=	2
+PORTVERSION=	0.36
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openfts
@@ -16,12 +15,6 @@ DISTNAME=	Search-OpenFTS-${PORTVERSION}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Open Source Full Text Search engine
 
-EXTRACT_DEPENDS=/nonexistent:${PORTSDIR}/databases/postgresql7:configure
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
-
-BROKEN=		"Inconsistent dependencies (mysql-client 3.x and 4.x)"
-DEPRECATED=	"This port will be removed on April 15 if still broken."
-
 PERL_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
@@ -30,21 +23,6 @@ MAN3=	Search::OpenFTS.3 Search::OpenFTS::Base.3 \
 	Search::OpenFTS::Dict::UnknownDict.3 Search::OpenFTS::Index.3 \
 	Search::OpenFTS::Morph::ISpell.3 Search::OpenFTS::Parser.3
 
-PGSRC=	`cd ${PORTSDIR}/databases/postgresql7; ${MAKE} -VWRKSRC`/contrib
-PGMAKE=	${GMAKE} docdir=${PREFIX}/share/doc
-
-post-extract:
-	cd ${WRKSRC} && ${CP} -r pgsql_contrib_openfts ${PGSRC}/
-
-post-build:
-	cd ${PGSRC}/tsearch && ${GMAKE} && \
-	${REINPLACE_CMD} 's,$$libdir,${PREFIX}/lib/postgresql,' tsearch.sql
-	cd ${PGSRC}/pgsql_contrib_openfts && ${GMAKE}
-
-post-install:
-	cd ${PGSRC}/tsearch && ${PGMAKE} install
-	cd ${PGSRC}/pgsql_contrib_openfts && ${PGMAKE} install
-
 # Sample DB initialization.
 DBNAME?=	openfts
 create-database:
diff --git a/textproc/openfts/distinfo b/textproc/openfts/distinfo
index 428933ec4c2c..5530fc05d99a 100644
--- a/textproc/openfts/distinfo
+++ b/textproc/openfts/distinfo
@@ -1 +1,2 @@
-MD5 (Search-OpenFTS-0.34.tar.gz) = a9b264ba8a3e3ffe108137bea5d74afa
+MD5 (Search-OpenFTS-0.36.tar.gz) = 5f9a851fceafb3e3c549af4706cac635
+SIZE (Search-OpenFTS-0.36.tar.gz) = 78947
diff --git a/textproc/openfts/files/patch-Index.pm b/textproc/openfts/files/patch-Index.pm
deleted file mode 100644
index 0148c7ea9c1a..000000000000
--- a/textproc/openfts/files/patch-Index.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- OpenFTS/Index.pm.orig	Wed Jul 24 02:15:37 2002
-+++ OpenFTS/Index.pm	Tue Aug 19 20:28:53 2003
-@@ -201,7 +201,7 @@
- 	
- 	foreach my $i ( 0..$#{$rv} ) {
- 		my $param = $rv->[$i]{param};
--		if ( length $param ) {
-+		if ( $param and length $param ) {
- 			$rv->[$i]{param} = eval $param;
- 			die "Can't eval '$param': $@" if $@;
- 		}
diff --git a/textproc/openfts/files/patch-PorterEng.pm b/textproc/openfts/files/patch-PorterEng.pm
deleted file mode 100644
index 1a461df17b9a..000000000000
--- a/textproc/openfts/files/patch-PorterEng.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- OpenFTS/Dict/PorterEng.pm.orig	Sat Apr  6 00:37:18 2002
-+++ OpenFTS/Dict/PorterEng.pm	Tue Aug 19 20:54:05 2003
-@@ -186,7 +186,7 @@
-     my $constname;
-     ($constname = $AUTOLOAD) =~ s/.*:://;
-     croak "& not defined" if $constname eq 'constant';
--    my $val = constant($constname, @_ ? $_[0] : 0);
-+    my $val = constant($constname, (@_ and $_[0] =~ /^\d+$/) ? $_[0] : 0);
-     if ($! != 0) {
-         if ($! =~ /Invalid/) {
-             $AutoLoader::AUTOLOAD = $AUTOLOAD;
diff --git a/textproc/openfts/pkg-plist b/textproc/openfts/pkg-plist
index 450880d8cbe6..8e5aea2502f8 100644
--- a/textproc/openfts/pkg-plist
+++ b/textproc/openfts/pkg-plist
@@ -1,13 +1,8 @@
-lib/postgresql/openfts.so
-lib/postgresql/tsearch.so
-share/doc/postgresql/contrib/README.openfts
-share/doc/postgresql/contrib/README.tsearch
-share/postgresql/contrib/openfts.sql
-share/postgresql/contrib/tsearch.sql
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Base.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict/PorterEng.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict/Snowball.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict/Synonym.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict/UnknownDict.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Index.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Morph/ISpell.pm
@@ -33,6 +28,3 @@ share/postgresql/contrib/tsearch.sql
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Search 2>/dev/null
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null
-@dirrm share/doc/postgresql/contrib
-@dirrm share/doc/postgresql
-@dirrm share/postgresql/contrib