Index: head/www/ikiwiki/Makefile =================================================================== --- head/www/ikiwiki/Makefile (revision 196985) +++ head/www/ikiwiki/Makefile (revision 196986) @@ -1,71 +1,72 @@ # New ports collection makefile for: ikiwiki # Date created: 21 Apr 2007 # Whom: Henrik Brix Andersen # # $FreeBSD$ PORTNAME= ikiwiki -PORTVERSION= 2.1 +PORTVERSION= 2.5 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= henrik@brixandersen.dk COMMENT= A wiki compiler BUILD_DEPENDS= markdown:${PORTSDIR}/textproc/markdown \ ${SITE_PERL}/HTML/Scrubber.pm:${PORTSDIR}/www/p5-HTML-Scrubber \ ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \ ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \ ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext RUN_DEPENDS= ${BUILD_DEPENDS} \ ${SITE_PERL}/CGI/FormBuilder.pm:${PORTSDIR}/www/p5-CGI-FormBuilder \ ${SITE_PERL}/CGI/Session.pm:${PORTSDIR}/www/p5-CGI-Session \ ${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \ ${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 WRKSRC= ${WRKDIR}/${PORTNAME} PERL_CONFIGURE= yes USE_GMAKE= yes USE_GETTEXT= yes OPTIONS= W3M "Install w3m CGI wrapper" off MAN1= ikiwiki.1 MAN8= ikiwiki-mass-rebuild.8 PORTDOCS= CHANGELOG NEWS README .include .if defined(WITH_W3M) PLIST_SUB= W3M="" .else PLIST_SUB= W3M="@comment " .endif post-patch: + @${RM} ${WRKSRC}/IkiWiki/Plugin/graphviz.pm.orig @${REINPLACE_CMD} -e "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \ ${WRKSRC}/IkiWiki/Plugin/mdwn.pm @${REINPLACE_CMD} \ -e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \ -e 's|$$(PREFIX)/lib/w3m|$$(PREFIX)/libexec/w3m|' \ ${WRKSRC}/Makefile.PL .ifndef(WITH_W3M) @${REINPLACE_CMD} -e '/w3m/d' ${WRKSRC}/Makefile.PL .endif post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/ikiwiki/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/www/ikiwiki/distinfo =================================================================== --- head/www/ikiwiki/distinfo (revision 196985) +++ head/www/ikiwiki/distinfo (revision 196986) @@ -1,3 +1,3 @@ -MD5 (ikiwiki_2.1.tar.gz) = b58413be01c3c1ee557b074b78632d19 -SHA256 (ikiwiki_2.1.tar.gz) = d9944e85d788ba836bcaf7615011d4d2fdb35c1b998cc5878e49d8a81a0d3d92 -SIZE (ikiwiki_2.1.tar.gz) = 432312 +MD5 (ikiwiki_2.5.tar.gz) = c93f8e2fa4d4121b6a18a43637c88cf0 +SHA256 (ikiwiki_2.5.tar.gz) = 78a4f7d72bdaa8ffaa3cd0d1b087c7df64f65270425605afa0c2c06eacf0d2ee +SIZE (ikiwiki_2.5.tar.gz) = 475905 Property changes on: head/www/ikiwiki/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/www/ikiwiki/files/patch-graphviz.pm =================================================================== --- head/www/ikiwiki/files/patch-graphviz.pm (nonexistent) +++ head/www/ikiwiki/files/patch-graphviz.pm (revision 196986) @@ -0,0 +1,16 @@ +--- IkiWiki/Plugin/graphviz.pm.orig 2007-07-27 11:35:05.000000000 +0200 ++++ IkiWiki/Plugin/graphviz.pm 2007-07-27 11:36:02.000000000 +0200 +@@ -69,7 +69,12 @@ sub render_graph (\%) { #{{{ + } + } + +- return "\n"; ++ if ($params{preview}) { ++ return "\n"; ++ } ++ else { ++ return "\n"; ++ } + } #}}} + + sub graph (@) { #{{{ Property changes on: head/www/ikiwiki/files/patch-graphviz.pm ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/ikiwiki/pkg-plist =================================================================== --- head/www/ikiwiki/pkg-plist (revision 196985) +++ head/www/ikiwiki/pkg-plist (revision 196986) @@ -1,159 +1,160 @@ %%DATADIR%%/basewiki/blog.mdwn %%DATADIR%%/basewiki/favicon.ico %%DATADIR%%/basewiki/helponformatting.mdwn %%DATADIR%%/basewiki/index.mdwn %%DATADIR%%/basewiki/local.css %%DATADIR%%/basewiki/markdown.mdwn %%DATADIR%%/basewiki/openid.mdwn %%DATADIR%%/basewiki/pagespec.mdwn %%DATADIR%%/basewiki/preprocessordirective.mdwn %%DATADIR%%/basewiki/sandbox.mdwn %%DATADIR%%/basewiki/shortcuts.mdwn %%DATADIR%%/basewiki/smileys.mdwn %%DATADIR%%/basewiki/smileys/alert.png %%DATADIR%%/basewiki/smileys/angry.png %%DATADIR%%/basewiki/smileys/attention.png %%DATADIR%%/basewiki/smileys/biggrin.png %%DATADIR%%/basewiki/smileys/checkmark.png %%DATADIR%%/basewiki/smileys/devil.png %%DATADIR%%/basewiki/smileys/frown.png %%DATADIR%%/basewiki/smileys/icon-error.png %%DATADIR%%/basewiki/smileys/icon-info.png %%DATADIR%%/basewiki/smileys/idea.png %%DATADIR%%/basewiki/smileys/neutral.png %%DATADIR%%/basewiki/smileys/ohwell.png %%DATADIR%%/basewiki/smileys/prio1.png %%DATADIR%%/basewiki/smileys/prio2.png %%DATADIR%%/basewiki/smileys/prio3.png %%DATADIR%%/basewiki/smileys/question.png %%DATADIR%%/basewiki/smileys/redface.png %%DATADIR%%/basewiki/smileys/sad.png %%DATADIR%%/basewiki/smileys/smile.png %%DATADIR%%/basewiki/smileys/smile2.png %%DATADIR%%/basewiki/smileys/smile3.png %%DATADIR%%/basewiki/smileys/smile4.png %%DATADIR%%/basewiki/smileys/star_off.png %%DATADIR%%/basewiki/smileys/star_on.png %%DATADIR%%/basewiki/smileys/thumbs-up.png %%DATADIR%%/basewiki/smileys/tired.png %%DATADIR%%/basewiki/smileys/tongue.png %%DATADIR%%/basewiki/style.css %%DATADIR%%/basewiki/subpage.mdwn %%DATADIR%%/basewiki/subpage/linkingrules.mdwn %%DATADIR%%/basewiki/templates.mdwn %%DATADIR%%/basewiki/templates/note.mdwn %%DATADIR%%/basewiki/templates/popup.mdwn %%DATADIR%%/basewiki/wikiicons/diff.png %%DATADIR%%/basewiki/wikiicons/openidlogin-bg.gif %%DATADIR%%/basewiki/wikilink.mdwn %%DATADIR%%/templates/aggregatepost.tmpl %%DATADIR%%/templates/archivepage.tmpl %%DATADIR%%/templates/atomitem.tmpl %%DATADIR%%/templates/atompage.tmpl %%DATADIR%%/templates/blogpost.tmpl %%DATADIR%%/templates/editpage.tmpl %%DATADIR%%/templates/estseek.conf %%DATADIR%%/templates/feedlink.tmpl %%DATADIR%%/templates/inlinepage.tmpl %%DATADIR%%/templates/misc.tmpl %%DATADIR%%/templates/notifymail.tmpl %%DATADIR%%/templates/page.tmpl %%DATADIR%%/templates/passwordmail.tmpl %%DATADIR%%/templates/recentchanges.tmpl %%DATADIR%%/templates/rssitem.tmpl %%DATADIR%%/templates/rsspage.tmpl %%DATADIR%%/templates/searchform.tmpl %%DATADIR%%/templates/titlepage.tmpl %%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki/.packlist %%SITE_PERL%%/IkiWiki.pm %%SITE_PERL%%/IkiWiki/CGI.pm %%SITE_PERL%%/IkiWiki/Plugin/aggregate.pm %%SITE_PERL%%/IkiWiki/Plugin/anonok.pm %%SITE_PERL%%/IkiWiki/Plugin/brokenlinks.pm %%SITE_PERL%%/IkiWiki/Plugin/camelcase.pm %%SITE_PERL%%/IkiWiki/Plugin/conditional.pm %%SITE_PERL%%/IkiWiki/Plugin/ddate.pm %%SITE_PERL%%/IkiWiki/Plugin/favicon.pm %%SITE_PERL%%/IkiWiki/Plugin/fortune.pm %%SITE_PERL%%/IkiWiki/Plugin/goodstuff.pm %%SITE_PERL%%/IkiWiki/Plugin/googlecalendar.pm %%SITE_PERL%%/IkiWiki/Plugin/graphviz.pm %%SITE_PERL%%/IkiWiki/Plugin/haiku.pm %%SITE_PERL%%/IkiWiki/Plugin/html.pm %%SITE_PERL%%/IkiWiki/Plugin/htmlscrubber.pm %%SITE_PERL%%/IkiWiki/Plugin/htmltidy.pm %%SITE_PERL%%/IkiWiki/Plugin/httpauth.pm %%SITE_PERL%%/IkiWiki/Plugin/img.pm %%SITE_PERL%%/IkiWiki/Plugin/inline.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 %%SITE_PERL%%/IkiWiki/Plugin/opendiscussion.pm %%SITE_PERL%%/IkiWiki/Plugin/openid.pm %%SITE_PERL%%/IkiWiki/Plugin/orphans.pm %%SITE_PERL%%/IkiWiki/Plugin/otl.pm %%SITE_PERL%%/IkiWiki/Plugin/pagecount.pm %%SITE_PERL%%/IkiWiki/Plugin/pagestats.pm +%%SITE_PERL%%/IkiWiki/Plugin/pagetemplate.pm %%SITE_PERL%%/IkiWiki/Plugin/passwordauth.pm %%SITE_PERL%%/IkiWiki/Plugin/poll.pm %%SITE_PERL%%/IkiWiki/Plugin/polygen.pm %%SITE_PERL%%/IkiWiki/Plugin/postsparkline.pm %%SITE_PERL%%/IkiWiki/Plugin/prettydate.pm %%SITE_PERL%%/IkiWiki/Plugin/rawhtml.pm %%SITE_PERL%%/IkiWiki/Plugin/rst.pm %%SITE_PERL%%/IkiWiki/Plugin/search.pm %%SITE_PERL%%/IkiWiki/Plugin/shortcut.pm %%SITE_PERL%%/IkiWiki/Plugin/sidebar.pm %%SITE_PERL%%/IkiWiki/Plugin/signinedit.pm %%SITE_PERL%%/IkiWiki/Plugin/skeleton.pm %%SITE_PERL%%/IkiWiki/Plugin/smiley.pm %%SITE_PERL%%/IkiWiki/Plugin/sparkline.pm %%SITE_PERL%%/IkiWiki/Plugin/table.pm %%SITE_PERL%%/IkiWiki/Plugin/tag.pm %%SITE_PERL%%/IkiWiki/Plugin/template.pm %%SITE_PERL%%/IkiWiki/Plugin/testpagespec.pm %%SITE_PERL%%/IkiWiki/Plugin/textile.pm %%SITE_PERL%%/IkiWiki/Plugin/toc.pm %%SITE_PERL%%/IkiWiki/Plugin/toggle.pm %%SITE_PERL%%/IkiWiki/Plugin/typography.pm %%SITE_PERL%%/IkiWiki/Plugin/wikitext.pm %%SITE_PERL%%/IkiWiki/Rcs/Stub.pm %%SITE_PERL%%/IkiWiki/Rcs/git.pm %%SITE_PERL%%/IkiWiki/Rcs/mercurial.pm %%SITE_PERL%%/IkiWiki/Rcs/svn.pm %%SITE_PERL%%/IkiWiki/Rcs/tla.pm %%SITE_PERL%%/IkiWiki/Render.pm %%SITE_PERL%%/IkiWiki/Setup.pm %%SITE_PERL%%/IkiWiki/Setup/Standard.pm %%SITE_PERL%%/IkiWiki/UserInfo.pm %%SITE_PERL%%/IkiWiki/Wrapper.pm bin/ikiwiki %%W3M%%libexec/w3m/cgi-bin/ikiwiki-w3m.cgi sbin/ikiwiki-mass-rebuild share/locale/bg/LC_MESSAGES/ikiwiki.mo share/locale/cs/LC_MESSAGES/ikiwiki.mo share/locale/es/LC_MESSAGES/ikiwiki.mo share/locale/fr/LC_MESSAGES/ikiwiki.mo share/locale/gu/LC_MESSAGES/ikiwiki.mo share/locale/pl/LC_MESSAGES/ikiwiki.mo share/locale/sv/LC_MESSAGES/ikiwiki.mo share/locale/vi/LC_MESSAGES/ikiwiki.mo @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IkiWiki @dirrm %%DATADIR%%/basewiki/smileys @dirrm %%DATADIR%%/basewiki/subpage @dirrm %%DATADIR%%/basewiki/templates @dirrm %%DATADIR%%/basewiki/wikiicons @dirrm %%DATADIR%%/basewiki @dirrm %%DATADIR%%/templates @dirrm %%DATADIR%% @dirrm %%SITE_PERL%%/IkiWiki/Plugin @dirrm %%SITE_PERL%%/IkiWiki/Rcs @dirrm %%SITE_PERL%%/IkiWiki/Setup @dirrm %%SITE_PERL%%/IkiWiki %%W3M%%@dirrmtry libexec/w3m/cgi-bin %%W3M%%@dirrmtry libexec/w3m Property changes on: head/www/ikiwiki/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property