[pkgsrc/trunk]: pkgsrc/www/ikiwiki/patches Add patches missed in previous com...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/54929aa8e1c9
branches:  trunk
changeset: 376493:54929aa8e1c9
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Mar 02 19:22:24 2018 +0000

description:
Add patches missed in previous commit.

diffstat:

 www/ikiwiki/patches/patch-Makefile.PL |  29 +++++++++++++++++++++++++++++
 www/ikiwiki/patches/patch-po_Makefile |  15 +++++++++++++++
 2 files changed, 44 insertions(+), 0 deletions(-)

diffs (52 lines):

diff -r 4da9fc49779a -r 54929aa8e1c9 www/ikiwiki/patches/patch-Makefile.PL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/ikiwiki/patches/patch-Makefile.PL     Fri Mar 02 19:22:24 2018 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-Makefile.PL,v 1.3 2018/03/02 19:22:24 schmonz Exp $
+
+Avoid unexpected full paths from find(1).
+
+--- Makefile.PL.orig   2018-02-28 10:41:06.000000000 +0000
++++ Makefile.PL
+@@ -96,7 +96,7 @@ myclean: clean
+ underlay_install:
+       install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
+       set -e; \
+-      for dir in `cd underlays && $(FIND) . -follow -type d`; do \
++      for dir in `$(FIND) underlays -follow -mindepth 1 -type d | $(SED) -e 's|^underlays/||'`; do \
+               install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+               for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name jquery.js ! -name jquery-ui.css ! -name jquery-ui.js ! -name jquery.tmpl.js`; do \
+                       if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null; then \
+@@ -137,11 +137,11 @@ underlay_install:
+ extra_install: underlay_install
+       # Install example sites.
+       set -e; \
+-      for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*discussion.*'`; do \
++      for dir in `$(FIND) doc/examples -type d ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; do \
+               install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
+       done
+       set -e; \
+-      for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \
++      for file in `$(FIND) doc/examples -type f ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; do \
+               if ! cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null; then \
+                       install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
+               fi; \
diff -r 4da9fc49779a -r 54929aa8e1c9 www/ikiwiki/patches/patch-po_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/ikiwiki/patches/patch-po_Makefile     Fri Mar 02 19:22:24 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-po_Makefile,v 1.1 2018/03/02 19:22:24 schmonz Exp $
+
+Avoid unexpected full paths from find(1).
+
+--- po/Makefile.orig   2018-02-28 10:41:06.000000000 +0000
++++ po/Makefile
+@@ -22,7 +22,7 @@ install: all
+       
+       # Underlay translation via po files that go in special per-language
+       # underlays.
+-      for file in `cd underlays && find . -type f -name \*.po`; do \
++      for file in `find underlays -type f -name \*.po | sed -e 's|^underlays/||'`; do \
+               lang=`echo $$file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \
+               dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang/$$file"`; \
+               install -d $$dir; \