pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/ikiwiki Apply 053de54 from upstream git to fix pat...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8c27c10e03f2
branches:  trunk
changeset: 639600:8c27c10e03f2
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Sep 19 05:24:15 2014 +0000

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

diffstat:

 www/ikiwiki/Makefile                  |   3 ++-
 www/ikiwiki/distinfo                  |   3 ++-
 www/ikiwiki/patches/patch-Makefile.PL |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (45 lines):

diff -r 00eaa3dbd5e9 -r 8c27c10e03f2 www/ikiwiki/Makefile
--- a/www/ikiwiki/Makefile      Fri Sep 19 04:54:04 2014 +0000
+++ b/www/ikiwiki/Makefile      Fri Sep 19 05:24:15 2014 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.124 2014/09/16 17:53:01 schmonz Exp $
+# $NetBSD: Makefile,v 1.125 2014/09/19 05:24:15 schmonz Exp $
 #
 
 DISTNAME=              ikiwiki_3.20140916
 PKGNAME=               ${DISTNAME:S/_/-/}
+PKGREVISION=           1
 CATEGORIES=            www textproc
 MASTER_SITES=          ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
diff -r 00eaa3dbd5e9 -r 8c27c10e03f2 www/ikiwiki/distinfo
--- a/www/ikiwiki/distinfo      Fri Sep 19 04:54:04 2014 +0000
+++ b/www/ikiwiki/distinfo      Fri Sep 19 05:24:15 2014 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.101 2014/09/16 17:53:01 schmonz Exp $
+$NetBSD: distinfo,v 1.102 2014/09/19 05:24:15 schmonz Exp $
 
 SHA1 (ikiwiki_3.20140916.tar.gz) = a9f167e736caf480143e3086e11143b2b2ee9946
 RMD160 (ikiwiki_3.20140916.tar.gz) = 22f37b96f91a4c0303655538c0762c1c8caace49
 Size (ikiwiki_3.20140916.tar.gz) = 3213411 bytes
+SHA1 (patch-Makefile.PL) = 283bbdbecf1248b2c1d2244be8462f8bfe2d950f
diff -r 00eaa3dbd5e9 -r 8c27c10e03f2 www/ikiwiki/patches/patch-Makefile.PL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/ikiwiki/patches/patch-Makefile.PL     Fri Sep 19 05:24:15 2014 +0000
@@ -0,0 +1,16 @@
+$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



Home | Main Index | Thread Index | Old Index