diff options
| author | Henrik Brix Andersen <brix@FreeBSD.org> | 2008-04-01 21:07:22 +0000 |
|---|---|---|
| committer | Henrik Brix Andersen <brix@FreeBSD.org> | 2008-04-01 21:07:22 +0000 |
| commit | f4461ba2a3abfebdd64b4ab1f6e2a582a43f19ed (patch) | |
| tree | 3e3aefb4482b91c5846f246907ae82879ccf0c1a /www/ikiwiki | |
| parent | 4674aa5424c7bec1d4de6f8d5910722a8db53280 (diff) | |
| download | ports-f4461ba2a3abfebdd64b4ab1f6e2a582a43f19ed.tar.gz ports-f4461ba2a3abfebdd64b4ab1f6e2a582a43f19ed.zip | |
Notes
Diffstat (limited to 'www/ikiwiki')
| -rw-r--r-- | www/ikiwiki/Makefile | 5 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 6 | ||||
| -rw-r--r-- | www/ikiwiki/files/patch-mdwn.pm | 27 | ||||
| -rw-r--r-- | www/ikiwiki/pkg-plist | 3 |
4 files changed, 8 insertions, 33 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index e38c0c3af6d2..8c76bfe30248 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= ikiwiki -PORTVERSION= 2.40 +PORTVERSION= 2.41 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -26,7 +26,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS} \ ${SITE_PERL}/File/MimeInfo.pm:${PORTSDIR}/devel/p5-File-MimeInfo \ ${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \ ${SITE_PERL}/RPC/XML.pm:${PORTSDIR}/net/p5-RPC-XML \ - ${SITE_PERL}/Time/Duration.pm:${PORTSDIR}/devel/p5-Time-Duration \ ${SITE_PERL}/XML/Feed.pm:${PORTSDIR}/textproc/p5-XML-Feed \ ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple @@ -54,7 +53,7 @@ PLIST_SUB= W3M="@comment " post-patch: @${REINPLACE_CMD} -e "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \ ${WRKSRC}/IkiWiki/Plugin/mdwn.pm - @${RM} ${WRKSRC}/IkiWiki/Plugin/mdwn.pm.orig ${WRKSRC}/IkiWiki/Plugin/mdwn.pm.bak + @${RM} ${WRKSRC}/IkiWiki/Plugin/mdwn.pm.bak @${REINPLACE_CMD} -e "s|/etc/ikiwiki/wikilist|${LOCALBASE}/etc/ikiwiki/wikilist|" \ ${WRKSRC}/ikiwiki-mass-rebuild \ ${WRKSRC}/doc/ikiwiki-mass-rebuild.mdwn \ diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index 89eea9b760ca..652a8e22dac9 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,3 +1,3 @@ -MD5 (ikiwiki_2.40.tar.gz) = 7d4d1eaef0e60e8199f51d4b72d4c202 -SHA256 (ikiwiki_2.40.tar.gz) = b3a544628bc52c16407c35e50e9c409333dca2d8672743b66d9182bbea80fa75 -SIZE (ikiwiki_2.40.tar.gz) = 654139 +MD5 (ikiwiki_2.41.tar.gz) = 8af41395729ecf77a4a19e31e035bd66 +SHA256 (ikiwiki_2.41.tar.gz) = 9c2b566f0767061dbd6ebb9f336e2bce2939a2163e9594a2c9cb7924c4008245 +SIZE (ikiwiki_2.41.tar.gz) = 689846 diff --git a/www/ikiwiki/files/patch-mdwn.pm b/www/ikiwiki/files/patch-mdwn.pm deleted file mode 100644 index 02ebb96a1c6c..000000000000 --- a/www/ikiwiki/files/patch-mdwn.pm +++ /dev/null @@ -1,27 +0,0 @@ ---- IkiWiki/Plugin/mdwn.pm.orig 2008-03-08 11:33:50.000000000 +0100 -+++ IkiWiki/Plugin/mdwn.pm 2008-03-08 13:37:21.000000000 +0100 -@@ -28,14 +28,20 @@ sub htmlize (@) { #{{{ - $markdown_sub=\&Markdown::Markdown; - } - else { -- eval q{use Text::Markdown}; -+ eval q{use Text::Markdown 'Markdown'}; - if (! $@) { - $markdown_sub=\&Text::Markdown::Markdown; - } - else { -- do "/usr/bin/markdown" || -- error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!)); -- $markdown_sub=\&Markdown::Markdown; -+ eval q{use Text::Markdown 'markdown'}; -+ if (! $@) { -+ $markdown_sub=\&Text::Markdown::markdown; -+ } -+ else { -+ do "/usr/bin/markdown" || -+ error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!)); -+ $markdown_sub=\&Markdown::Markdown; -+ } - } - } - require Encode; diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist index 6472cf64e738..eba815f44c6a 100644 --- a/www/ikiwiki/pkg-plist +++ b/www/ikiwiki/pkg-plist @@ -122,6 +122,7 @@ %%SITE_PERL%%/IkiWiki/Plugin/prettydate.pm %%SITE_PERL%%/IkiWiki/Plugin/rawhtml.pm %%SITE_PERL%%/IkiWiki/Plugin/recentchanges.pm +%%SITE_PERL%%/IkiWiki/Plugin/recentchangesdiff.pm %%SITE_PERL%%/IkiWiki/Plugin/search.pm %%SITE_PERL%%/IkiWiki/Plugin/shortcut.pm %%SITE_PERL%%/IkiWiki/Plugin/sidebar.pm @@ -157,6 +158,8 @@ bin/ikiwiki-makerepo bin/ikiwiki-transition bin/ikiwiki-update-wikilist lib/ikiwiki/plugins/externaldemo +lib/ikiwiki/plugins/proxy.py +lib/ikiwiki/plugins/pythondemo lib/ikiwiki/plugins/rst %%W3M%%libexec/w3m/cgi-bin/ikiwiki-w3m.cgi sbin/ikiwiki-mass-rebuild |