svn commit: r437716 - in head: . databases databases/p5-Search-Xapian databases/p5-Search-Xapian12 www/p5-Catalyst-Model-Xapian

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Tue Apr  4 09:29:37 2017
New Revision: 437716
URL: https://svnweb.freebsd.org/changeset/ports/437716

Log:
  Move databases/p5-Search-Xapian to databases/p5-Search-Xapian12
  
  - Update LIB_DEPENDS
  - Add CONFLICTS_INSTALL
  - Bump PORTREVISION for dependent ports

Added:
  head/databases/p5-Search-Xapian12/
     - copied from r437715, head/databases/p5-Search-Xapian/
Deleted:
  head/databases/p5-Search-Xapian/
Modified:
  head/MOVED
  head/databases/Makefile
  head/databases/p5-Search-Xapian12/Makefile
  head/www/p5-Catalyst-Model-Xapian/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Apr  4 09:28:54 2017	(r437715)
+++ head/MOVED	Tue Apr  4 09:29:37 2017	(r437716)
@@ -9203,3 +9203,4 @@ x11-toolkits/libgtksourceviewmm||2017-04
 graphics/goocanvasmm||2017-04-03|Obsolete and not depend on anymore
 x11-themes/kde4-icons-oxygen|x11-themes/kf5-oxygen-icons5|2017-04-03|Replaced by x11-themes/kf5-oxygen-icons5
 devel/php5-geshi|devel/php-geshi|2017-04-04|Update PKGNAMEPREFIX: it builds fine with PHP 7.x
+databases/p5-Search-Xapian|databases/p5-Search-Xapian12|2017-04-04|Rename to match Xapian PKGNAMESUFFIX

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Tue Apr  4 09:28:54 2017	(r437715)
+++ head/databases/Makefile	Tue Apr  4 09:29:37 2017	(r437716)
@@ -475,8 +475,8 @@
     SUBDIR += p5-SQLite-Work
     SUBDIR += p5-Search-InvertedIndex
     SUBDIR += p5-Search-Namazu
-    SUBDIR += p5-Search-Xapian
     SUBDIR += p5-Search-Xapian10
+    SUBDIR += p5-Search-Xapian12
     SUBDIR += p5-Store-CouchDB
     SUBDIR += p5-T2
     SUBDIR += p5-Tangram

Modified: head/databases/p5-Search-Xapian12/Makefile
==============================================================================
--- head/databases/p5-Search-Xapian/Makefile	Tue Apr  4 09:28:54 2017	(r437715)
+++ head/databases/p5-Search-Xapian12/Makefile	Tue Apr  4 09:29:37 2017	(r437716)
@@ -8,6 +8,7 @@ MASTER_SITES=	http://oligarchy.co.uk/xap
 		LOCAL/sunpoet \
 		CPAN
 PKGNAMEPREFIX=	p5-
+PKGNAMESUFFIX=	12
 
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	Perl XS frontend to the Xapian C++ search library
@@ -15,11 +16,11 @@ COMMENT=	Perl XS frontend to the Xapian 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libxapian.so:databases/xapian-core
+LIB_DEPENDS=	libxapian.so:databases/xapian-core12
 TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod \
 		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
-PORTSCOUT=	limitw:1,even
+PORTSCOUT=	limit:^1\.2\.
 
 CC=		${CXX}
 CONFIGURE_ARGS=	XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config

Modified: head/www/p5-Catalyst-Model-Xapian/Makefile
==============================================================================
--- head/www/p5-Catalyst-Model-Xapian/Makefile	Tue Apr  4 09:28:54 2017	(r437715)
+++ head/www/p5-Catalyst-Model-Xapian/Makefile	Tue Apr  4 09:29:37 2017	(r437716)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Catalyst-Model-Xapian
 PORTVERSION=	0.06
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MRAMBERG
@@ -15,7 +15,7 @@ COMMENT=	Catalyst model for Search::Xapi
 BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.30:www/p5-Catalyst-Runtime \
 		p5-Catalyst-Devel>=1.00:www/p5-Catalyst-Devel \
 		p5-Data-Page>=0:databases/p5-Data-Page \
-		p5-Search-Xapian>=1.2.7.0:databases/p5-Search-Xapian
+		p5-Search-Xapian12>=1.2.7.0:databases/p5-Search-Xapian12
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix