diff options
| author | schmonz <schmonz@pkgsrc.org> | 2011-09-25 14:33:09 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2011-09-25 14:33:09 +0000 |
| commit | 3cdaee71aacb4627b84aa8b0e195cf6f67f097b4 (patch) | |
| tree | e36751b5b141b7023af6d83399b8677b0ed1a39e /www/ikiwiki | |
| parent | ca335798838aeb4f91fa380bd4ee0993f583d9d9 (diff) | |
| download | pkgsrc-3cdaee71aacb4627b84aa8b0e195cf6f67f097b4.tar.gz | |
Replace `find -not` with `find !` to fix build on NetBSD.
Diffstat (limited to 'www/ikiwiki')
| -rw-r--r-- | www/ikiwiki/distinfo | 4 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-aa | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index a56b9fa84d2..e4027f593ac 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.68 2011/09/05 22:07:28 schmonz Exp $ +$NetBSD: distinfo,v 1.69 2011/09/25 14:33:09 schmonz Exp $ SHA1 (ikiwiki_3.20110905.tar.gz) = 5be16cb11cee6beb7977eaa7a26cf52cea33af0a RMD160 (ikiwiki_3.20110905.tar.gz) = c78d567273583c1b57f4f7a481ee13fb0d059267 Size (ikiwiki_3.20110905.tar.gz) = 2682944 bytes -SHA1 (patch-aa) = f5818d0a32394986e86e2f83ea15aef50d17dae4 +SHA1 (patch-aa) = 9796c32ffade6cde4cd12c361881b28764ba769e SHA1 (patch-ab) = 3e571af1894a9c88c39180a0059cc6b136a949d0 diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa index 1660f8abe5d..87ae3c0d594 100644 --- a/www/ikiwiki/patches/patch-aa +++ b/www/ikiwiki/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.23 2011/09/05 22:07:28 schmonz Exp $ +$NetBSD: patch-aa,v 1.24 2011/09/25 14:33:09 schmonz Exp $ PKG_SYSCONFDIR and PKGMANDIR support, avoid GNUisms in standard utilities. @@ -45,11 +45,13 @@ PKG_SYSCONFDIR and PKGMANDIR support, avoid GNUisms in standard utilities. extra_clean: $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc -@@ -70,7 +76,7 @@ underlay_install: +@@ -69,8 +75,8 @@ underlay_install: + install -d $(DESTDIR)$(PREFIX)/share/ikiwiki for dir in `cd underlays && $(FIND) . -follow -type d`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ - for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; do \ +- for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; do \ - cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ ++ for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name \\*.full.js ! -name \\*.full.css`; do \ + cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ |