Wed Apr 22 02:33:07 2009 UTC ()
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.


(schmonz)
diff -r1.1 -r1.2 pkgsrc/www/ikiwiki/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/www/ikiwiki/options.mk (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/options.mk 2009/04/21 16:34:43 1.1
+++ pkgsrc/www/ikiwiki/options.mk 2009/04/22 02:33:06 1.2
@@ -1,40 +1,43 @@ @@ -1,40 +1,43 @@
1# $NetBSD: options.mk,v 1.1 2009/04/21 16:34:43 schmonz Exp $ 1# $NetBSD: options.mk,v 1.2 2009/04/22 02:33:06 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki 3PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki
4PKG_SUPPORTED_OPTIONS= ikiwiki-amazon-s3 ikiwiki-search 4PKG_SUPPORTED_OPTIONS= ikiwiki-amazon-s3 ikiwiki-search
5PKG_SUPPORTED_OPTIONS+= imagemagick python svn w3m 5PKG_SUPPORTED_OPTIONS+= imagemagick python svn w3m
6PKG_OPTIONS_LEGACY_OPTS+= amazon_s3:ikiwiki-amazon-s3 6PKG_OPTIONS_LEGACY_OPTS+= amazon_s3:ikiwiki-amazon-s3
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10.if !empty(PKG_OPTIONS:Mikiwiki-search) 10.if !empty(PKG_OPTIONS:Mikiwiki-search)
11DEPENDS+= p5-Search-Xapian-[0-9]*:../../textproc/p5-Search-Xapian 11DEPENDS+= p5-Search-Xapian-[0-9]*:../../textproc/p5-Search-Xapian
12DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 12DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
 13DEPENDS+= xapian-omega-[0-9]*:../../textproc/xapian-omega
13.endif 14.endif
14 15
15.if !empty(PKG_OPTIONS:Mikiwiki-amazon-s3) 16.if !empty(PKG_OPTIONS:Mikiwiki-amazon-s3)
16DEPENDS+= p5-Net-Amazon-S3-[0-9]*:../../net/p5-Net-Amazon-S3 17DEPENDS+= p5-Net-Amazon-S3-[0-9]*:../../net/p5-Net-Amazon-S3
17DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo 18DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
18.endif 19.endif
19 20
20.if !empty(PKG_OPTIONS:Mimagemagick) 21.if !empty(PKG_OPTIONS:Mimagemagick)
21DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick 22DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
22.endif 23.endif
23 24
24.if !empty(PKG_OPTIONS:Mpython) 25.if !empty(PKG_OPTIONS:Mpython)
25REPLACE_PYTHON+=plugins/proxy.py plugins/rst 26REPLACE_PYTHON+=plugins/proxy.py plugins/rst
26DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils 27DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
27.include "../../lang/python/application.mk" 28.include "../../lang/python/application.mk"
 29.else
 30CHECK_INTERPRETER_SKIP+= lib/ikiwiki/plugins/*
28.endif 31.endif
29 32
30.if !empty(PKG_OPTIONS:Msvn) 33.if !empty(PKG_OPTIONS:Msvn)
31DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base 34DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base
32.endif 35.endif
33 36
34PLIST_VARS+= w3m 37PLIST_VARS+= w3m
35.if !empty(PKG_OPTIONS:Mw3m) 38.if !empty(PKG_OPTIONS:Mw3m)
36DEPENDS+= w3m-[0-9]*:../../www/w3m 39DEPENDS+= w3m-[0-9]*:../../www/w3m
37PLIST.w3m= yes 40PLIST.w3m= yes
38SUBST_SED.makefile+= -e 's,/lib/w3m/cgi-bin,/libexec/w3m/cgi-bin,' 41SUBST_SED.makefile+= -e 's,/lib/w3m/cgi-bin,/libexec/w3m/cgi-bin,'
39INSTALLATION_DIRS+= share/doc/${PKGBASE}/w3mmode 42INSTALLATION_DIRS+= share/doc/${PKGBASE}/w3mmode
40post-install: 43post-install: