Fri Sep 19 05:24:15 2014 UTC ()
Apply 053de54 from upstream git to fix paths in installed binaries
with the default PKG_SYSCONFBASE. Bump PKGREVISION.


(schmonz)
diff -r1.124 -r1.125 pkgsrc/www/ikiwiki/Makefile
diff -r1.101 -r1.102 pkgsrc/www/ikiwiki/distinfo
diff -r0 -r1.1 pkgsrc/www/ikiwiki/patches/patch-Makefile.PL
cvs diff -r1.124 -r1.125 pkgsrc/www/ikiwiki/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/Makefile 2014/09/16 17:53:01 1.124
+++ pkgsrc/www/ikiwiki/Makefile 2014/09/19 05:24:15 1.125
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.124 2014/09/16 17:53:01 schmonz Exp $ 1# $NetBSD: Makefile,v 1.125 2014/09/19 05:24:15 schmonz Exp $
2# 2#
3 3
4DISTNAME= ikiwiki_3.20140916 4DISTNAME= ikiwiki_3.20140916
5PKGNAME= ${DISTNAME:S/_/-/} 5PKGNAME= ${DISTNAME:S/_/-/}
 6PKGREVISION= 1
6CATEGORIES= www textproc 7CATEGORIES= www textproc
7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} 8MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
8 9
9MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://ikiwiki.info/ 11HOMEPAGE= http://ikiwiki.info/
11COMMENT= Wiki compiler 12COMMENT= Wiki compiler
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount 15DEPENDS+= p5-Text-Markdown-Discount-[0-9]*:../../textproc/p5-Text-Markdown-Discount
15DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI 16DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
16DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser 17DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
17DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template 18DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
18DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree 19DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
cvs diff -r1.101 -r1.102 pkgsrc/www/ikiwiki/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ikiwiki/distinfo 2014/09/16 17:53:01 1.101
+++ pkgsrc/www/ikiwiki/distinfo 2014/09/19 05:24:15 1.102
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.101 2014/09/16 17:53:01 schmonz Exp $ 1$NetBSD: distinfo,v 1.102 2014/09/19 05:24:15 schmonz Exp $
2 2
3SHA1 (ikiwiki_3.20140916.tar.gz) = a9f167e736caf480143e3086e11143b2b2ee9946 3SHA1 (ikiwiki_3.20140916.tar.gz) = a9f167e736caf480143e3086e11143b2b2ee9946
4RMD160 (ikiwiki_3.20140916.tar.gz) = 22f37b96f91a4c0303655538c0762c1c8caace49 4RMD160 (ikiwiki_3.20140916.tar.gz) = 22f37b96f91a4c0303655538c0762c1c8caace49
5Size (ikiwiki_3.20140916.tar.gz) = 3213411 bytes 5Size (ikiwiki_3.20140916.tar.gz) = 3213411 bytes
 6SHA1 (patch-Makefile.PL) = 283bbdbecf1248b2c1d2244be8462f8bfe2d950f
File Added: pkgsrc/www/ikiwiki/patches/patch-Makefile.PL
$NetBSD: patch-Makefile.PL,v 1.1 2014/09/19 05:24:15 schmonz Exp $

Apply 053de54 from upstream git to fix paths in installed binaries
with the default PKG_SYSCONFBASE.

--- Makefile.PL.orig	2014-09-10 07:48:12.000000000 +0000
+++ Makefile.PL
@@ -60,7 +60,7 @@ docwiki:
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh
 
 sysconfdir:
-	$(PERL) -pi -e "s|/etc/ikiwiki|$(SYSCONFDIR)|g" $(sysconfdir_scripts)
+	$(PERL) -pi -e "s|\"/etc/ikiwiki|\"$(SYSCONFDIR)|g" $(sysconfdir_scripts)
 	
 extra_clean:
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean