From owner-svn-ports-all@freebsd.org Tue Apr 4 09:38:17 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 49E48D2BF76; Tue, 4 Apr 2017 09:38:17 +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 27139A4C; Tue, 4 Apr 2017 09:38:17 +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 v349cGuA093682; Tue, 4 Apr 2017 09:38:16 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v349cFa6093678; Tue, 4 Apr 2017 09:38:15 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201704040938.v349cFa6093678@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:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437724 - in head/www: . ikiwiki xapian-omega12 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:17 -0000 Author: sunpoet Date: Tue Apr 4 09:38:15 2017 New Revision: 437724 URL: https://svnweb.freebsd.org/changeset/ports/437724 Log: Add xapian-omega12 1.2.24 (copied from xapian-omega) - Update LIB_DEPENDS - Add CONFLICTS_INSTALL - Convert to options target helper - Update WWW - Bump PORTREVISION for dependent ports Added: head/www/xapian-omega12/ - copied from r427131, head/www/xapian-omega/ Modified: head/www/Makefile head/www/ikiwiki/Makefile head/www/xapian-omega12/Makefile head/www/xapian-omega12/pkg-descr Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Tue Apr 4 09:37:49 2017 (r437723) +++ head/www/Makefile Tue Apr 4 09:38:15 2017 (r437724) @@ -2371,6 +2371,7 @@ SUBDIR += www6to4 SUBDIR += wwwoffle SUBDIR += xapian-omega + SUBDIR += xapian-omega12 SUBDIR += xaraya SUBDIR += xcache SUBDIR += xfce4-smartbookmark-plugin Modified: head/www/ikiwiki/Makefile ============================================================================== --- head/www/ikiwiki/Makefile Tue Apr 4 09:37:49 2017 (r437723) +++ head/www/ikiwiki/Makefile Tue Apr 4 09:38:15 2017 (r437724) @@ -3,6 +3,7 @@ PORTNAME= ikiwiki PORTVERSION= 3.20170111 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= DEBIAN_POOL \ LOCAL/mat/${PORTNAME} @@ -54,8 +55,8 @@ MULTI_DESC= Install Text::MultiMarkdown PO4A_RUN_DEPENDS= po4a>=0.39:textproc/po4a PO4A_BUILD_DEPENDS= po4a>=0.39:textproc/po4a SEARCH_RUN_DEPENDS= p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \ - p5-Search-Xapian>=0:databases/p5-Search-Xapian \ - ${LOCALBASE}/www/xapian-omega/cgi-bin/omega:www/xapian-omega + p5-Search-Xapian12>=0:databases/p5-Search-Xapian12 \ + ${LOCALBASE}/www/xapian-omega/cgi-bin/omega:www/xapian-omega12 MULTI_RUN_DEPENDS= p5-Text-MultiMarkdown>=0:textproc/p5-Text-MultiMarkdown PORTDOCS= CHANGELOG NEWS README Modified: head/www/xapian-omega12/Makefile ============================================================================== --- head/www/xapian-omega/Makefile Sat Nov 26 03:02:29 2016 (r427131) +++ head/www/xapian-omega12/Makefile Tue Apr 4 09:38:15 2017 (r437724) @@ -6,6 +6,7 @@ PORTVERSION= 1.2.24 CATEGORIES= www MASTER_SITES= http://oligarchy.co.uk/xapian/${PORTVERSION}/ \ LOCAL/sunpoet +PKGNAMESUFFIX= 12 MAINTAINER= sunpoet@FreeBSD.org COMMENT= CGI search application built on Xapian @@ -14,7 +15,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre \ - libxapian.so:databases/xapian-core + libxapian.so:databases/xapian-core12 + +CONFLICTS_INSTALL= xapian-omega- OPTIONS_DEFINE= DOCS EXAMPLES ICONV OPTIONS_DEFAULT=ICONV @@ -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-omega12/pkg-descr ============================================================================== --- head/www/xapian-omega/pkg-descr Sat Nov 26 03:02:29 2016 (r427131) +++ head/www/xapian-omega12/pkg-descr Tue Apr 4 09:38:15 2017 (r437724) @@ -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/