pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/groff Instead of using find(1) in font/devpdf...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/21e961ae2488
branches:  trunk
changeset: 350714:21e961ae2488
user:      leot <leot%pkgsrc.org@localhost>
date:      Wed Aug 03 10:31:28 2016 +0000

description:
Instead of using find(1) in font/devpdf/Makefile.sub just use grep(1) following
what upstream does (`-maxdepth' option can be problematic on some platforms).

Should fix pkg/51332 reported by Hiroshi Hakoyama

>From <maya>

diffstat:

 textproc/groff/Makefile                               |   4 ++--
 textproc/groff/distinfo                               |   3 ++-
 textproc/groff/patches/patch-font_devpdf_Makefile.sub |  19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r bbc9ca6d50bd -r 21e961ae2488 textproc/groff/Makefile
--- a/textproc/groff/Makefile   Wed Aug 03 10:22:08 2016 +0000
+++ b/textproc/groff/Makefile   Wed Aug 03 10:31:28 2016 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2016/07/09 06:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2016/08/03 10:31:28 leot Exp $
 
 DISTNAME=      groff-1.22.3
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=groff/}
 
diff -r bbc9ca6d50bd -r 21e961ae2488 textproc/groff/distinfo
--- a/textproc/groff/distinfo   Wed Aug 03 10:22:08 2016 +0000
+++ b/textproc/groff/distinfo   Wed Aug 03 10:31:28 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2015/11/04 01:59:29 agc Exp $
+$NetBSD: distinfo,v 1.25 2016/08/03 10:31:28 leot Exp $
 
 SHA1 (groff-1.22.3.tar.gz) = 61a6808ea1ef715df9fa8e9b424e1f6b9fa8c091
 RMD160 (groff-1.22.3.tar.gz) = 8f6d364f759e559c12c497091118f6d68f3a3b85
@@ -6,4 +6,5 @@
 Size (groff-1.22.3.tar.gz) = 4188772 bytes
 SHA1 (patch-aa) = 3f5d2c29397377f673a863e0ea953eaac4088898
 SHA1 (patch-ab) = 64ba9805a0798bfce543a258cd66347caa1bf860
+SHA1 (patch-font_devpdf_Makefile.sub) = 2d73140fe036cf48fe93eea3ad71a273c181e298
 SHA1 (patch-src_libs_libgroff_tmpfile.cpp) = 3794a028dc7c569e5adea6b7b876c3ac085376ba
diff -r bbc9ca6d50bd -r 21e961ae2488 textproc/groff/patches/patch-font_devpdf_Makefile.sub
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/groff/patches/patch-font_devpdf_Makefile.sub     Wed Aug 03 10:31:28 2016 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-font_devpdf_Makefile.sub,v 1.1 2016/08/03 10:31:28 leot Exp $
+
+Solaris find(1) doesn't have -maxdepth. Adapt new logic from upstream that
+avoid to use find for that (this will not needed for future groff version).
+pkg/51332
+
+--- font/devpdf/Makefile.sub.orig      2014-11-04 08:38:35.427521472 +0000
++++ font/devpdf/Makefile.sub
+@@ -21,9 +21,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 
+ DEV=pdf
+-GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf \
+-                  && find * -maxdepth 0 -type f ! -name 'Makefile.sub*' \
+-                            -exec grep -l internalname {} \;`
++GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf && grep -l internalname * | grep -v Makefile.sub`
+ ENC_FILES=`cd $(top_builddir)/font/devpdf; ls enc/*`
+ MAP_FILES=`cd $(top_builddir)/font/devpdf; ls map/*`
+ 



Home | Main Index | Thread Index | Old Index