- fix build with new default PGSQL version

 - honor NOPORTDOCS and NOPORTEXAMPLES
 - remove MD5 from distfile
 - rework pkg-plist (@unexec rm ... => @dirrmtry)
 - bump PORTREVISION

 Broken build reported by pav@ after DEFAULT_PGSQL_VER was set to 84

Approved by:	kuriyama (maintainer) per mail

3 files changed, 41 insertions, 37 deletions

diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile
index d325c68496b0..2a6275ae4a1f 100644
--- a/textproc/openfts/Makefile
+++ b/textproc/openfts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openfts
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/OpenFTS-perl%2C%20v${PORTVERSION}
 DISTNAME=	Search-OpenFTS-${PORTVERSION}
@@ -14,38 +15,42 @@ DISTNAME=	Search-OpenFTS-${PORTVERSION}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Open Source Full Text Search engine
 
-RUN_DEPENDS=	${LOCALBASE}/lib/postgresql/tsearch2.so:${PORTSDIR}/databases/postgresql82-contrib \
+RUN_DEPENDS=	${LOCALBASE}/lib/postgresql/tsearch2.so:${PORTSDIR}/databases/postgresql${DEFAULT_PGSQL_VER}-contrib \
 		${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 
+USE_PGSQL=	yes
 PERL_CONFIGURE=	yes
 
+.include <bsd.port.pre.mk>
+
 MAN3=	Search::OpenFTS.3 Search::OpenFTS::Base.3 \
 	Search::OpenFTS::Dict::PorterEng.3 Search::OpenFTS::Dict::Snowball.3 \
 	Search::OpenFTS::Dict::Synonym.3 Search::OpenFTS::Dict::UnknownDict.3 \
 	Search::OpenFTS::Index.3 Search::OpenFTS::Morph::ISpell.3 \
 	Search::OpenFTS::Parser.3
 
-.include <bsd.port.pre.mk>
-
-.if !defined(NOPORTDOCS)
 PORTDOCS=	Changes INSTALL README primer.html
 
 post-install:
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
+.endif
+
+.if !defined(NOPORTDOCS)
 	@${CP} -p ${WRKSRC}/doc/primer.html ${WRKSRC}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif	# defined(NOPORTDOCS)
+.endif
 
 # Sample DB initialization.
 DBNAME?=	openfts
 create-database:
 	createdb ${DBNAME}
 	cd ${LOCALBASE}/share/postgresql/contrib && \
-		psql ${DBNAME} < tsearch.sql && \
+		psql ${DBNAME} < tsearch2.sql && \
 		psql ${DBNAME} < openfts.sql
 
 .include <bsd.port.post.mk>
diff --git a/textproc/openfts/distinfo b/textproc/openfts/distinfo
index 340e0b3352e1..f7024d519050 100644
--- a/textproc/openfts/distinfo
+++ b/textproc/openfts/distinfo
@@ -1,3 +1,2 @@
-MD5 (Search-OpenFTS-0.40.tar.gz) = 3461d8600c9c811fb7af856f2c862fcc
 SHA256 (Search-OpenFTS-0.40.tar.gz) = d098806920f458e8e3ae9f99d94dc11cc531ead3bb6b68c4e5ab549d7aa3a2c7
 SIZE (Search-OpenFTS-0.40.tar.gz) = 80438
diff --git a/textproc/openfts/pkg-plist b/textproc/openfts/pkg-plist
index b34acca63d9a..1f97b7f3c014 100644
--- a/textproc/openfts/pkg-plist
+++ b/textproc/openfts/pkg-plist
@@ -17,34 +17,34 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Parser/Parser.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Parser/Parser.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Parser/autosplit.ix
-%%PORTDOCS%%%%EXAMPLESDIR%%/Dict/DecimalDict.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/Dict/EngStem.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/Dict/IntegerDict.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/Dict/StemSnowball.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/Dict/english.stop
-%%PORTDOCS%%%%EXAMPLESDIR%%/Dict/russian.stop
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/README.INSIDE
-%%PORTDOCS%%%%EXAMPLESDIR%%/index.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/init-custom.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/init.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/parser/parser-test-1.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/parser/parser-test-2.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/parser/test.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/search.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/simple_parser.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/testdict.pl
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Dict/PorterEng
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Dict
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dict/DecimalDict.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dict/EngStem.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dict/IntegerDict.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dict/StemSnowball.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dict/english.stop
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Dict/russian.stop
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.INSIDE
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/index.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init-custom.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/init.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parser/parser-test-1.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parser/parser-test-2.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parser/test.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/search.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple_parser.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdict.pl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/parser
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/Dict
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Parser
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Morph/ISpell
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Morph
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Parser
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Dict/PorterEng
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS/Dict
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/OpenFTS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Morph
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Search/OpenFTS/Dict
 @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
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Dict
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/parser
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Search