diff options
author | schmonz <schmonz@pkgsrc.org> | 2009-04-21 16:34:43 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2009-04-21 16:34:43 +0000 |
commit | 226d05f6cf88bf083343cc391f2cfc51668395c3 (patch) | |
tree | e6c8b6a95986e1bc9005636bf52a94f2500dceb0 /www/ikiwiki | |
parent | 5df8811e828d33416a8b13a224f9493a4875b49a (diff) | |
download | pkgsrc-226d05f6cf88bf083343cc391f2cfc51668395c3.tar.gz |
Update to 3.10. From the changelog:
This is a major upgrade from 2.x. Please read:
<URL:http://ikiwiki.info/tips/upgrade_to_3.0/>
The highlights of the changes in version 3.0 include:
* Support for uploading attachments.
* Can rename and remove pages and files via the web.
* Web based setup.
* Blog-style comments as an alternative to Discussion pages.
* Many other new plugins including htmlbalance, format, progress,
color, autoindex, cutpaste, hnb, creole, txt, amazon s3, pinger,
pingee, edittemplate
* The RecentChanges page is compiled statically, not generated from the CGI.
* Support for additional revision control systems: bzr, monotone
* Support for untrusted git push.
* A new version (3.00) of the plugin API, exporting additional
commonly used functions from IkiWiki.pm.
* Nearly everything in ikiwiki is now a plugin, from WikiLinks to
page editing, to RecentChanges.
* Far too many bug fixes, features, and enhancements to list here.
3.10:
* darcs: Finally added support for this VCS, thanks to many contributors:
- Thomas Schwinge wrote the original file, implementing only rcs_commit.
- Benjamin A'Lee contributed an alternative implementation.
- Tuomo Valkonen contributed rcs_getctime and stub rcs_recentchanges.
- Simon Michael contributed multiple changes.
- Petr Rockai fixed rcs_recentchanges.
- Sven M. Hallberg merged the above and added missing features.
* Add missing newline to Confirm Password prompt.
* Add missing permalink support to archivepage and titlepage templates.
* debian/control: Wrap fields.
* inline: Add author info to archive display.
* Add a microblog template that is useful for inlining microblogging posts.
3.09:
* inline: Add title_natural sort order, using Sort::Naturally
(chrysn)
* inline: Fix urls to feed when feedfile is used on an index page.
* git, mercurial: Fix --getctime to return file creation time,
not last commit time.
* Updated French translation (Jean-Luc Coulon). Closes: #521072
* css: Add clear: both to inlinefooter.
* comments: Fix too loose test for comments pages that matched
normal pages with "comment_" in their name. Closes: #521322
* comments: Fix anchor ids to be legal xhtml. Closes: #521339
* Fix documentation of anonok_pagespec. Closes: #521793
* Add missing suggests on libtext-textile-perl. Closes: #522039
* recentchanges: change to using do=goto links for user links.
* Fix git test suite to use a bare repo.
3.08:
* git: Fix utf-8 encoding of author names.
* git: Manually decode git output from utf-8, avoids warning messages
on invalidly encoded output.
* Fix bug that caused weird things to appear as page types.
3.07:
* Updated German translation (Kai Wasserbaech). Closes: #518377
* Updated French translation (Jean-Luc Coulon). Closes: #518510
* wmd: New plugin contributed by William Uther to support the WMD
Wysiwym markdown editor.
* smiley: Avoid infinite loop in smiley expansion triggered by the
template scan mode change in version 3.05. Closes: #518805
* template: When loading a template in scan mode, let preprocess
know it only needs to scan.
3.06:
* Setup automator: Fix bug in password comparison. Closes: #517654
3.05:
* debhelper v7(.0.50); rules file minimisation.
* template: Load templates in scan mode. This is potentially
expensive, but is necessary so that meta and tag directives,
and other links on templates affect the page using the template
reliably.
* goto: Fix redirect to comments.
* Add noextension parameter to htmlize hooks to support, eg, Makefile.
* Add tagged() PageSpec.
* Updated German translation (Kai Wasserbaech). Closes: #516770
* Setup automator: Prompt for password twice. Closes: #516973
* bzr: Add missing rcs_diff. (liw)
* comments: Avoid showing comment moderation button in prefs to non-admins.
* goto: Fix typo that broke recentchanges_link compatibility.
3.04:
* 404: New plugin which lets you use the IkiWiki CGI script as an
Apache 404 handler, to give the behaviour of various other wiki
engines where visiting a nonexistent page provides you with a
link to create it. (smcv)
* Factor out redundant code into goto plugin. (smcv)
* Work around XML::Atom strangeness that results in double-encoded posts. (smcv)
* Updated German translation (Kai Wasserbaech). Closes: #514251
* Fix unusual --setup --post-commit command line option combo.
* Create any missing directory necessary to put the wrapper file
into. Closes: #514384
* shortcut: If default_pageext is set, first look for shortcuts.default_pageext.
* Allow comments, rename, remove, and attachment plugins to be used
even if the editpage plugin is disabled.
3.03:
* Avoid feeding decoded unicode to Term::ReadLine. Closes: 512169
* blogspam: Log spam info on failure in debug mode.
* Remove nonstandard css. Closes: #512378
* blogspam: Fix use of blogspam_options and blogspam_server config settings.
* comments: If comment content checks fail, store the comment (in
.ikiwiki/comments_pending) for moderator review.
* comments: Add a moderation web interface, which admins can access
via their Preferences page.
* git: Fix malformed utf8 received from git.
* meta: New "updated" metadata specifies a fake modification time
for a page, to be output into RSS and Atom feeds. (smcv)
* underlay: New plugin, allows pulling in additional files not in
version control. (smcv)
3.02:
* blogspam: New plugin, adding spam filtering for page editing /
comment posting using the BlogSpam.net API.
* Add auto-blog.setup, which will set up an ikiwiki instance tuned
for use in blogging.
* checkcontent: New hook, can be used to implement arbitrary content
filters, including spam filters.
* table: Fix misparsed links in external files.
* table: Find links in external files in scan pass.
* rename: Show full names of affected pages.
* comments: Fix cache avoidance hack.
* repolist: New plugin to support the rel=vcs-* microformat.
* goodstuff: Include repolist by default. (But it does nothing until
configured with the repository locations.)
* comments: Add support for removing comments via web interface. (smcv)
* Consistently allow use of relative paths in all PageSpecs that
take a page name parameter. Previously, match_created_before(),
match_created_after(), match_sourcepage(), and match_destpage()
did not support that, and the docs were not clear.
* pinger: Get whole url, don't just head, avoids problems on the
nostromo web server.
* Recommend libterm-readline-gnu-perl since that makes auto.setup
behave better.
3.01:
* ikiwiki-makerepo: Fix injecting of empty mercurial and bzr
repositories. Closes: #510518
* Fix documentation about git hook to use right name. Closes: #510393
* yesno: Always accept English even when localised.
* yesno: Also accept 1 and 0 as input.
* A recent change to gitweb removed support for the form of diffurl
that many ikiwiki setups use. Document how to use the new url form.
2.72:
* Avoid comments in recentchanges being broken links (smcv)
* Add deprecation warning for GlobLists, which will stop working in 3.0.
* camelcase: Add camelcase_ignore setting.
* googlecalendar: Add runtime deprecation warning.
* comments: Deal with users entering unqualified or partial urls.
* inline: Run format hook first, to ensure other format hooks can affect
inlined content. Closes: #509710
2.71:
* comments: Blog-style comment support, contributed by Simon McVittie.
* htmlbalance: New plugin contributed by Simon McVittie.
* Change deb dependencies to list Text::Markdown before markdown (really
this time).
* Improve escaping of wikilinks and preprocessor directives in content
produced by aggregate and recentchanges.
* French translation update from Philippe Batailler. Closes: #506250
* Spanish translation update from Victor Moral.
* Fix handling of wrappergroup option.
* Correct --dumpsetup to include the srcdir in the setup file.
* German translation update from Kai Wasserbaech. Closes: #507056
* inline: Support emptyfeeds=no option to skip generating empty feeds.
* inline: Support feedfile option to change the filename of the feed
generated.
* meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
* htmlbalance: don't compact whitespace, and set misc other options (smcv)
* rename: Fix double-escaping of page name in edit box.
* monotone: When getting the log, tell monotone how many entries
we want, rather than closing the pipe, which it dislikes. (thm)
* Coding style change: Remove explcit vim folding markers.
* aggregate: If a feed fails to be downloaded, try again immediatly
next time aggregation is run, even if the usual time has not passed.
Closes: #508622 (Michael Gold)
* meta: Process meta date during scan pass so that the date will always
affect sorting in inlines.
* Improve display of some openids (smcv)
2.70:
* Avoid crash on malformed utf-8 discovered by intrigeri.
2.69:
* Avoid multiple ikiwiki cgi processes piling up, eating all memory,
and thrashing, by making the cgi wrapper wait on a cgilock.
If you had to set apache's MaxClients low to avoid ikiwiki thrashing your
server, you can now turn it up to a high value.
* Stop busy-waiting in lockwiki, as this could delay ikiwiki from waking up
for up to one second. The bailout code is no longer needed after above
change.
* Remove support for unused optional wait parameter from lockwiki.
* aggregate: Try to query XML::Feed for the base url when derelevatising
links. Since this needs the just released XML::Feed 0.3, as well
as a not yet released XML::RSS, it will fall back to the old method
if no xml:base info is available.
* meta: Plugin is now enabled by default since the basewiki uses it.
* txt: Do not encode quotes when filtering the txt, as that broke
later parsing of any directives on the page.
* Fix the link() pagespec to match links that are internally recorded as
absolute.
* Add rel=nofollow to recentchanges_links for the same (weak) reasons it
was earlier added to edit links.
* tag: Normalize tagbase so leading/trailing slashes in it don't break
things.
* bzr: Fix dates for recentchanges.
2.68:
* Add support for checking pushes from untrusted git committers.
This can be used to set up anonymous git pushes, and other
similar things.
* format: New plugin, allows embedding differently formatted text
inside a page (ie, otl inside a mdwn page, or syntax highlighted
code inside a page).
* relativedate: New javascript-alicious plugin that makes all dates
display relative, in a very nice way, if I say so myself.
* Optimise the no-op post-commit hook, to speed up web edits by a
fraction of a second.
* git: Allow sha1_commit to be used in the diffurl, to support cgit.
* shortcut: Fix display of shortcuts while previewing.
* Plugins that used to override displaytime should instead override
formattime. displaytime will call that, and may wrap markup
around the formatted time.
* Add an underlay for javascript, and add ikiwiki.js containing
some utility code.
* toggle: Stop embedding the full toggle code on each page using
it, and move it to toggle.js in the javascript underlay.
* recentchanges: Make feed links point back to anchors on the
recentchanges page. (JasonBlevins)
* Fix issue with utf-8 in wikiname breaking session cookies, by
entity-encoding the wikiname in the session cookie.
* Use the pure perl Data::Dumper when generating setup files to
ensure that utf-8 characters are written out as such, and not
as the encoded perl strings the C Data::Dumper produces.
* inline: Only the last feed link was put on the page, fix this to
include all feed links. So rss will be included along with atom,
and pages with multiple feeds will get links added for all
feeds.
* tag: When tagpage is set, force the links created by tagging to
point at the toplevel tagpage, and not closer subpages. The
html links already went there, but internally the links were
not recorded as absolute, which could cause confusing backlinks
etc.
* Add an inject function, that can be used by plugins that want to
replace one of ikiwiki's functions with their own version.
(This is a scary thing that grubs through the symbol table, and
replaces all exported occurances of a function with the injected
version.)
* external: RPC functions can be injected to replace exported functions.
* Updated French translation. Closes: #502694
* Updated Spanish translation from the ever vigilant Victor Moral.
* Updated Danish translation from Jonas Smedegaard. Closes: #503117
* Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
* Several fixes to --render mode.
2.67:
* remove: Avoid $_ breakage. (Stupid, stupid perl.)
* Updated Spanish translation from Victor Moral.
* lockedit: Support specifying which users (and IP addresses) a
page is locked for. This supports most of the ACL type things
users have been wanting to be done. Closes: #443346 (It does
not control who can read a page, but that's out of scope for
ikiwiki.)
* orphans: Fix unquoted page name in regexp.
* google: Plugin provides google site search, contributed by Peter Simons.
* Pass HTTPS variable through the wrapper so that CGI->https can
be used by plugins. Closes: #502047
* inline: Allow MTIME to be used in inlinepage.tmpl.
* inline: Use the feed's description in the rss and atom links.
Closes: #502113
* aggregate: Avoid bug that caused immediate expiration of items
with a date in the future.
Diffstat (limited to 'www/ikiwiki')
-rw-r--r-- | www/ikiwiki/Makefile | 90 | ||||
-rw-r--r-- | www/ikiwiki/PLIST | 55 | ||||
-rw-r--r-- | www/ikiwiki/distinfo | 11 | ||||
-rw-r--r-- | www/ikiwiki/options.mk | 47 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-aa | 8 | ||||
-rw-r--r-- | www/ikiwiki/patches/patch-ab | 13 |
6 files changed, 145 insertions, 79 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 022cb922f61..d5504177aad 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,30 +1,20 @@ -# $NetBSD: Makefile,v 1.22 2008/10/19 19:19:01 he Exp $ +# $NetBSD: Makefile,v 1.23 2009/04/21 16:34:43 schmonz Exp $ # -DISTNAME= ikiwiki_2.66 +DISTNAME= ikiwiki_3.10 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 1 CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} MAINTAINER= reed@NetBSD.org HOMEPAGE= http://ikiwiki.info/ COMMENT= Wiki compiler +LICENSE= gnu-gpl-v2 -PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki -PKG_SUPPORTED_OPTIONS= amazon_s3 imagemagick svn w3m -PKG_SUGGESTED_OPTIONS= # none on by default - -.include "../../mk/bsd.prefs.mk" -.include "../../mk/bsd.options.mk" - -# http://ikiwiki.info/install/index.html -# needed dependencies: DEPENDS+= p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template -# used if available: DEPENDS+= p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session DEPENDS+= p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder DEPENDS+= p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail @@ -32,77 +22,43 @@ DEPENDS+= p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber DEPENDS+= p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML -DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple +DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom DEPENDS+= p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed +DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple +DEPENDS+= p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo DEPENDS+= p5-gettext-[0-9]*:../../devel/p5-gettext -# for amazon_s3 plugin which injects wiki pages into Amazon S3 -# allowing ikiwiki to be used without a dedicated web server. -.if !empty(PKG_OPTIONS:Mamazon_s3) -DEPENDS+= p5-Net-Amazon-S3-[0-9]*:../../net/p5-Net-Amazon-S3 -.endif - -# for img plugin -.if !empty(PKG_OPTIONS:Mimagemagick) -# the plugin uses the ImageMagick tools via PerlMagic -DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick -.endif - -.if !empty(PKG_OPTIONS:Msvn) -DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base -.endif +WRKSRC= ${WRKDIR}/${PKGBASE} +PERL5_PACKLIST= auto/IkiWiki/.packlist +USE_LANGUAGES= # none +USE_TOOLS+= gmake perl:run xgettext -PLIST_VARS+= w3m -.if !empty(PKG_OPTIONS:Mw3m) -DEPENDS+= w3m-[0-9]*:../../www/w3m -PLIST.w3m= yes -SUBST_SED.makefile+= -e 's,/lib/w3m/cgi-bin,/libexec/w3m/cgi-bin,' -INSTALLATION_DIRS+= share/doc/ikiwiki/w3mmode -.else -SUBST_SED.makefile+= -e 's,^\(.*install .*/lib/w3m/cgi-bin\),\#\1,' -.endif +REPLACE_PERL+= ikiwiki-mass-rebuild ikiwiki-transition ikiwiki-update-wikilist +REPLACE_PERL+= ikiwiki-w3m.cgi ikiwiki.in mdwn2man pm_filter +REPLACE_PERL+= *.pm IkiWiki/*.pm IkiWiki/*/*.pm* *.setup */*/*.setup t/*.t +REPLACE_PERL+= plugins/externaldemo # XXX not installed -INSTALLATION_DIRS+= share/doc/ikiwiki -WRKSRC= ${WRKDIR}/ikiwiki -PERL5_PACKLIST= auto/IkiWiki/.packlist -USE_LANGUAGES= # none -USE_TOOLS+= gmake perl:run xgettext - -# TODO: check these -REPLACE_PERL+= IkiWiki.pm ikiwiki-w3m.cgi mdwn2man pm_filter -REPLACE_PERL+= ikiwiki.in ikiwiki-mass-rebuild ikiwiki-update-wikilist -REPLACE_PERL+= ikiwiki-transition -REPLACE_PERL+= t/*.t IkiWiki/*.pm IkiWiki/*/*.pm* -REPLACE_PERL+= auto.setup doc/w3mmode/ikiwiki.setup -#REPLACE_PERL+= plugins/externaldemo # not installed anymore - -# not installed anymore -#REPLACE_PYTHON+= plugins/rst -# TODO: add an rst option -# rst plugin (reStructuredText) needs the python-docutils module -#CHECK_INTERPRETER_SKIP+= lib/ikiwiki/plugins/rst - -SUBST_CLASSES+= makefile +SUBST_CLASSES+= makefile SUBST_STAGE.makefile= post-patch SUBST_FILES.makefile= Makefile.PL SUBST_SED.makefile+= -e 's,share/man/man,${PKGMANDIR}/man,g' +SUBST_CLASSES+= perlpath +SUBST_STAGE.perlpath= post-patch +SUBST_FILES.perlpath= IkiWiki/Setup/Standard.pm +SUBST_SED.perlpath+= -e 's,@PERL5@,${PERL5},g' + PKG_SYSCONFSUBDIR= ${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES+= ${EGDIR}/auto.setup ${PKG_SYSCONFDIR}/auto.setup +CONF_FILES+= ${EGDIR}/auto-blog.setup ${PKG_SYSCONFDIR}/auto-blog.setup CONF_FILES+= ${EGDIR}/wikilist ${PKG_SYSCONFDIR}/wikilist +.include "options.mk" + pre-configure: find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f -post-install: -.if !empty(PKG_OPTIONS:Mw3m) - ${INSTALL_DATA} ${WRKSRC}/html/w3mmode.html \ - ${PREFIX}/share/doc/ikiwiki/ - ${INSTALL_DATA} ${WRKSRC}/doc/w3mmode/ikiwiki.setup \ - ${PREFIX}/share/doc/ikiwiki/w3mmode/ikiwiki.setup -.endif - .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index 16b6bfa1146..72fdf3e0519 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST,v 1.11 2008/09/22 15:09:05 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.12 2009/04/21 16:34:43 schmonz Exp $ bin/ikiwiki bin/ikiwiki-makerepo bin/ikiwiki-transition bin/ikiwiki-update-wikilist +lib/ikiwiki/plugins/proxy.py +lib/ikiwiki/plugins/rst ${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi man/man1/ikiwiki-makerepo.1 man/man1/ikiwiki-transition.1 @@ -12,9 +14,9 @@ man/man8/ikiwiki-mass-rebuild.8 sbin/ikiwiki-mass-rebuild ${PLIST.w3m}share/doc/ikiwiki/w3mmode.html ${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup +share/examples/ikiwiki/auto-blog.setup share/examples/ikiwiki/auto.setup share/examples/ikiwiki/wikilist -share/ikiwiki/basewiki/directive.mdwn share/ikiwiki/basewiki/favicon.ico share/ikiwiki/basewiki/ikiwiki.mdwn share/ikiwiki/basewiki/ikiwiki/blog.mdwn @@ -49,6 +51,7 @@ share/ikiwiki/directives/ikiwiki/directive/copy.mdwn share/ikiwiki/directives/ikiwiki/directive/cut.mdwn share/ikiwiki/directives/ikiwiki/directive/cutpaste.mdwn share/ikiwiki/directives/ikiwiki/directive/edittemplate.mdwn +share/ikiwiki/directives/ikiwiki/directive/format.mdwn share/ikiwiki/directives/ikiwiki/directive/fortune.mdwn share/ikiwiki/directives/ikiwiki/directive/graph.mdwn share/ikiwiki/directives/ikiwiki/directive/haiku.mdwn @@ -82,6 +85,33 @@ share/ikiwiki/directives/ikiwiki/directive/toc.mdwn share/ikiwiki/directives/ikiwiki/directive/toggle.mdwn share/ikiwiki/directives/ikiwiki/directive/toggleable.mdwn share/ikiwiki/directives/ikiwiki/directive/version.mdwn +share/ikiwiki/examples/blog.mdwn +share/ikiwiki/examples/blog/index.mdwn +share/ikiwiki/examples/blog/posts.mdwn +share/ikiwiki/examples/blog/posts/first_post.mdwn +share/ikiwiki/examples/blog/sidebar.mdwn +share/ikiwiki/examples/blog/tags.mdwn +share/ikiwiki/examples/blog/tags/life.mdwn +share/ikiwiki/examples/blog/tags/tech.mdwn +share/ikiwiki/examples/softwaresite.mdwn +share/ikiwiki/examples/softwaresite/Makefile +share/ikiwiki/examples/softwaresite/bugs.mdwn +share/ikiwiki/examples/softwaresite/bugs/done.mdwn +share/ikiwiki/examples/softwaresite/bugs/fails_to_frobnicate.mdwn +share/ikiwiki/examples/softwaresite/bugs/needs_more_bugs.mdwn +share/ikiwiki/examples/softwaresite/contact.mdwn +share/ikiwiki/examples/softwaresite/doc.mdwn +share/ikiwiki/examples/softwaresite/doc/faq.mdwn +share/ikiwiki/examples/softwaresite/doc/install.mdwn +share/ikiwiki/examples/softwaresite/doc/setup.mdwn +share/ikiwiki/examples/softwaresite/download.mdwn +share/ikiwiki/examples/softwaresite/index.mdwn +share/ikiwiki/examples/softwaresite/news.mdwn +share/ikiwiki/examples/softwaresite/news/version_1.0.mdwn +share/ikiwiki/examples/softwaresite/templates/release.mdwn +share/ikiwiki/javascript/ikiwiki.js +share/ikiwiki/javascript/relativedate.js +share/ikiwiki/javascript/toggle.js share/ikiwiki/smiley/smileys.mdwn share/ikiwiki/smiley/smileys/alert.png share/ikiwiki/smiley/smileys/angry.png @@ -117,13 +147,18 @@ share/ikiwiki/templates/atompage.tmpl share/ikiwiki/templates/autoindex.tmpl share/ikiwiki/templates/blogpost.tmpl share/ikiwiki/templates/change.tmpl +share/ikiwiki/templates/comment.tmpl +share/ikiwiki/templates/commentmoderation.tmpl +share/ikiwiki/templates/editcomment.tmpl share/ikiwiki/templates/editconflict.tmpl share/ikiwiki/templates/editcreationconflict.tmpl share/ikiwiki/templates/editfailedsave.tmpl share/ikiwiki/templates/editpage.tmpl share/ikiwiki/templates/editpagegone.tmpl share/ikiwiki/templates/feedlink.tmpl +share/ikiwiki/templates/googleform.tmpl share/ikiwiki/templates/inlinepage.tmpl +share/ikiwiki/templates/microblog.tmpl share/ikiwiki/templates/misc.tmpl share/ikiwiki/templates/page.tmpl share/ikiwiki/templates/passwordmail.tmpl @@ -147,6 +182,16 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo @dirrm share/ikiwiki/templates @dirrm share/ikiwiki/smiley/smileys @dirrm share/ikiwiki/smiley +@dirrm share/ikiwiki/javascript +@dirrm share/ikiwiki/examples/softwaresite/templates +@dirrm share/ikiwiki/examples/softwaresite/news +@dirrm share/ikiwiki/examples/softwaresite/doc +@dirrm share/ikiwiki/examples/softwaresite/bugs +@dirrm share/ikiwiki/examples/softwaresite +@dirrm share/ikiwiki/examples/blog/tags +@dirrm share/ikiwiki/examples/blog/posts +@dirrm share/ikiwiki/examples/blog +@dirrm share/ikiwiki/examples @dirrm share/ikiwiki/directives/ikiwiki/directive @dirrm share/ikiwiki/directives/ikiwiki @dirrm share/ikiwiki/directives @@ -159,5 +204,7 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo @dirrm share/ikiwiki @dirrm share/examples/ikiwiki ${PLIST.w3m}@dirrm share/doc/ikiwiki/w3mmode -@dirrm share/doc/ikiwiki -${PLIST.w3m}@dirrm libexec/w3m/cgi-bin +${PLIST.w3m}@dirrm share/doc/ikiwiki +${PLIST.w3m}@unexec ${RMDIR} %D/libexec/w3m/cgi-bin 2>/dev/null || ${TRUE} +@dirrm lib/ikiwiki/plugins +@dirrm lib/ikiwiki diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index 525b45f9510..352ba651e2e 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.12 2008/10/06 15:34:00 schmonz Exp $ +$NetBSD: distinfo,v 1.13 2009/04/21 16:34:43 schmonz Exp $ -SHA1 (ikiwiki_2.66.tar.gz) = 80516c230712c2ad004368f7a7b3568a65f6c7fb -RMD160 (ikiwiki_2.66.tar.gz) = e8217d7ede61819fda491eb7accaede168215c89 -Size (ikiwiki_2.66.tar.gz) = 1008320 bytes -SHA1 (patch-aa) = 3bc1bca3c6ef5e986f60e40ce2b61afe0142d7da +SHA1 (ikiwiki_3.10.tar.gz) = b55dfe2e7f6f7e86912cbf4a9b55b9364ec2cb29 +RMD160 (ikiwiki_3.10.tar.gz) = 9ae93ffe7bdbfb180c2d689225ecd8f47a644b18 +Size (ikiwiki_3.10.tar.gz) = 1161430 bytes +SHA1 (patch-aa) = e3ae3104f9445e15244a2b65c4867536cdfdcbca +SHA1 (patch-ab) = bbec6e7a4e6772d995a0b084a3875b83950eb194 diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk new file mode 100644 index 00000000000..0c6542e6f0d --- /dev/null +++ b/www/ikiwiki/options.mk @@ -0,0 +1,47 @@ +# $NetBSD: options.mk,v 1.1 2009/04/21 16:34:43 schmonz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki +PKG_SUPPORTED_OPTIONS= ikiwiki-amazon-s3 ikiwiki-search +PKG_SUPPORTED_OPTIONS+= imagemagick python svn w3m +PKG_OPTIONS_LEGACY_OPTS+= amazon_s3:ikiwiki-amazon-s3 + +.include "../../mk/bsd.options.mk" + +.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 +.endif + +.if !empty(PKG_OPTIONS:Mikiwiki-amazon-s3) +DEPENDS+= p5-Net-Amazon-S3-[0-9]*:../../net/p5-Net-Amazon-S3 +DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo +.endif + +.if !empty(PKG_OPTIONS:Mimagemagick) +DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick +.endif + +.if !empty(PKG_OPTIONS:Mpython) +REPLACE_PYTHON+=plugins/proxy.py plugins/rst +DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils +.include "../../lang/python/application.mk" +.endif + +.if !empty(PKG_OPTIONS:Msvn) +DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base +.endif + +PLIST_VARS+= w3m +.if !empty(PKG_OPTIONS:Mw3m) +DEPENDS+= w3m-[0-9]*:../../www/w3m +PLIST.w3m= yes +SUBST_SED.makefile+= -e 's,/lib/w3m/cgi-bin,/libexec/w3m/cgi-bin,' +INSTALLATION_DIRS+= share/doc/${PKGBASE}/w3mmode +post-install: + ${INSTALL_DATA} ${WRKSRC}/html/w3mmode.html \ + ${PREFIX}/share/doc/${PKGBASE} + ${INSTALL_DATA} ${WRKSRC}/doc/w3mmode/ikiwiki.setup \ + ${PREFIX}/share/doc/${PKGBASE}/w3mmode/ikiwiki.setup +.else +SUBST_SED.makefile+= -e 's,^\(.*install .*W3M_CGI_BIN\),\#\1,' +.endif diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa index f378677e90f..7eaef83ea86 100644 --- a/www/ikiwiki/patches/patch-aa +++ b/www/ikiwiki/patches/patch-aa @@ -1,17 +1,19 @@ -$NetBSD: patch-aa,v 1.7 2008/09/09 17:19:13 schmonz Exp $ +$NetBSD: patch-aa,v 1.8 2009/04/21 16:34:43 schmonz Exp $ ---- Makefile.PL.orig 2008-09-08 11:51:42.000000000 -0400 +--- Makefile.PL.orig 2009-04-04 17:26:07.000000000 -0400 +++ Makefile.PL -@@ -95,9 +95,9 @@ extra_install: +@@ -117,10 +117,10 @@ extra_install: # These might fail if a regular user is installing into a home # directory. - -install -d $(DESTDIR)/etc/ikiwiki - -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki - -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki +- -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki + -install -d $(DESTDIR)$(PREFIX)/share/examples/ikiwiki + -install -m 0644 wikilist $(DESTDIR)$(PREFIX)/share/examples/ikiwiki + -install -m 0644 auto.setup $(DESTDIR)$(PREFIX)/share/examples/ikiwiki ++ -install -m 0644 auto-blog.setup $(DESTDIR)$(PREFIX)/share/examples/ikiwiki } } diff --git a/www/ikiwiki/patches/patch-ab b/www/ikiwiki/patches/patch-ab new file mode 100644 index 00000000000..5f9ed332b1b --- /dev/null +++ b/www/ikiwiki/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.3 2009/04/21 16:34:43 schmonz Exp $ + +--- IkiWiki/Setup/Standard.pm.orig 2009-04-04 17:26:07.000000000 -0400 ++++ IkiWiki/Setup/Standard.pm +@@ -101,7 +101,7 @@ sub gendump ($) { + } + + unshift @ret, +- "#!/usr/bin/perl", ++ "#!@PERL5@", + "# $description", + "#", + "# Passing this to ikiwiki --setup will make ikiwiki generate", |