Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_152001854427490"
MIME-Version: 1.0
Date: Fri, 2 Mar 2018 19:22:24 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/www/ikiwiki/patches
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20180302192224.40569FB40@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_152001854427490
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Fri Mar  2 19:22:24 UTC 2018

Added Files:
	pkgsrc/www/ikiwiki/patches: patch-Makefile.PL patch-po_Makefile

Log Message:
Add patches missed in previous commit.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 pkgsrc/www/ikiwiki/patches/patch-Makefile.PL
cvs rdiff -u -r0 -r1.1 pkgsrc/www/ikiwiki/patches/patch-po_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_152001854427490
Content-Disposition: inline
Content-Length: 2710
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Added files:

Index: pkgsrc/www/ikiwiki/patches/patch-Makefile.PL
diff -u /dev/null pkgsrc/www/ikiwiki/patches/patch-Makefile.PL:1.3
--- /dev/null	Fri Mar  2 19:22:24 2018
+++ pkgsrc/www/ikiwiki/patches/patch-Makefile.PL	Fri Mar  2 19:22:24 2018
@@ -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; \

Index: pkgsrc/www/ikiwiki/patches/patch-po_Makefile
diff -u /dev/null pkgsrc/www/ikiwiki/patches/patch-po_Makefile:1.1
--- /dev/null	Fri Mar  2 19:22:24 2018
+++ pkgsrc/www/ikiwiki/patches/patch-po_Makefile	Fri Mar  2 19:22:24 2018
@@ -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; \


--_----------=_152001854427490--