Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_149597534119370"
MIME-Version: 1.0
Date: Sun, 28 May 2017 12:42:21 +0000
From: "Rumko" <rumko@netbsd.org>
Subject: CVS commit: pkgsrc/print/mupdf
To: pkgsrc-changes@NetBSD.org
Reply-To: rumko@netbsd.org
Message-Id: <20170528124221.B008AFBE4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_149597534119370
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rumko
Date:		Sun May 28 12:42:21 UTC 2017

Modified Files:
	pkgsrc/print/mupdf: distinfo
Added Files:
	pkgsrc/print/mupdf/patches: patch-scripts_hexdump.c

Log Message:
print/mupdf: fix build on fbsd

scripts/hexdump.c: do not output HAVE_INCBIN for fbsd
See https://bugs.ghostscript.com/show_bug.cgi?id=696828

Ok@ leot


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/mupdf/patches/patch-scripts_hexdump.c

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


--_----------=_149597534119370
Content-Disposition: inline
Content-Length: 1969
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.33 pkgsrc/print/mupdf/distinfo:1.34
--- pkgsrc/print/mupdf/distinfo:1.33	Fri May 19 18:00:38 2017
+++ pkgsrc/print/mupdf/distinfo	Sun May 28 12:42:21 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2017/05/19 18:00:38 fhajny Exp $
+$NetBSD: distinfo,v 1.34 2017/05/28 12:42:21 rumko Exp $
 
 SHA1 (mupdf-1.11-source.tar.gz) = f782d36aaa896319207e81953e5a622201477b5b
 RMD160 (mupdf-1.11-source.tar.gz) = 573307473a1ac81aca4519b0e57a7111aae7803f
@@ -8,5 +8,6 @@ SHA1 (patch-Makethird) = a4d1bb3c8d509a8
 SHA1 (patch-ab) = a18b1e5b82454bdf06e23185e619b7f8c7a24290
 SHA1 (patch-ac) = 9b0c368d05a436f94118efce517fea69c82898e7
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
+SHA1 (patch-scripts_hexdump.c) = 8e85f3b49590ffc73c6938a67b48b8290ccaac28
 SHA1 (patch-source_fitz_load-jpx.c) = 773ec1ef6b1632a10ff7c8ff76081e89bdcad593
 SHA1 (patch-thirdparty_mujs_Makefile) = cd6a20d56020ae5028f95e24e75f5e4a62127f9f

Added files:

Index: pkgsrc/print/mupdf/patches/patch-scripts_hexdump.c
diff -u /dev/null pkgsrc/print/mupdf/patches/patch-scripts_hexdump.c:1.1
--- /dev/null	Sun May 28 12:42:21 2017
+++ pkgsrc/print/mupdf/patches/patch-scripts_hexdump.c	Sun May 28 12:42:21 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-scripts_hexdump.c,v 1.1 2017/05/28 12:42:21 rumko Exp $
+
+https://bugs.ghostscript.com/show_bug.cgi?id=696828
+Get rid of "error: unexpected token in '.type' directive" on fbsd
+
+--- scripts/hexdump.c.orig	2017-04-05 11:02:21.000000000 +0000
++++ scripts/hexdump.c
+@@ -48,7 +48,7 @@ main(int argc, char **argv)
+ 	}
+ 
+ 	fprintf(fo, "#ifndef __STRICT_ANSI__\n");
+-	fprintf(fo, "#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)\n");
++	fprintf(fo, "#if defined(__linux__) || defined(__OpenBSD__)\n");
+ 	fprintf(fo, "#if !defined(__ICC) && !defined(__ANDROID__)\n");
+ 	fprintf(fo, "#define HAVE_INCBIN\n");
+ 	fprintf(fo, "#endif\n");


--_----------=_149597534119370--