CVS commit: pkgsrc/textproc/groff

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Aug  3 10:31:28 UTC 2016

Modified Files:
        pkgsrc/textproc/groff: Makefile distinfo
Added Files:
        pkgsrc/textproc/groff/patches: patch-font_devpdf_Makefile.sub

Log Message:
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>


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/textproc/groff/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/groff/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/groff/patches/patch-font_devpdf_Makefile.sub

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

Modified files:

Index: pkgsrc/textproc/groff/Makefile
diff -u pkgsrc/textproc/groff/Makefile:1.83 pkgsrc/textproc/groff/Makefile:1.84
--- pkgsrc/textproc/groff/Makefile:1.83 Sat Jul  9 06:39:05 2016
+++ pkgsrc/textproc/groff/Makefile      Wed Aug  3 10:31:28 2016
@@ -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/}
 

Index: pkgsrc/textproc/groff/distinfo
diff -u pkgsrc/textproc/groff/distinfo:1.24 pkgsrc/textproc/groff/distinfo:1.25
--- pkgsrc/textproc/groff/distinfo:1.24 Wed Nov  4 01:59:29 2015
+++ pkgsrc/textproc/groff/distinfo      Wed Aug  3 10:31:28 2016
@@ -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 @@ SHA512 (groff-1.22.3.tar.gz) = c526ab203
 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

Added files:

Index: pkgsrc/textproc/groff/patches/patch-font_devpdf_Makefile.sub
diff -u /dev/null pkgsrc/textproc/groff/patches/patch-font_devpdf_Makefile.sub:1.1
--- /dev/null   Wed Aug  3 10:31:28 2016
+++ pkgsrc/textproc/groff/patches/patch-font_devpdf_Makefile.sub        Wed Aug  3 10:31:28 2016
@@ -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/*`
+