CVS commit: pkgsrc/www/ikiwiki

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Aug 31 20:19:23 UTC 2019

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

Log Message:
Avoid -regex, not available in OpenBSD find(1).


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/www/ikiwiki/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/www/ikiwiki/patches/patch-Makefile.PL

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

Modified files:

Index: pkgsrc/www/ikiwiki/distinfo
diff -u pkgsrc/www/ikiwiki/distinfo:1.133 pkgsrc/www/ikiwiki/distinfo:1.134
--- pkgsrc/www/ikiwiki/distinfo:1.133   Mon May 27 03:53:31 2019
+++ pkgsrc/www/ikiwiki/distinfo Sat Aug 31 20:19:23 2019
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.133 2019/05/27 03:53:31 schmonz Exp $
+$NetBSD: distinfo,v 1.134 2019/08/31 20:19:23 schmonz Exp $
 
 SHA1 (ikiwiki_3.20190228.orig.tar.xz) = 46f5b0a1498c1e098fe248eae1f2e3f56b25dc2f
 RMD160 (ikiwiki_3.20190228.orig.tar.xz) = f47968a69528aea864ad412c8508a8c5063edb9d
 SHA512 (ikiwiki_3.20190228.orig.tar.xz) = 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
 Size (ikiwiki_3.20190228.orig.tar.xz) = 2672244 bytes
 SHA1 (patch-IkiWiki_Plugin_highlight.pm) = 14a2d8e1d3eb671863cdef4a936ebbb7b09ce3b9
+SHA1 (patch-Makefile.PL) = c711a5f4d6f10ba0442baca1d2950e912665d467
 SHA1 (patch-ikiwiki-mass-rebuild) = b8d5785d77736508de9cfc0f059cc36e0e607bce

Added files:

Index: pkgsrc/www/ikiwiki/patches/patch-Makefile.PL
diff -u /dev/null pkgsrc/www/ikiwiki/patches/patch-Makefile.PL:1.5
--- /dev/null   Sat Aug 31 20:19:23 2019
+++ pkgsrc/www/ikiwiki/patches/patch-Makefile.PL        Sat Aug 31 20:19:23 2019
@@ -0,0 +1,20 @@
+$NetBSD: patch-Makefile.PL,v 1.5 2019/08/31 20:19:23 schmonz Exp $
+
+Avoid -regex, not available in OpenBSD find(1).
+
+--- Makefile.PL.orig   2019-02-26 23:01:54.000000000 +0000
++++ Makefile.PL
+@@ -140,11 +140,11 @@ underlay_install:
+ extra_install: underlay_install
+       # Install example sites.
+       set -e; \
+-      for dir in `$(FIND) doc/examples -type d ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; do \
++      for dir in `$(FIND) doc/examples -type d ! -name discussion | $(SED) -e 's|^doc/examples/||'`; do \
+               install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
+       done
+       set -e; \
+-      for file in `$(FIND) doc/examples -type f ! -regex '.*discussion.*' | $(SED) -e 's|^doc/examples/||'`; do \
++      for file in `$(FIND) doc/examples -type f ! -name discussion.mdwn | $(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; \