Add gserrors.h to the installed files (upstream Bug 696301)

4 files changed, 17 insertions, 5 deletions

diff --git a/print/ghostscript-agpl/Makefile b/print/ghostscript-agpl/Makefile
index 1b4e7906575..3b8d8c49b1f 100644
--- a/print/ghostscript-agpl/Makefile
+++ b/print/ghostscript-agpl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2015/10/10 11:55:18 adam Exp $
+# $NetBSD: Makefile,v 1.17 2015/12/10 11:58:58 markd Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
 		http://downloads.ghostscript.com/public/
diff --git a/print/ghostscript-agpl/PLIST b/print/ghostscript-agpl/PLIST
index ae759110e77..37d81612e08 100644
--- a/print/ghostscript-agpl/PLIST
+++ b/print/ghostscript-agpl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/04/04 08:48:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/12/10 11:58:58 markd Exp $
 bin/dvipdf
 bin/eps2eps
 bin/font2c
@@ -30,6 +30,7 @@ bin/ps2ps2
 bin/unix-lpr.sh
 bin/wftopfa
 include/ghostscript/gdevdsp.h
+include/ghostscript/gserrors.h
 include/ghostscript/iapi.h
 include/ghostscript/ierrors.h
 lib/libgs.so
diff --git a/print/ghostscript-agpl/distinfo b/print/ghostscript-agpl/distinfo
index 7ca232189e7..91181fe35d0 100644
--- a/print/ghostscript-agpl/distinfo
+++ b/print/ghostscript-agpl/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 01:01:33 agc Exp $
+$NetBSD: distinfo,v 1.11 2015/12/10 11:58:58 markd Exp $
 
 SHA1 (ghostscript-9.18.tar.bz2) = 388fea50a38e422a4c6ff27c184491bf5ecb96e1
 RMD160 (ghostscript-9.18.tar.bz2) = 2a05ef570b5ebcf79501fd3ee1fb552be4e9c3fe
 SHA512 (ghostscript-9.18.tar.bz2) = 1ea0911cbdd6861ddadf4d4ff3b0fa043885162a8a3ce730e3cec2402cc591c1c3abc31680c7444b7e5b59e56d0d567649ac7394dda94ab830fb197b4d277e1f
 Size (ghostscript-9.18.tar.bz2) = 29460941 bytes
-SHA1 (patch-af) = 5efab9b732ef24e234bc33e7212222f067a3602c
+SHA1 (patch-af) = 11c348036c61478db8e612d7924c6f49e22c32f3
 SHA1 (patch-ah) = db74a482e22771414f223a97dd71df5215553d85
 SHA1 (patch-ai) = 427504a85cc08e49c18d607b434febe65c9880a2
 SHA1 (patch-al) = f0816b9fd61c6af0ebde05ccb464560b8d0a80f4
diff --git a/print/ghostscript-agpl/patches/patch-af b/print/ghostscript-agpl/patches/patch-af
index 8a203eea567..474e4c800da 100644
--- a/print/ghostscript-agpl/patches/patch-af
+++ b/print/ghostscript-agpl/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2015/10/10 11:55:19 adam Exp $
+$NetBSD: patch-af,v 1.5 2015/12/10 11:58:58 markd Exp $
 
 ghostscript has hand-rolled shared lib handling in src/unix-dll.mak
 that does not do the right thing on Darwin (where shared libs are
@@ -8,6 +8,8 @@ as an extension).
 You need to manually reconfigure unix-dll.mak to make it work, so
 do it in hacks.mk.
 
+Add gserrors.h to the installed files (Bug 696301)
+
 --- base/unix-dll.mak.orig	2015-10-05 08:21:11.000000000 +0000
 +++ base/unix-dll.mak
 @@ -64,11 +64,11 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$
@@ -41,3 +43,11 @@ do it in hacks.mk.
  
  # ------------------------- Recursive make targets ------------------------- #
  
+@@ -184,6 +184,7 @@ install-so-subtarget: so-subtarget
+ 	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+ 	$(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
+ 	$(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
++	$(INSTALL_DATA) $(GLSRC)gserrors.h $(DESTDIR)$(gsincludedir)gserrors.h
+ 	$(INSTALL_DATA) $(DEVSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
+ 
+ soinstall: