3 files changed, 20 insertions, 13 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 142088895440..11974798cec5 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	ikiwiki
-PORTVERSION=	3.20140102
+PORTVERSION=	3.20140227
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
-		http://kitenet.net/~joey/debian/unstable/
+		http://kitenet.net/~joey/debian/unstable/ \
+		LOCAL/mat/${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	brix@FreeBSD.org
@@ -13,8 +14,6 @@ COMMENT=	A wiki compiler
 
 LICENSE=	GPLv2
 
-BROKEN=		Unfetchable
-
 BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
 		p5-CGI-FormBuilder>=0:${PORTSDIR}/www/p5-CGI-FormBuilder \
@@ -67,7 +66,8 @@ post-patch:
 		-e "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
 		${WRKSRC}/IkiWiki/Plugin/mdwn.pm
 	@${REINPLACE_CMD} -i '' \
-		-e "s|/etc/ikiwiki/wikilist|${PREFIX}/etc/ikiwiki/wikilist|" \
+		-e "s|/etc/ikiwiki|${ETCDIR}|" \
+		${WRKSRC}/auto.setup ${WRKSRC}/auto-blog.setup \
 		${WRKSRC}/ikiwiki-mass-rebuild \
 		${WRKSRC}/doc/ikiwiki-mass-rebuild.mdwn \
 		${WRKSRC}/ikiwiki-update-wikilist \
@@ -75,7 +75,7 @@ post-patch:
 	@${REINPLACE_CMD} -i '' \
 		-e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \
 		-e 's|-wholename|-path|' \
-		-e 's|\(-install -d $$(DESTDIR)/etc/ikiwiki\)|#\1|' \
+		-e 's|\(-install -d $$(DESTDIR)$$(SYSCONFDIR)\)|#\1|' \
 		-e 's|\(-install -m 0644 wikilist\)|#\1|' \
 		-e 's|\(-install -m 0644 auto.setup\)|#\1|' \
 		-e 's|\(-install -m 0644 auto-blog.setup\)|#\1|' \
@@ -111,9 +111,9 @@ post-patch:
 .endif
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/ikiwiki
-	${INSTALL_DATA} ${WRKSRC}/auto.setup ${STAGEDIR}${PREFIX}/etc/ikiwiki
-	${INSTALL_DATA} ${WRKSRC}/auto-blog.setup ${STAGEDIR}${PREFIX}/etc/ikiwiki
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/auto.setup ${STAGEDIR}${ETCDIR}/auto.setup.sample
+	${INSTALL_DATA} ${WRKSRC}/auto-blog.setup ${STAGEDIR}${ETCDIR}/auto-blog.setup.sample
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}${DOCSDIR}
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 8e4a93e93228..e4446c2cdd7f 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ikiwiki_3.20140102.tar.gz) = 920663164bd4f37328ad15bb72aac8ebf1c36c6787cf7130268f0d200f765e5b
-SIZE (ikiwiki_3.20140102.tar.gz) = 3157017
+SHA256 (ikiwiki_3.20140227.tar.gz) = 2333636af56a9966640a9b2b0eb0b4b2293e6eec4376d619f641d1c088c677ad
+SIZE (ikiwiki_3.20140227.tar.gz) = 3186289
diff --git a/www/ikiwiki/pkg-plist b/www/ikiwiki/pkg-plist
index 3258cc775b18..b9291832abf4 100644
--- a/www/ikiwiki/pkg-plist
+++ b/www/ikiwiki/pkg-plist
@@ -3,8 +3,8 @@ bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
 bin/ikiwiki-transition
 bin/ikiwiki-update-wikilist
-%%ETCDIR%%/auto-blog.setup
-%%ETCDIR%%/auto.setup
+@sample %%ETCDIR%%/auto-blog.setup.sample
+@sample %%ETCDIR%%/auto.setup.sample
 lib/ikiwiki/plugins/proxy.py
 lib/ikiwiki/plugins/rst
 %%SITE_PERL%%/IkiWiki.pm
@@ -453,7 +453,14 @@ sbin/ikiwiki-mass-rebuild
 %%PO4A%%%%DATADIR%%/locale/fr/directives/ikiwiki/directive/toggle.mdwn
 %%PO4A%%%%DATADIR%%/locale/fr/directives/ikiwiki/directive/version.mdwn
 %%PO4A%%%%DATADIR%%/locale/fr/smiley/smileys.mdwn
+%%DATADIR%%/openid-selector/ikiwiki/openid/aol.png
+%%DATADIR%%/openid-selector/ikiwiki/openid/goa-account-flickr.png
+%%DATADIR%%/openid-selector/ikiwiki/openid/goa-account-google.png
+%%DATADIR%%/openid-selector/ikiwiki/openid/goa-account-yahoo.png
+%%DATADIR%%/openid-selector/ikiwiki/openid/livejournal.png
 %%DATADIR%%/openid-selector/ikiwiki/openid/openid-jquery.js
+%%DATADIR%%/openid-selector/ikiwiki/openid/verisign.png
+%%DATADIR%%/openid-selector/ikiwiki/openid/wordpress.png
 %%DATADIR%%/osm/ikiwiki/images/osm.png
 %%DATADIR%%/osm/ikiwiki/osm.js
 %%DATADIR%%/po/cs/basewiki/ikiwiki.cs.po