diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 022cb922f619..d5504177aad1 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 +WRKSRC= ${WRKDIR}/${PKGBASE} +PERL5_PACKLIST= auto/IkiWiki/.packlist +USE_LANGUAGES= # none +USE_TOOLS+= gmake perl:run xgettext -# 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 +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 -.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/ikiwiki/w3mmode -.else -SUBST_SED.makefile+= -e 's,^\(.*install .*/lib/w3m/cgi-bin\),\#\1,' -.endif - -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 16b6bfa1146a..72fdf3e05193 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 525b45f95109..352ba651e2ed 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 000000000000..0c6542e6f0da --- /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 f378677e90f7..7eaef83ea863 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 000000000000..5f9ed332b1bf --- /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",