Date: Tue, 30 Jun 2009 10:29:11 -0400 (EDT) From: Yarema <yds@CoolRat.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: brix@FreeBSD.org Subject: ports/136186: [UPDATE] www/ikiwiki version update to 3.141 Message-ID: <20090630142911.C478FDF0@crake.dppl.net> Resent-Message-ID: <200906301430.n5UEU62O052440@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 136186
>Category: ports
>Synopsis: [UPDATE] www/ikiwiki version update to 3.141
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 30 14:30:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Yarema
>Release: FreeBSD 7.2-STABLE amd64
>Organization:
NYCBUG.org
>Environment:
System: FreeBSD 7.2-STABLE amd64
>Description:
Update ikiwiki to the latest 3.141 version.
This version is numbered 3.141 which follows 3.14 -- presumably the next
version will be 3.15 which FreeBSD would treat as a downgrade. To remedy
this I set PORTREVISION=3.14.1 then remove all periods when setting DISTNAME
and reinsert the period after the first digit.
In the post-patch target there's a new REINPLACE to fix up the newly
introduced IkiWiki/Plugin/highlight.pm
While there I also added -i '' to not create a .bak file in the cases
where the .bak was being immediatly deleted.
Updated alpha sorted pkg-plist.
>How-To-Repeat:
cd /usr/ports/www/ikiwiki && make install
>Fix:
diff -u -r -N ikiwiki-3.08/Makefile ikiwiki/Makefile
--- ikiwiki-3.08/Makefile 2009-03-26 04:18:42.000000000 -0400
+++ ikiwiki/Makefile 2009-06-30 10:02:21.168922634 -0400
@@ -5,12 +5,11 @@
# $FreeBSD: ports/www/ikiwiki/Makefile,v 1.45 2009/03/25 21:18:06 brix Exp $
PORTNAME= ikiwiki
-PORTVERSION= 3.08
-PORTREVISION= 1
+PORTVERSION= 3.14.1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} \
http://kitenet.net/~joey/debian/unstable/
-DISTNAME= ${PORTNAME}_${PORTVERSION}
+DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//g:C/([0-9])([0-9]+)/\1.\2/}
MAINTAINER= brix@FreeBSD.org
COMMENT= A wiki compiler
@@ -62,12 +61,11 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e \
- "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
+ @${REINPLACE_CMD} -i '' \
+ -e 's|/usr/bin/markdown|${LOCALBASE}/bin/markdown|' \
${WRKSRC}/IkiWiki/Plugin/mdwn.pm
- @${RM} ${WRKSRC}/IkiWiki/Plugin/mdwn.pm.bak
- @${REINPLACE_CMD} -e \
- "s|/etc/ikiwiki/wikilist|${PREFIX}/etc/ikiwiki/wikilist|" \
+ @${REINPLACE_CMD} \
+ -e 's|/etc/ikiwiki/wikilist|${PREFIX}/etc/ikiwiki/wikilist|' \
${WRKSRC}/ikiwiki-mass-rebuild \
${WRKSRC}/doc/ikiwiki-mass-rebuild.mdwn \
${WRKSRC}/ikiwiki-update-wikilist \
@@ -81,10 +79,13 @@
-e 's|\(-install -m 0644 auto-blog.setup\)|#\1|' \
-e 's|$$(DESTDIR)$$(PREFIX)/share/ikiwiki/examples|${EXAMPLESDIR}|' \
${WRKSRC}/Makefile.PL
- @${REINPLACE_CMD} -e \
- "s|/usr/lib/cgi-bin/omega/omega|${LOCALBASE}/www/xapian-omega/cgi-bin/omega|g" \
+ @${REINPLACE_CMD} -i '' \
+ -e 's|\(/etc/highlight/filetypes.conf\)|${LOCALBASE}\1|g' \
+ -e 's|/usr\(/share/highlight/langDefs\)|${LOCALBASE}\1|g' \
+ ${WRKSRC}/IkiWiki/Plugin/highlight.pm
+ @${REINPLACE_CMD} -i '' \
+ -e 's|/usr/lib/cgi-bin/omega/omega|${LOCALBASE}/www/xapian-omega/cgi-bin/omega|g' \
${WRKSRC}/IkiWiki/Plugin/search.pm
- @${RM} ${WRKSRC}/IkiWiki/Plugin/search.pm.bak
.ifndef(WITH_W3M)
@${REINPLACE_CMD} -e '/w3m/d' -e '/W3M/d' ${WRKSRC}/Makefile.PL
.endif
diff -u -r -N ikiwiki-3.08/distinfo ikiwiki/distinfo
--- ikiwiki-3.08/distinfo 2009-03-26 04:18:42.000000000 -0400
+++ ikiwiki/distinfo 2009-06-30 10:03:40.940552978 -0400
@@ -1,3 +1,3 @@
-MD5 (ikiwiki_3.08.tar.gz) = 69008333a00d5046be4e08b62c49f13a
-SHA256 (ikiwiki_3.08.tar.gz) = 9db79cc641bd9d7a8e23b3c51bfef4303f4e80f419547114e65d82b73865f826
-SIZE (ikiwiki_3.08.tar.gz) = 1145516
+MD5 (ikiwiki_3.141.tar.gz) = 9e25195c6ebf38d1e62eb88334257a2b
+SHA256 (ikiwiki_3.141.tar.gz) = 703e7105b72d8c641526e20f97124e2354ef08016d67b06f13834ec2a508c34f
+SIZE (ikiwiki_3.141.tar.gz) = 1206779
diff -u -r -N ikiwiki-3.08/pkg-plist ikiwiki/pkg-plist
--- ikiwiki-3.08/pkg-plist 2009-03-26 04:18:42.000000000 -0400
+++ ikiwiki/pkg-plist 2009-06-29 21:20:18.368782603 -0400
@@ -1,5 +1,4 @@
%%DATADIR%%/basewiki/favicon.ico
-%%DATADIR%%/basewiki/index.mdwn
%%DATADIR%%/basewiki/ikiwiki.mdwn
%%DATADIR%%/basewiki/ikiwiki/blog.mdwn
%%DATADIR%%/basewiki/ikiwiki/directive.mdwn
@@ -13,6 +12,7 @@
%%DATADIR%%/basewiki/ikiwiki/subpage.mdwn
%%DATADIR%%/basewiki/ikiwiki/subpage/linkingrules.mdwn
%%DATADIR%%/basewiki/ikiwiki/wikilink.mdwn
+%%DATADIR%%/basewiki/index.mdwn
%%DATADIR%%/basewiki/local.css
%%DATADIR%%/basewiki/recentchanges.mdwn
%%DATADIR%%/basewiki/sandbox.mdwn
@@ -28,6 +28,7 @@
%%DATADIR%%/directives/ikiwiki/directive/brokenlinks.mdwn
%%DATADIR%%/directives/ikiwiki/directive/calendar.mdwn
%%DATADIR%%/directives/ikiwiki/directive/color.mdwn
+%%DATADIR%%/directives/ikiwiki/directive/comment.mdwn
%%DATADIR%%/directives/ikiwiki/directive/copy.mdwn
%%DATADIR%%/directives/ikiwiki/directive/cut.mdwn
%%DATADIR%%/directives/ikiwiki/directive/cutpaste.mdwn
@@ -107,14 +108,15 @@
%%DATADIR%%/templates/comment.tmpl
%%DATADIR%%/templates/commentmoderation.tmpl
%%DATADIR%%/templates/editcomment.tmpl
-%%DATADIR%%/templates/editpage.tmpl
%%DATADIR%%/templates/editconflict.tmpl
%%DATADIR%%/templates/editcreationconflict.tmpl
%%DATADIR%%/templates/editfailedsave.tmpl
+%%DATADIR%%/templates/editpage.tmpl
%%DATADIR%%/templates/editpagegone.tmpl
%%DATADIR%%/templates/feedlink.tmpl
%%DATADIR%%/templates/googleform.tmpl
%%DATADIR%%/templates/inlinepage.tmpl
+%%DATADIR%%/templates/microblog.tmpl
%%DATADIR%%/templates/misc.tmpl
%%DATADIR%%/templates/page.tmpl
%%DATADIR%%/templates/passwordmail.tmpl
@@ -144,6 +146,7 @@
%%SITE_PERL%%/IkiWiki/Plugin/conditional.pm
%%SITE_PERL%%/IkiWiki/Plugin/creole.pm
%%SITE_PERL%%/IkiWiki/Plugin/cutpaste.pm
+%%SITE_PERL%%/IkiWiki/Plugin/darcs.pm
%%SITE_PERL%%/IkiWiki/Plugin/ddate.pm
%%SITE_PERL%%/IkiWiki/Plugin/editdiff.pm
%%SITE_PERL%%/IkiWiki/Plugin/editpage.pm
@@ -160,6 +163,7 @@
%%SITE_PERL%%/IkiWiki/Plugin/goto.pm
%%SITE_PERL%%/IkiWiki/Plugin/graphviz.pm
%%SITE_PERL%%/IkiWiki/Plugin/haiku.pm
+%%SITE_PERL%%/IkiWiki/Plugin/highlight.pm
%%SITE_PERL%%/IkiWiki/Plugin/hnb.pm
%%SITE_PERL%%/IkiWiki/Plugin/html.pm
%%SITE_PERL%%/IkiWiki/Plugin/htmlbalance.pm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090630142911.C478FDF0>