summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2009-04-22 02:33:06 +0000
committerschmonz <schmonz@pkgsrc.org>2009-04-22 02:33:06 +0000
commitd42ad0440f1b4852e2d5825745822b6f03a65a51 (patch)
treec915639939923e3674dfae8d557814b236d1b259 /www
parent99bcb1dd26c91673814d8a8a5660e289cfc7e821 (diff)
downloadpkgsrc-d42ad0440f1b4852e2d5825745822b6f03a65a51.tar.gz
Skip Python interpreter check if not building with the python option.
Bring in xapian-omega if building with the ikiwiki-search option. Ride recent update.
Diffstat (limited to 'www')
-rw-r--r--www/ikiwiki/options.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk
index 0c6542e6f0d..b014f83e24b 100644
--- a/www/ikiwiki/options.mk
+++ b/www/ikiwiki/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2009/04/21 16:34:43 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2009/04/22 02:33:06 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki
PKG_SUPPORTED_OPTIONS= ikiwiki-amazon-s3 ikiwiki-search
@@ -10,6 +10,7 @@ PKG_OPTIONS_LEGACY_OPTS+= amazon_s3:ikiwiki-amazon-s3
.if !empty(PKG_OPTIONS:Mikiwiki-search)
DEPENDS+= p5-Search-Xapian-[0-9]*:../../textproc/p5-Search-Xapian
DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
+DEPENDS+= xapian-omega-[0-9]*:../../textproc/xapian-omega
.endif
.if !empty(PKG_OPTIONS:Mikiwiki-amazon-s3)
@@ -25,6 +26,8 @@ DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
REPLACE_PYTHON+=plugins/proxy.py plugins/rst
DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
.include "../../lang/python/application.mk"
+.else
+CHECK_INTERPRETER_SKIP+= lib/ikiwiki/plugins/*
.endif
.if !empty(PKG_OPTIONS:Msvn)