svn commit: r437725 - in head/www/xapian-omega: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Tue Apr  4 09:38:22 2017
New Revision: 437725
URL: https://svnweb.freebsd.org/changeset/ports/437725

Log:
  Update to 1.4.3
  
  - Add CONFLICTS_INSTALL
  - Convert to options target helper
  - Update WWW
  
  Changes:	https://trac.xapian.org/wiki/ReleaseOverview/1.4.3
  		https://trac.xapian.org/wiki/ReleaseOverview/1.4.2
  		https://trac.xapian.org/wiki/ReleaseOverview/1.4.1
  		https://trac.xapian.org/wiki/ReleaseOverview/1.4.0

Added:
  head/www/xapian-omega/files/
  head/www/xapian-omega/files/patch-htmlparse.h   (contents, props changed)
Modified:
  head/www/xapian-omega/Makefile
  head/www/xapian-omega/distinfo
  head/www/xapian-omega/pkg-descr
  head/www/xapian-omega/pkg-plist

Modified: head/www/xapian-omega/Makefile
==============================================================================
--- head/www/xapian-omega/Makefile	Tue Apr  4 09:38:15 2017	(r437724)
+++ head/www/xapian-omega/Makefile	Tue Apr  4 09:38:22 2017	(r437725)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xapian-omega
-PORTVERSION=	1.2.24
+PORTVERSION=	1.4.3
 CATEGORIES=	www
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/ \
 		LOCAL/sunpoet
@@ -13,9 +13,12 @@ COMMENT=	CGI search application built on
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	xapian-core>=${PORTVERSION}:databases/xapian-core
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libxapian.so:databases/xapian-core
 
+CONFLICTS_INSTALL=	xapian-omega12-
+
 OPTIONS_DEFINE=	DOCS EXAMPLES ICONV
 OPTIONS_DEFAULT=ICONV
 ICONV_DESC=	Enable iconv character set conversion support
@@ -46,9 +49,11 @@ post-patch:
 		-e '/^pkglibbindir = / s| = .*$$| = ${WWWDIR}/cgi-bin|' \
 			${WRKSRC}/Makefile.in
 
-post-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+post-install-DOCS-on:
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${MORE_PORTDOCS} ${STAGEDIR}${DOCSDIR}/
+
+post-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>

Modified: head/www/xapian-omega/distinfo
==============================================================================
--- head/www/xapian-omega/distinfo	Tue Apr  4 09:38:15 2017	(r437724)
+++ head/www/xapian-omega/distinfo	Tue Apr  4 09:38:22 2017	(r437725)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475135073
-SHA256 (xapian-omega-1.2.24.tar.xz) = 45fca431b812ddacbd592b522389474317af386b3ab554908edd36fc5918da53
-SIZE (xapian-omega-1.2.24.tar.xz) = 438104
+TIMESTAMP = 1485562544
+SHA256 (xapian-omega-1.4.3.tar.xz) = 2eea0344a0703ba379d845b86d08a9c2e9faf0deb21834d9ea6939b712c6216e
+SIZE (xapian-omega-1.4.3.tar.xz) = 498856

Added: head/www/xapian-omega/files/patch-htmlparse.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/xapian-omega/files/patch-htmlparse.h	Tue Apr  4 09:38:22 2017	(r437725)
@@ -0,0 +1,10 @@
+--- htmlparse.h.orig	2016-10-21 04:54:32 UTC
++++ htmlparse.h
+@@ -24,6 +24,7 @@
+ 
+ #include <string>
+ #include <map>
++#include <ctime>
+ 
+ using std::string;
+ using std::map;

Modified: head/www/xapian-omega/pkg-descr
==============================================================================
--- head/www/xapian-omega/pkg-descr	Tue Apr  4 09:38:15 2017	(r437724)
+++ head/www/xapian-omega/pkg-descr	Tue Apr  4 09:38:22 2017	(r437725)
@@ -2,4 +2,4 @@ This package contains two index building
 a CGI search application (omega).  These use the Xapian search library to
 provide a search over a collection of documents.
 
-WWW: http://xapian.org/
+WWW: https://xapian.org/

Modified: head/www/xapian-omega/pkg-plist
==============================================================================
--- head/www/xapian-omega/pkg-plist	Tue Apr  4 09:38:15 2017	(r437724)
+++ head/www/xapian-omega/pkg-plist	Tue Apr  4 09:38:22 2017	(r437725)
@@ -2,8 +2,13 @@ bin/dbi2omega
 bin/htdig2omega
 bin/mbox2omega
 bin/omindex
+bin/omindex-list
 bin/scriptindex
+man/man1/omindex-list.1.gz
 man/man1/omindex.1.gz
 man/man1/scriptindex.1.gz
+%%WWWDIR%%/cgi-bin/mhtml2html
 %%WWWDIR%%/cgi-bin/omega
 %%WWWDIR%%/cgi-bin/outlookmsg2html
+%%WWWDIR%%/cgi-bin/rfc822tohtml
+%%WWWDIR%%/cgi-bin/vcard2text