5 files changed, 12 insertions, 29 deletions
diff --git a/print/ghostscript-agpl/Makefile b/print/ghostscript-agpl/Makefile
index 6299962f9d5..b67b5495252 100644
--- a/print/ghostscript-agpl/Makefile
+++ b/print/ghostscript-agpl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2014/06/18 09:28:17 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2014/10/01 09:04:32 adam Exp $
 
 DISTNAME=	ghostscript-${GS_VERSION}
 PKGNAME=	${DISTNAME:S/ghostscript/ghostscript-agpl/}
-PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
 		http://downloads.ghostscript.com/public/
diff --git a/print/ghostscript-agpl/Makefile.common b/print/ghostscript-agpl/Makefile.common
index 1e5586fdc0e..1973ad4170f 100644
--- a/print/ghostscript-agpl/Makefile.common
+++ b/print/ghostscript-agpl/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.4 2014/04/04 08:48:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2014/10/01 09:04:32 adam Exp $
 # used by print/ghostscript-agpl/Makefile
 # used by fonts/ghostscript-cidfonts/Makefile
 # used by fonts/ghostscript-cidfonts-ryumin/Makefile
 
-GS_VERSION=	9.14
+GS_VERSION=	9.15
diff --git a/print/ghostscript-agpl/distinfo b/print/ghostscript-agpl/distinfo
index 5a4dff1ddf8..4941e2bd636 100644
--- a/print/ghostscript-agpl/distinfo
+++ b/print/ghostscript-agpl/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.4 2014/04/04 08:48:43 adam Exp $
+$NetBSD: distinfo,v 1.5 2014/10/01 09:04:32 adam Exp $
 
-SHA1 (ghostscript-9.14.tar.bz2) = eab1c9e9850d8aedf02d16f3f7f8198ad9384068
-RMD160 (ghostscript-9.14.tar.bz2) = 4f3aad17f271b17bd890ac63af56c75e42e10945
-Size (ghostscript-9.14.tar.bz2) = 31080058 bytes
+SHA1 (ghostscript-9.15.tar.bz2) = 19f01538d33b9623bc6653d96ea4ec891f14a9d3
+RMD160 (ghostscript-9.15.tar.bz2) = 7450cccb0d31430e7aadcddacd63d807c71fefb1
+Size (ghostscript-9.15.tar.bz2) = 28826065 bytes
 SHA1 (patch-af) = 3dd65dbd9611c00d45997c86d16eada37511dca5
 SHA1 (patch-ah) = db74a482e22771414f223a97dd71df5215553d85
 SHA1 (patch-ai) = e83a732559094ea8b683a171219388d5087c816f
 SHA1 (patch-al) = b4d06da288a608d65cdb014b0f2384406089afe3
 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909
-SHA1 (patch-devices_devs.mak) = 574c50c1dcb4136a6f150bcfdebb9c7ee62c0ef0
-SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = f279a31ed796e73f6dc701fe63c16fa5b120f3f6
+SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = bf7e47c77e6960df473d3bf97dfa78f207a14a01
diff --git a/print/ghostscript-agpl/patches/patch-devices_devs.mak b/print/ghostscript-agpl/patches/patch-devices_devs.mak
deleted file mode 100644
index 8ad47874cb7..00000000000
--- a/print/ghostscript-agpl/patches/patch-devices_devs.mak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-devices_devs.mak,v 1.1 2014/04/04 08:48:43 adam Exp $
-
-Don't explicitly depend on zlib.h header file.
-
---- devices/devs.mak.orig	2014-04-03 16:42:54.000000000 +0000
-+++ devices/devs.mak
-@@ -1597,7 +1597,7 @@ $(DD)pngalpha.dev : $(DEVS_MAK) $(libpng
- fpng_=$(DEVOBJ)gdevfpng.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
- 
- $(DEVOBJ)gdevfpng.$(OBJ) : $(DEVSRC)gdevfpng.c\
-- $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(zlib_h)
-+ $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h)
- 	$(CC_) $(I_)$(DEVI_) $(II)$(PI_)$(_I) $(PCF_) $(GLF_) $(DEVO_)gdevfpng.$(OBJ) $(C_) $(DEVSRC)gdevfpng.c
- 
- $(DD)fpng.dev : $(DEVS_MAK) $(fpng_) $(GLD)page.dev $(GDEV)
diff --git a/print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h b/print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
index c8edf267073..9b74743b7ad 100644
--- a/print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
+++ b/print/ghostscript-agpl/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
@@ -1,10 +1,10 @@
-$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.2 2014/04/04 08:48:43 adam Exp $
+$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.3 2014/10/01 09:04:32 adam Exp $
 
 Work around undefined 'memalign' issue.
 
---- openjpeg/libopenjpeg/opj_malloc.h.orig	2014-03-26 12:53:47.000000000 +0000
-+++ openjpeg/libopenjpeg/opj_malloc.h
-@@ -88,7 +88,7 @@ Allocate memory aligned to a 16 byte bou
+--- openjpeg/src/lib/openjp2/opj_malloc.h.orig	2014-03-26 12:53:47.000000000 +0000
++++ openjpeg/src/lib/openjp2/opj_malloc.h
+@@ -101,7 +101,7 @@ Allocate memory aligned to a 16 byte bou
    #elif defined(__FreeBSD__)
      #define HAVE_POSIX_MEMALIGN
  	/* Linux x86_64 and OSX always align allocations to 16 bytes */