From ef03b2765b028bcb87f7262fecc06e54950361e9 Mon Sep 17 00:00:00 2001 From: schmonz Date: Thu, 4 Sep 2008 15:34:30 +0000 Subject: Update to 2.62.1. From the changelog: 2.62.1: * filecheck: Fixed two bits broken in move from attachment. 2.62: The teximg plugin now has a configurable LaTeX preamble. As part of this change the mchem LaTeX package has been removed from the default LaTeX preamble as it wasn't included in many TeX installations. The previous behaviour can be restored by adding the following to your ikiwiki setup: teximg_prefix => '\documentclass{scrartcl} \usepackage[version=3]{mhchem} \usepackage{amsmath} \usepackage{amsfonts} \usepackage{amssymb} \pagestyle{empty} \begin{document}', In addition, the rendering mechanism has been changed to use dvipng by default, if available. * Avoid using cp -a (again). (HenrikBrixAndersen) * Avoid using hostname -f for portability to eg, OS X, use Net::Domain instead, and prompt if it fails. * Fix bug in wikiname sanitisation in the setup automator. * ikiwiki-makerepo: Added support for monotone. (Thomas Keller) * map: The fix for #449285 was buggy and broke display of parents in certian circumstances. * teximg: The prefix is configurable, and has changed to not include the nonstandard mhchem by default. (willu) * teximg: dvipng is used if available to render images. Its output is antialiased and better than dvips. If not available, the old dvips+convert chain will be used. (willu) * Drop suggests on texlive-science, add suggests on dvipng. * listdirectives: New plugin. (willu) * filecheck: New plugin factoring out the PageSpec additions that were originally part of the attachment plugin. * edittemplate: Don't wipe out edits on preview. * color: New plugin from ptecza. * autoindex: Avoid re-adding previously deleted (or renamed) pages. 2.61: * poll: Fix typo that broke plugin. * graphviz: Fix breakage of the name of the preprocessor directive. 2.60: Admin preferences are moving from the web interface to the setup file. There are three new options in the setup file: locked_pages, banned_users, and allowed_attachments. The admin prefs page can still be used, but that's deprecated, and the prefs will be hidden if a value is not already set. If a value is set in the web interface, you're encouraged to move that setting to your setup file now, since version 3.0 will remove the deprecated admin prefs web interface. Also, the layout of the setup file has changed in a significant way in this release. Old setup files will continue to work, but new features, like the new websetup interface, require a new format setup file. You can convert old setup files into the new format by running ikiwiki-transition setupformat ikiwiki.setup [ Joey Hess ] * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup" can be used create a new wiki in seconds. * websetup: New plugin providing a setup form on the web. * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's current configuration. * The way wrappers are defined in the setup file has changed. Old setup files will continue to work, for now. * ikiwiki-transition setupformat can be used to convert a setup file to the new format. * Version control backends promoted to first-class plugins. * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now always to add. * Start moving admin preferences from the web interface to the setup file. * Add getsetup hook, all plugins should use it to record information about themselves and any fields they add to %config * Large amounts of internal config data reorg. * ikiwiki-makerepo: Bail if both srcdir and repository are not specified. Closes: #493628 * Clarify some wording in the setup documentation that could maybe lead users to putting paths with "~/" in the setup file, which doesn't work. Closes: #493835 * autoindex: Ignore internal pages, and take underlay directories into account. Also, avoid making index pages for directories that contain no files. * external: Fix support for hooks called in an array context. * Options set in the setup file are now immediatly loaded by ikiwiki -setup. This allows later switches to override them. Previously, setup file options overrode most command line options. * Added a small icon to the search input box. [ Josh Triplett ] * Add Suggests on texlive and texlive-science for the teximg plugin [ Joey Hess ] * inline: Ignore parent dirs when sorting pages by title. * rename: Support changing page extensions. (willu) * Danish update. Closes: #494632 --- www/ikiwiki/Makefile | 18 ++++++++++++------ www/ikiwiki/PLIST | 8 ++++++-- www/ikiwiki/distinfo | 9 +++++---- www/ikiwiki/patches/patch-aa | 17 +++++++++++++++++ 4 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 www/ikiwiki/patches/patch-aa (limited to 'www/ikiwiki') diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 57d290a011d..313e1da54b9 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2008/08/01 18:41:08 schmonz Exp $ +# $NetBSD: Makefile,v 1.18 2008/09/04 15:34:30 schmonz Exp $ # -DISTNAME= ikiwiki_2.56 +DISTNAME= ikiwiki_2.62.1 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} @@ -72,8 +72,8 @@ USE_TOOLS+= gmake perl:run xgettext 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+= doc/ikiwiki.setup doc/w3mmode/ikiwiki.setup +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 @@ -87,9 +87,15 @@ SUBST_STAGE.makefile= post-patch SUBST_FILES.makefile= Makefile.PL SUBST_SED.makefile+= -e 's,share/man/man,${PKGMANDIR}/man,g' +PKG_SYSCONFSUBDIR= ${PKGBASE} +EGDIR= $(PREFIX)/share/examples/${PKGBASE} +CONF_FILES+= ${EGDIR}/auto.setup ${PKG_SYSCONFDIR}/auto.setup +CONF_FILES+= ${EGDIR}/wikilist ${PKG_SYSCONFDIR}/wikilist + +pre-configure: + find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f + post-install: - ${INSTALL_DATA} ${WRKSRC}/html/ikiwiki.setup \ - ${PREFIX}/share/doc/ikiwiki/ .if !empty(PKG_OPTIONS:Mw3m) ${INSTALL_DATA} ${WRKSRC}/html/w3mmode.html \ ${PREFIX}/share/doc/ikiwiki/ diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index 681f000ec5d..27398ba6177 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2008/08/01 18:41:08 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/09/04 15:34:30 schmonz Exp $ bin/ikiwiki bin/ikiwiki-makerepo bin/ikiwiki-transition @@ -10,14 +10,16 @@ man/man1/ikiwiki-update-wikilist.1 man/man1/ikiwiki.1 man/man8/ikiwiki-mass-rebuild.8 sbin/ikiwiki-mass-rebuild -share/doc/ikiwiki/ikiwiki.setup ${PLIST.w3m}share/doc/ikiwiki/w3mmode.html ${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup +share/examples/ikiwiki/auto.setup +share/examples/ikiwiki/wikilist share/ikiwiki/basewiki/blog.mdwn share/ikiwiki/basewiki/favicon.ico share/ikiwiki/basewiki/helponformatting.mdwn share/ikiwiki/basewiki/ikiwiki.mdwn share/ikiwiki/basewiki/ikiwiki/blog.mdwn +share/ikiwiki/basewiki/ikiwiki/directive.mdwn share/ikiwiki/basewiki/ikiwiki/formatting.mdwn share/ikiwiki/basewiki/ikiwiki/markdown.mdwn share/ikiwiki/basewiki/ikiwiki/openid.mdwn @@ -44,6 +46,7 @@ share/ikiwiki/basewiki/templates/note.mdwn share/ikiwiki/basewiki/templates/popup.mdwn share/ikiwiki/basewiki/wikiicons/diff.png share/ikiwiki/basewiki/wikiicons/openidlogin-bg.gif +share/ikiwiki/basewiki/wikiicons/search-bg.gif share/ikiwiki/basewiki/wikilink.mdwn share/ikiwiki/smiley/smileys.mdwn share/ikiwiki/smiley/smileys/alert.png @@ -117,6 +120,7 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo @dirrm share/ikiwiki/basewiki/ikiwiki @dirrm share/ikiwiki/basewiki @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 diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index ab1953114a7..e495c9031ba 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.8 2008/08/01 18:41:08 schmonz Exp $ +$NetBSD: distinfo,v 1.9 2008/09/04 15:34:30 schmonz Exp $ -SHA1 (ikiwiki_2.56.tar.gz) = f5c12c096cc069eee109a620c729c728d41a6d92 -RMD160 (ikiwiki_2.56.tar.gz) = 1fc42fd17d99cc60d62e0360c42c3742db8d1295 -Size (ikiwiki_2.56.tar.gz) = 897974 bytes +SHA1 (ikiwiki_2.62.1.tar.gz) = a03976b0828bdf2c864116cdd9d850b5212234d8 +RMD160 (ikiwiki_2.62.1.tar.gz) = fa9dd64d7308c659e172cd2b1470936d6439e8bb +Size (ikiwiki_2.62.1.tar.gz) = 949723 bytes +SHA1 (patch-aa) = 50987d0a55426b79c88dfa0cb5b30ad370e942a5 diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa new file mode 100644 index 00000000000..2c9821dd9b4 --- /dev/null +++ b/www/ikiwiki/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.6 2008/09/04 15:34:30 schmonz Exp $ + +--- Makefile.PL.orig 2008-08-27 15:25:08.000000000 -0400 ++++ Makefile.PL +@@ -50,9 +50,9 @@ extra_clean: + $(MAKE) -C po clean + + extra_install: +- install -d $(DESTDIR)/etc/ikiwiki +- install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki +- install -m 0644 auto.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 -d $(DESTDIR)$(PREFIX)/share/ikiwiki + for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \ -- cgit v1.2.3