Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Apr 2017 09:38:15 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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
Message-ID:  <201704040938.v349cFa6093678@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704040938.v349cFa6093678>