diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /www/ikiwiki | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'www/ikiwiki')
| -rw-r--r-- | www/ikiwiki/Makefile | 6 | ||||
| -rw-r--r-- | www/ikiwiki/PLIST | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 480ea6a0d80..7024be4f878 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/01/02 15:39:57 reed Exp $ +# $NetBSD: Makefile,v 1.11 2008/04/12 22:43:13 jlam Exp $ # DISTNAME= ikiwiki_2.15 @@ -47,13 +47,13 @@ DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base .endif +PLIST_VARS+= w3m .if !empty(PKG_OPTIONS:Mw3m) DEPENDS+= w3m-[0-9]*:../../www/w3m -PLIST_SUBST+= W3M="" +PLIST.w3m= yes SUBST_SED.makefile+= -e 's,/lib/w3m/cgi-bin,/libexec/w3m/cgi-bin,' INSTALLATION_DIRS+= share/doc/ikiwiki/w3mmode .else -PLIST_SUBST+= W3M="@comment " SUBST_SED.makefile+= -e 's,^\(.*install .*/lib/w3m/cgi-bin\),\#\1,' .endif diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index b978073784e..465495a2bc9 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,18 +1,18 @@ -@comment $NetBSD: PLIST,v 1.3 2007/12/05 04:09:53 reed Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:13 jlam Exp $ bin/ikiwiki bin/ikiwiki-makerepo bin/ikiwiki-update-wikilist lib/ikiwiki/plugins/externaldemo lib/ikiwiki/plugins/rst -${W3M}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi +${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi man/man1/ikiwiki-makerepo.1 man/man1/ikiwiki-update-wikilist.1 man/man1/ikiwiki.1 man/man8/ikiwiki-mass-rebuild.8 sbin/ikiwiki-mass-rebuild share/doc/ikiwiki/ikiwiki.setup -${W3M}share/doc/ikiwiki/w3mmode.html -${W3M}share/doc/ikiwiki/w3mmode/ikiwiki.setup +${PLIST.w3m}share/doc/ikiwiki/w3mmode.html +${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup share/ikiwiki/basewiki/blog.mdwn share/ikiwiki/basewiki/favicon.ico share/ikiwiki/basewiki/helponformatting.mdwn @@ -96,8 +96,8 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo @dirrm share/ikiwiki/basewiki/subpage @dirrm share/ikiwiki/basewiki @dirrm share/ikiwiki -${W3M}@dirrm share/doc/ikiwiki/w3mmode +${PLIST.w3m}@dirrm share/doc/ikiwiki/w3mmode @dirrm share/doc/ikiwiki -${W3M}@dirrm libexec/w3m/cgi-bin +${PLIST.w3m}@dirrm libexec/w3m/cgi-bin @dirrm lib/ikiwiki/plugins @dirrm lib/ikiwiki |