5 files changed, 22 insertions, 28 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index ac3159251d75..43f0849e6a7e 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 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 --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 255d8a92f022..4b88b1c02bd8 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -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 --git a/www/ikiwiki/files/patch-Makefile.PL b/www/ikiwiki/files/patch-Makefile.PL
new file mode 100644
index 000000000000..94cbb7e2cfd4
--- /dev/null
+++ b/www/ikiwiki/files/patch-Makefile.PL
@@ -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 --git a/www/ikiwiki/files/patch-svn.pm b/www/ikiwiki/files/patch-svn.pm
deleted file mode 100644
index 6b90bafe9d77..000000000000
--- a/www/ikiwiki/files/patch-svn.pm
+++ /dev/null
@@ -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 --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index 9b25936a4669..96007f6a385f 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -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