Date: Sun, 29 Apr 2007 14:23:39 +0200 (CEST) From: Henrik Brix Andersen <henrik@brixandersen.dk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/112240: [maintainer-update] Update www/ikiwiki to v1.51 Message-ID: <20070429122339.7E69511434@lothlorien.brixandersen.dk> Resent-Message-ID: <200704291230.l3TCU5c2020704@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112240 >Category: ports >Synopsis: [maintainer-update] Update www/ikiwiki to v1.51 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 29 12:30:05 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Henrik Brix Andersen >Release: FreeBSD 7.0-CURRENT i386 >Organization: pil.dk >Environment: System: FreeBSD lothlorien.brixandersen.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #21: Sun Apr 29 01:31:02 CEST 2007 root@lothlorien.brixandersen.dk:/usr/obj/usr/src/sys/LOTHLORIEN i386 >Description: Update www/ikiwiki to version 1.51. ChangeLog available at http://ikiwiki.info/news/ >How-To-Repeat: >Fix: Please notice that the patch below removes files/patch-svn.pm - this file needs to be removed from CVS. A new patch, files/patch-Makefile.PL, is added. --- ikiwiki.diff begins here --- diff -urpN /usr/ports/www/ikiwiki/Makefile ikiwiki/Makefile --- /usr/ports/www/ikiwiki/Makefile Mon Apr 23 11:00:59 2007 +++ ikiwiki/Makefile Sun Apr 29 12:31:27 2007 @@ -5,7 +5,7 @@ # $FreeBSD: ports/www/ikiwiki/Makefile,v 1.1 2007/04/23 09:00:59 miwi Exp $ PORTNAME= ikiwiki -PORTVERSION= 1.50 +PORTVERSION= 1.51 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -51,11 +51,9 @@ PLIST_SUB= W3M="@comment " .endif post-patch: - @${RM} ${WRKSRC}/IkiWiki/Rcs/svn.pm.orig @${REINPLACE_CMD} -e "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \ ${WRKSRC}/IkiWiki/Plugin/mdwn.pm @${REINPLACE_CMD} \ - -e 's|$$(CP) -a|$$(CP) -pPR|' \ -e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \ -e 's|$$(PREFIX)/lib/w3m|$$(PREFIX)/libexec/w3m|' \ ${WRKSRC}/Makefile.PL diff -urpN /usr/ports/www/ikiwiki/distinfo ikiwiki/distinfo --- /usr/ports/www/ikiwiki/distinfo Mon Apr 23 11:00:59 2007 +++ ikiwiki/distinfo Sun Apr 29 12:19:11 2007 @@ -1,3 +1,3 @@ -MD5 (ikiwiki_1.50.tar.gz) = d50de4fe7fd4fb752bf0941e1cf0dc10 -SHA256 (ikiwiki_1.50.tar.gz) = 30bbf5ee0e1841f4cbb7c9f10216300ffbf757e41f1e69b6b1402803d994320f -SIZE (ikiwiki_1.50.tar.gz) = 401720 +MD5 (ikiwiki_1.51.tar.gz) = 28e8e5d3830833a3ed5b9934407452a3 +SHA256 (ikiwiki_1.51.tar.gz) = 2cd365080193f2bdcf9a90c47b965a6d38d8c9e211771a9c3c46b7ae942c7f88 +SIZE (ikiwiki_1.51.tar.gz) = 418926 diff -urpN /usr/ports/www/ikiwiki/files/patch-Makefile.PL ikiwiki/files/patch-Makefile.PL --- /usr/ports/www/ikiwiki/files/patch-Makefile.PL Thu Jan 1 01:00:00 1970 +++ ikiwiki/files/patch-Makefile.PL Sun Apr 29 13:28:05 2007 @@ -0,0 +1,17 @@ +--- Makefile.PL.orig Sun Apr 29 12:57:51 2007 ++++ Makefile.PL Sun Apr 29 13:27:51 2007 +@@ -47,8 +47,12 @@ extra_clean: + + extra_install: + install -d $(DESTDIR)$(PREFIX)/share/ikiwiki +- find basewiki templates \( -type f -or -type l \) ! -regex '.*\.svn.*' \ +- -exec cp --parents -aL {} $(DESTDIR)$(PREFIX)/share/ikiwiki \; ++ for dir in `find -L basewiki templates -type d ! -regex '.*\.svn.*'`; do \ ++ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ ++ for file in `find -L $$dir -maxdepth 1 -type f`; do \ ++ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ ++ done; \ ++ done + + install -d $(DESTDIR)$(PREFIX)/share/man/man1 + install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1 diff -urpN /usr/ports/www/ikiwiki/files/patch-svn.pm ikiwiki/files/patch-svn.pm --- /usr/ports/www/ikiwiki/files/patch-svn.pm Mon Apr 23 11:00:59 2007 +++ ikiwiki/files/patch-svn.pm Thu Jan 1 01:00:00 1970 @@ -1,22 +0,0 @@ ---- IkiWiki/Rcs/svn.pm.orig Sun Jan 28 01:04:48 2007 -+++ IkiWiki/Rcs/svn.pm Mon Apr 16 22:55:29 2007 -@@ -176,7 +176,8 @@ sub rcs_recentchanges ($) { #{{{ - } - - foreach (keys %{$logentry->{paths}}) { -- next unless /^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/; -+ next unless ! length $config{svnpath} || -+ /^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/; - my $file=$1; - my $diffurl=$config{diffurl}; - $diffurl=~s/\[\[file\]\]/$file/g; -@@ -218,7 +219,8 @@ sub rcs_notify () { #{{{ - my @changed_pages; - foreach my $change (`svnlook changed $config{svnrepo} -r $rev`) { - chomp $change; -- if ($change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) { -+ if (! length $config{svnpath} || -+ $change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) { - push @changed_pages, $1; - } - } diff -urpN /usr/ports/www/ikiwiki/pkg-plist ikiwiki/pkg-plist --- /usr/ports/www/ikiwiki/pkg-plist Mon Apr 23 11:00:59 2007 +++ ikiwiki/pkg-plist Sun Apr 29 12:21:23 2007 @@ -116,6 +116,7 @@ %%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 --- ikiwiki.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070429122339.7E69511434>