From owner-svn-ports-all@freebsd.org Tue Apr 4 09:38:23 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D47D8D2BF9A; Tue, 4 Apr 2017 09:38:23 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1AC3A69; Tue, 4 Apr 2017 09:38:23 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v349cMKZ093862; Tue, 4 Apr 2017 09:38:22 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v349cMka093857; Tue, 4 Apr 2017 09:38:22 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201704040938.v349cMka093857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 4 Apr 2017 09:38:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437725 - in head/www/xapian-omega: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Apr 2017 09:38:23 -0000 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 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 + #include ++#include + + 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