CVS commit: pkgsrc/mk

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Apr  6 06:55:18 UTC 2019

Modified Files:
        pkgsrc/mk: fonts.mk

Log Message:
Fix previous properly:
Avoid matching newly created files in destdir and re-installing them
and erroring on install.

find | xargs achieves the same by coincidence.

suggested by kre.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mk/fonts.mk

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

Modified files:

Index: pkgsrc/mk/fonts.mk
diff -u pkgsrc/mk/fonts.mk:1.13 pkgsrc/mk/fonts.mk:1.14
--- pkgsrc/mk/fonts.mk:1.13     Thu Apr  4 10:27:35 2019
+++ pkgsrc/mk/fonts.mk  Sat Apr  6 06:55:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: fonts.mk,v 1.13 2019/04/04 10:27:35 maya Exp $
+# $NetBSD: fonts.mk,v 1.14 2019/04/06 06:55:18 maya Exp $
 #
 # Install .otf and .ttf font files.
 #
@@ -20,8 +20,8 @@ do-install: install-fonts
 
 install-fonts:
        ${STEP_MSG} "Installing all .otf and .ttf files from " ${WRKSRC}
-       ${FIND} ${WRKSRC} -iname '*.ttf' -print | \
-           ${XARGS} -I % ${INSTALL_DATA} % ${DESTDIR}${TTF_FONTS_DIR}
-       ${FIND} ${WRKSRC} -iname '*.otf' -print | \
-           ${XARGS} -I % ${INSTALL_DATA} % ${DESTDIR}${OTF_FONTS_DIR}
+       ${FIND} ${WRKSRC} -name ${DESTDIR:T} -prune -o -iname '*.ttf' -exec \
+               ${INSTALL_DATA} "{}" ${DESTDIR}${TTF_FONTS_DIR} ";"
+       ${FIND} ${WRKSRC} -name ${DESTDIR:T} -prune -o -iname '*.otf' -exec \
+               ${INSTALL_DATA} "{}" ${DESTDIR}${OTF_FONTS_DIR} ";"