From 8985d864fd36a8d83feb9506048889e5eef3d5bd Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Wed, 23 Oct 2013 18:56:57 +0000
Subject: [PATCH] - Convert to new LIB_DEPENDS format - Support STAGEDIR

---
 databases/p5-Search-Xapian/Makefile  | 43 +---------------------------
 databases/p5-Search-Xapian/pkg-plist | 39 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/databases/p5-Search-Xapian/Makefile b/databases/p5-Search-Xapian/Makefile
index d08190afe372..9c4bd98ebf7c 100644
--- a/databases/p5-Search-Xapian/Makefile
+++ b/databases/p5-Search-Xapian/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl XS frontend to the Xapian C++ search library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	xapian:${PORTSDIR}/databases/xapian-core
+LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core
 TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
 		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
 
@@ -26,47 +26,6 @@ CONFIGURE_ARGS=	XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config
 USE_PERL5=	configure
 USES=		perl5
 
-MAN3=		Search::Xapian.3 \
-		Search::Xapian::AssertionError.3 \
-		Search::Xapian::BM25Weight.3 \
-		Search::Xapian::BoolWeight.3 \
-		Search::Xapian::Database.3 \
-		Search::Xapian::DatabaseCorruptError.3 \
-		Search::Xapian::DatabaseCreateError.3 \
-		Search::Xapian::DatabaseError.3 \
-		Search::Xapian::DatabaseLockError.3 \
-		Search::Xapian::DatabaseModifiedError.3 \
-		Search::Xapian::DatabaseOpeningError.3 \
-		Search::Xapian::DatabaseVersionError.3 \
-		Search::Xapian::DocNotFoundError.3 \
-		Search::Xapian::Document.3 \
-		Search::Xapian::Enquire.3 \
-		Search::Xapian::Error.3 \
-		Search::Xapian::FeatureUnavailableError.3 \
-		Search::Xapian::InternalError.3 \
-		Search::Xapian::InvalidArgumentError.3 \
-		Search::Xapian::InvalidOperationError.3 \
-		Search::Xapian::LogicError.3 \
-		Search::Xapian::MultiValueSorter.3 \
-		Search::Xapian::NetworkError.3 \
-		Search::Xapian::NetworkTimeoutError.3 \
-		Search::Xapian::PositionIterator.3 \
-		Search::Xapian::PostingIterator.3 \
-		Search::Xapian::QueryParser.3 \
-		Search::Xapian::QueryParserError.3 \
-		Search::Xapian::RangeError.3 \
-		Search::Xapian::RuntimeError.3 \
-		Search::Xapian::SerialisationError.3 \
-		Search::Xapian::Stem.3 \
-		Search::Xapian::TermGenerator.3 \
-		Search::Xapian::TermIterator.3 \
-		Search::Xapian::TradWeight.3 \
-		Search::Xapian::UnimplementedError.3 \
-		Search::Xapian::ValueIterator.3 \
-		Search::Xapian::Weight.3 \
-		Search::Xapian::WritableDatabase.3
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|^if (defined $$builddir) {|if (0) {|' ${WRKSRC}/Makefile.PL
 
diff --git a/databases/p5-Search-Xapian/pkg-plist b/databases/p5-Search-Xapian/pkg-plist
index fb2d46768cd8..cef995d1d2ac 100644
--- a/databases/p5-Search-Xapian/pkg-plist
+++ b/databases/p5-Search-Xapian/pkg-plist
@@ -50,6 +50,45 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian/Xapian.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian/Xapian.so
+%%PERL5_MAN3%%/Search::Xapian.3.gz
+%%PERL5_MAN3%%/Search::Xapian::AssertionError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::BM25Weight.3.gz
+%%PERL5_MAN3%%/Search::Xapian::BoolWeight.3.gz
+%%PERL5_MAN3%%/Search::Xapian::Database.3.gz
+%%PERL5_MAN3%%/Search::Xapian::DatabaseCorruptError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::DatabaseCreateError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::DatabaseError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::DatabaseLockError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::DatabaseModifiedError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::DatabaseOpeningError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::DatabaseVersionError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::DocNotFoundError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::Document.3.gz
+%%PERL5_MAN3%%/Search::Xapian::Enquire.3.gz
+%%PERL5_MAN3%%/Search::Xapian::Error.3.gz
+%%PERL5_MAN3%%/Search::Xapian::FeatureUnavailableError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::InternalError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::InvalidArgumentError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::InvalidOperationError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::LogicError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::MultiValueSorter.3.gz
+%%PERL5_MAN3%%/Search::Xapian::NetworkError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::NetworkTimeoutError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::PositionIterator.3.gz
+%%PERL5_MAN3%%/Search::Xapian::PostingIterator.3.gz
+%%PERL5_MAN3%%/Search::Xapian::QueryParser.3.gz
+%%PERL5_MAN3%%/Search::Xapian::QueryParserError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::RangeError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::RuntimeError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::SerialisationError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::Stem.3.gz
+%%PERL5_MAN3%%/Search::Xapian::TermGenerator.3.gz
+%%PERL5_MAN3%%/Search::Xapian::TermIterator.3.gz
+%%PERL5_MAN3%%/Search::Xapian::TradWeight.3.gz
+%%PERL5_MAN3%%/Search::Xapian::UnimplementedError.3.gz
+%%PERL5_MAN3%%/Search::Xapian::ValueIterator.3.gz
+%%PERL5_MAN3%%/Search::Xapian::Weight.3.gz
+%%PERL5_MAN3%%/Search::Xapian::WritableDatabase.3.gz
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Search/Xapian/MSet