diff options
| author | schmonz <schmonz@pkgsrc.org> | 2018-03-02 19:22:24 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2018-03-02 19:22:24 +0000 |
| commit | e8fd8e94681da44d7137ad385bfac37024907ce6 (patch) | |
| tree | 9ef5d970760cbd5368f199aa9b57e04fe01d9338 /www/ikiwiki | |
| parent | a943d2a60a0ac5ead037885d5a4fe12474bb36ab (diff) | |
| download | pkgsrc-e8fd8e94681da44d7137ad385bfac37024907ce6.tar.gz | |
Add patches missed in previous commit.
Diffstat (limited to 'www/ikiwiki')
| -rw-r--r-- | www/ikiwiki/patches/patch-Makefile.PL | 29 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-po_Makefile | 15 |
2 files changed, 44 insertions, 0 deletions
diff --git a/www/ikiwiki/patches/patch-Makefile.PL b/www/ikiwiki/patches/patch-Makefile.PL new file mode 100644 index 00000000000..e6624a32e9b --- /dev/null +++ b/www/ikiwiki/patches/patch-Makefile.PL @@ -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 --git a/www/ikiwiki/patches/patch-po_Makefile b/www/ikiwiki/patches/patch-po_Makefile new file mode 100644 index 00000000000..8d4a21c0b95 --- /dev/null +++ b/www/ikiwiki/patches/patch-po_Makefile @@ -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; \ |