diff options
| author | Henrik Brix Andersen <brix@FreeBSD.org> | 2008-03-09 21:25:10 +0000 |
|---|---|---|
| committer | Henrik Brix Andersen <brix@FreeBSD.org> | 2008-03-09 21:25:10 +0000 |
| commit | 9e1ae0692549b1c2e0a91b1946677ed6b65a968e (patch) | |
| tree | 932647f734926ae0ae379dc560d3edbdbc2166d2 /www/ikiwiki | |
| parent | 26f3f8db7a3a61a0ebcc71bacce8ae56cb51d93d (diff) | |
| download | ports-9e1ae0692549b1c2e0a91b1946677ed6b65a968e.tar.gz ports-9e1ae0692549b1c2e0a91b1946677ed6b65a968e.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, 35 insertions, 6 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index da9f71d27846..e38c0c3af6d2 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= ikiwiki -PORTVERSION= 2.32.3 +PORTVERSION= 2.40 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -38,7 +38,7 @@ USE_GETTEXT= yes OPTIONS= W3M "Install w3m CGI wrapper" off -MAN1= ikiwiki.1 ikiwiki-makerepo.1 ikiwiki-update-wikilist.1 +MAN1= ikiwiki.1 ikiwiki-makerepo.1 ikiwiki-transition.1 ikiwiki-update-wikilist.1 MAN8= ikiwiki-mass-rebuild.8 PORTDOCS= CHANGELOG NEWS README PORTEXAMPLES= ikiwiki.setup @@ -54,6 +54,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 @${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 d2f334de20ff..89eea9b760ca 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,3 +1,3 @@ -MD5 (ikiwiki_2.32.3.tar.gz) = 455c27111fd530584a2697b8caefe05b -SHA256 (ikiwiki_2.32.3.tar.gz) = 0622dd576f7e41b7c65da28eb1e65a7adfc5a86b42dd94617adcb30e94368d3f -SIZE (ikiwiki_2.32.3.tar.gz) = 638515 +MD5 (ikiwiki_2.40.tar.gz) = 7d4d1eaef0e60e8199f51d4b72d4c202 +SHA256 (ikiwiki_2.40.tar.gz) = b3a544628bc52c16407c35e50e9c409333dca2d8672743b66d9182bbea80fa75 +SIZE (ikiwiki_2.40.tar.gz) = 654139 diff --git a/www/ikiwiki/files/patch-mdwn.pm b/www/ikiwiki/files/patch-mdwn.pm new file mode 100644 index 000000000000..02ebb96a1c6c --- /dev/null +++ b/www/ikiwiki/files/patch-mdwn.pm @@ -0,0 +1,27 @@ +--- 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 571dda0c88d3..6472cf64e738 100644 --- a/www/ikiwiki/pkg-plist +++ b/www/ikiwiki/pkg-plist @@ -100,11 +100,11 @@ %%SITE_PERL%%/IkiWiki/Plugin/httpauth.pm %%SITE_PERL%%/IkiWiki/Plugin/img.pm %%SITE_PERL%%/IkiWiki/Plugin/inline.pm +%%SITE_PERL%%/IkiWiki/Plugin/link.pm %%SITE_PERL%%/IkiWiki/Plugin/linkmap.pm %%SITE_PERL%%/IkiWiki/Plugin/lockedit.pm %%SITE_PERL%%/IkiWiki/Plugin/map.pm %%SITE_PERL%%/IkiWiki/Plugin/mdwn.pm -%%SITE_PERL%%/IkiWiki/Plugin/mdwn.pm.bak %%SITE_PERL%%/IkiWiki/Plugin/meta.pm %%SITE_PERL%%/IkiWiki/Plugin/mirrorlist.pm %%SITE_PERL%%/IkiWiki/Plugin/more.pm @@ -154,6 +154,7 @@ %%SITE_PERL%%/IkiWiki/Wrapper.pm bin/ikiwiki bin/ikiwiki-makerepo +bin/ikiwiki-transition bin/ikiwiki-update-wikilist lib/ikiwiki/plugins/externaldemo lib/ikiwiki/plugins/rst |