Import of pkgsrc-2015Q3

print/ghostscript-agpl/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2015/06/12 10:50:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2015/08/12 22:27:22 wiz Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
 		http://downloads.ghostscript.com/public/

print/ghostscript-agpl/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2014/06/18 09:26:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2015/08/12 22:27:10 wiz Exp $
 
 BUILDLINK_TREE+=	ghostscript-agpl
 
@@ -15,9 +15,9 @@ BUILDLINK_PKGSRCDIR.ghostscript-agpl?=		../../print/ghostscript-agpl
 pkgbase := ghostscript-agpl
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mcups)
-.include "../../print/cups15/buildlink3.mk"
-.endif
+#.if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mcups)
+#.include "../../print/cups15/buildlink3.mk"
+#.endif
 
 .if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mfontconfig)
 .include "../../fonts/fontconfig/buildlink3.mk"

print/ghostscript-agpl/distinfo

@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2015/04/06 11:24:55 adam Exp $
+$NetBSD: distinfo,v 1.7 2015/08/12 22:27:22 wiz Exp $
 
 SHA1 (ghostscript-9.16.tar.bz2) = 529e2b0be754cb353880a4ac97e3efa47ef82f5c
 RMD160 (ghostscript-9.16.tar.bz2) = b90c62480377b71b791da9c8cedf7673fca00c98
 Size (ghostscript-9.16.tar.bz2) = 29163348 bytes
 SHA1 (patch-af) = 3dd65dbd9611c00d45997c86d16eada37511dca5
 SHA1 (patch-ah) = db74a482e22771414f223a97dd71df5215553d85
-SHA1 (patch-ai) = e83a732559094ea8b683a171219388d5087c816f
+SHA1 (patch-ai) = 427504a85cc08e49c18d607b434febe65c9880a2
 SHA1 (patch-al) = b4d06da288a608d65cdb014b0f2384406089afe3
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
 SHA1 (patch-devices_devs.mak) = 526348d59ccb4d373ace11e46c37899b43a35c29

print/ghostscript-agpl/patches/patch-ai

@@ -1,11 +1,25 @@
-$NetBSD: patch-ai,v 1.2 2013/08/22 21:07:08 adam Exp $
+$NetBSD: patch-ai,v 1.3 2015/08/12 22:27:23 wiz Exp $
 
+chunk 1:
+fix build with _FORTIFY_SOURCE=2; it seems the arguments sometimes
+overlap.
+
+chunk 2:
 Replace BSD/Linux specific "qd" printf format specifier by "lld",
 should fix build problem on Solaris reported by Joern Clausen per PR pkg/40664
 
---- base/mkromfs.c.orig 2009-02-13 12:20:54.000000000 +0100
+--- base/mkromfs.c.orig	2015-03-30 08:21:24.000000000 +0000
 +++ base/mkromfs.c
-@@ -2302,7 +2302,7 @@
+@@ -1987,7 +1987,7 @@ ws(const byte *str, int len)
+     if (len >= LINE_SIZE)
+         exit(1);
+ 
+-    memcpy(linebuf, str, len);
++    memmove(linebuf, str, len);
+     flush_line_buf(len);
+ }
+ 
+@@ -2329,7 +2329,7 @@ main(int argc, char *argv[])
  #endif
      fprintf(out,"\n#include \"stdint_.h\"\n");
      fprintf(out,"\n#include \"time_.h\"\n\n");