4 files changed, 14 insertions, 64 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 9857832580e2..c9b875a9ac63 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	2.52
+PORTVERSION=	2.55
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
 		http://kitenet.net/~joey/debian/unstable/
@@ -60,7 +60,6 @@ PLIST_SUB=	W3M="@comment "
 .endif
 
 post-patch:
-	@${RM} ${WRKSRC}/IkiWiki/Plugin/attachment.pm.orig
 	@${REINPLACE_CMD} -e \
 		"s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
 		${WRKSRC}/IkiWiki/Plugin/mdwn.pm
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 614409ee0302..df05a67bdf80 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_2.52.tar.gz) = 58153cbd11ddf664d7cc310a32ae684a
-SHA256 (ikiwiki_2.52.tar.gz) = 61bfb329a09599b11f0a39d8e407386979a068ba205811fc6775ea1ec3053602
-SIZE (ikiwiki_2.52.tar.gz) = 765544
+MD5 (ikiwiki_2.55.tar.gz) = b4ab0b86f8a184c333d565c48fbc233a
+SHA256 (ikiwiki_2.55.tar.gz) = c5d72b798b4862663a586ad9fa3048ff94fbcae2da57d6c1c34effc3b7e3c5de
+SIZE (ikiwiki_2.55.tar.gz) = 891165
diff --git a/www/ikiwiki/files/patch-IkiWiki-Plugin-attachment.pm b/www/ikiwiki/files/patch-IkiWiki-Plugin-attachment.pm
deleted file mode 100644
index 59bcabf8191e..000000000000
--- a/www/ikiwiki/files/patch-IkiWiki-Plugin-attachment.pm
+++ /dev/null
@@ -1,58 +0,0 @@
---- IkiWiki/Plugin/attachment.pm.orig	2008-07-06 23:36:47.000000000 +0200
-+++ IkiWiki/Plugin/attachment.pm	2008-07-09 20:55:36.000000000 +0200
-@@ -21,6 +21,8 @@ sub formbuilder_setup (@) { #{{{
- 	my $q=$params{cgi};
- 
- 	if (defined $form->field("do") && $form->field("do") eq "edit") {
-+		# Add attachment field, set type to multipart.
-+		$form->enctype(&CGI::MULTIPART);
- 		$form->field(name => 'attachment', type => 'file');
- 		# These buttons are not put in the usual place, so
- 		# are not added to the normal formbuilder button list.
-@@ -34,7 +36,8 @@ sub formbuilder_setup (@) { #{{{
- 		# Start with the attachments interface toggled invisible,
- 		# but if it was used, keep it open.
- 		if ($form->submitted ne "Upload Attachment" &&
--		    ! length $q->param("attachment_select")) {
-+		    (! defined $q->param("attachment_select") ||
-+		    ! length $q->param("attachment_select"))) {
- 			$form->tmpl_param("attachments-class" => "toggleable");
- 		}
- 		else {
-@@ -86,7 +89,19 @@ sub formbuilder (@) { #{{{
- 		# This is an (apparently undocumented) way to get the name
- 		# of the temp file that CGI writes the upload to.
- 		my $tempfile=$q->tmpFileName($filename);
--		
-+		if (! defined $tempfile || ! length $tempfile) {
-+			# perl 5.8 needs an alternative, awful method
-+			if ($q =~ /HASH/ && exists $q->{'.tmpfiles'}) {
-+				foreach my $key (keys(%{$q->{'.tmpfiles'}})) {
-+					$tempfile=$q->tmpFileName(\$key);
-+					last if defined $tempfile && length $tempfile;
-+				}
-+			}
-+			if (! defined $tempfile || ! length $tempfile) {
-+				error("CGI::tmpFileName failed to return the uploaded file name");
-+			}
-+		}
-+
- 		$filename=IkiWiki::titlepage(
- 			IkiWiki::possibly_foolish_untaint(
- 				attachment_location($form->field('page')).
-@@ -132,7 +147,14 @@ sub formbuilder (@) { #{{{
- 		else {
- 			my $fh=$q->upload('attachment');
- 			if (! defined $fh || ! ref $fh) {
--				error("failed to get filehandle");
-+				# needed by old CGI versions
-+				$fh=$q->param('attachment');
-+				if (! defined $fh || ! ref $fh) {
-+					# even that doesn't always work,
-+					# fall back to opening the tempfile
-+					$fh=undef;
-+					open($fh, "<", $tempfile) || error("failed to open \"$tempfile\": $!");
-+				}
- 			}
- 			binmode($fh);
- 			writefile($filename, $config{srcdir}, undef, 1, sub {
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index 25ea5288653d..a1324312c029 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -65,6 +65,10 @@
 %%DATADIR%%/templates/blogpost.tmpl
 %%DATADIR%%/templates/change.tmpl
 %%DATADIR%%/templates/editpage.tmpl
+%%DATADIR%%/templates/editconflict.tmpl
+%%DATADIR%%/templates/editcreationconflict.tmpl
+%%DATADIR%%/templates/editfailedsave.tmpl
+%%DATADIR%%/templates/editpagegone.tmpl
 %%DATADIR%%/templates/estseek.conf
 %%DATADIR%%/templates/feedlink.tmpl
 %%DATADIR%%/templates/inlinepage.tmpl
@@ -72,6 +76,7 @@
 %%DATADIR%%/templates/page.tmpl
 %%DATADIR%%/templates/passwordmail.tmpl
 %%DATADIR%%/templates/recentchanges.tmpl
+%%DATADIR%%/templates/renamesummary.tmpl
 %%DATADIR%%/templates/rssitem.tmpl
 %%DATADIR%%/templates/rsspage.tmpl
 %%DATADIR%%/templates/searchform.tmpl
@@ -89,6 +94,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/camelcase.pm
 %%SITE_PERL%%/IkiWiki/Plugin/conditional.pm
 %%SITE_PERL%%/IkiWiki/Plugin/creole.pm
+%%SITE_PERL%%/IkiWiki/Plugin/cutpaste.pm
 %%SITE_PERL%%/IkiWiki/Plugin/ddate.pm
 %%SITE_PERL%%/IkiWiki/Plugin/editdiff.pm
 %%SITE_PERL%%/IkiWiki/Plugin/edittemplate.pm
@@ -122,6 +128,7 @@
 %%SITE_PERL%%/IkiWiki/Plugin/pagecount.pm
 %%SITE_PERL%%/IkiWiki/Plugin/pagestats.pm
 %%SITE_PERL%%/IkiWiki/Plugin/pagetemplate.pm
+%%SITE_PERL%%/IkiWiki/Plugin/parentlinks.pm
 %%SITE_PERL%%/IkiWiki/Plugin/passwordauth.pm
 %%SITE_PERL%%/IkiWiki/Plugin/pingee.pm
 %%SITE_PERL%%/IkiWiki/Plugin/pinger.pm
@@ -132,11 +139,13 @@
 %%SITE_PERL%%/IkiWiki/Plugin/rawhtml.pm
 %%SITE_PERL%%/IkiWiki/Plugin/recentchanges.pm
 %%SITE_PERL%%/IkiWiki/Plugin/recentchangesdiff.pm
+%%SITE_PERL%%/IkiWiki/Plugin/remove.pm
+%%SITE_PERL%%/IkiWiki/Plugin/rename.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/skeleton.pm.example
 %%SITE_PERL%%/IkiWiki/Plugin/smiley.pm
 %%SITE_PERL%%/IkiWiki/Plugin/sparkline.pm
 %%SITE_PERL%%/IkiWiki/Plugin/table.pm