4 files changed, 19 insertions, 15 deletions

diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile
index 4fc905d1adf4..fe90537a2161 100644
--- a/print/ghostscript9-agpl-base/Makefile
+++ b/print/ghostscript9-agpl-base/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghostscript
-PORTVERSION=	9.25
-PORTREVISION=	1
+PORTVERSION=	9.26
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/
 PKGNAMESUFFIX=	9-agpl-base
@@ -16,7 +15,6 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libidn.so:dns/libidn \
 		libjbig2dec.so:graphics/jbig2dec \
-		libopenjp2.so:graphics/openjpeg \
 		libpaper.so:print/libpaper \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
@@ -42,7 +40,6 @@ CONFIGURE_ARGS=	--disable-compile-inits \
 		--enable-dynamic \
 		--enable-fontconfig \
 		--enable-freetype \
-		--enable-openjpeg \
 		--with-drivers=ALL \
 		--with-fontpath=${LOCALBASE}/share/fonts \
 		--with-jbig2dec \
@@ -55,8 +52,8 @@ ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
 PLIST_SUB=	GS_VERSION="${PORTVERSION}"
 
-OPTIONS_DEFINE=	DOCS CUPS IJS
-OPTIONS_DEFAULT=CUPS IJS
+OPTIONS_DEFINE=	DOCS CUPS IJS JPEG2000
+OPTIONS_DEFAULT=CUPS
 OPTIONS_SUB=	yes
 
 CUPS_CONFIGURE_ENABLE=	cups
@@ -66,6 +63,9 @@ IJS_CONFIGURE_WITH=	ijs
 IJS_DESC=		Support libijs based Ghostscript devices
 IJS_LIB_DEPENDS=	libijs.so:print/libijs
 
+JPEG2000_CONFIGURE_ENABLE=	openjpeg
+JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
+
 post-patch:
 	@${RM} -r ${WRKSRC}/cups/libs ${WRKSRC}/freetype ${WRKSRC}/ijs \
 		${WRKSRC}/jbig2dec ${WRKSRC}/jpeg ${WRKSRC}/libpng \
diff --git a/print/ghostscript9-agpl-base/distinfo b/print/ghostscript9-agpl-base/distinfo
index f88a694a9f2e..4a7d71b93a53 100644
--- a/print/ghostscript9-agpl-base/distinfo
+++ b/print/ghostscript9-agpl-base/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537537103
-SHA256 (ghostscript-9.25.tar.xz) = a2971a23bf15bbd9ddcd173141b15504e51ddc1d5a0a0144b00a6a8b14a62fed
-SIZE (ghostscript-9.25.tar.xz) = 33027708
+TIMESTAMP = 1544792071
+SHA256 (ghostscript-9.26.tar.xz) = 90ed475f37584f646e9ef829932b2525d5c6fc2e0147e8d611bc50aa0e718598
+SIZE (ghostscript-9.26.tar.xz) = 33059724
diff --git a/print/ghostscript9-agpl-base/pkg-plist b/print/ghostscript9-agpl-base/pkg-plist
index 63cbf5a36c08..8f6b95cb630b 100644
--- a/print/ghostscript9-agpl-base/pkg-plist
+++ b/print/ghostscript9-agpl-base/pkg-plist
@@ -80,7 +80,6 @@ share/color/icc/ghostscript/sgray.icc
 share/color/icc/ghostscript/srgb.icc
 %%PORTDOCS%%%%DOCSDIR%%/API.htm
 %%PORTDOCS%%%%DOCSDIR%%/C-style.htm
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/Commprod.htm
 %%PORTDOCS%%%%DOCSDIR%%/DLL.htm
 %%PORTDOCS%%%%DOCSDIR%%/Deprecated.htm
@@ -89,7 +88,6 @@ share/color/icc/ghostscript/srgb.icc
 %%PORTDOCS%%%%DOCSDIR%%/Drivers.htm
 %%PORTDOCS%%%%DOCSDIR%%/Fonts.htm
 %%PORTDOCS%%%%DOCSDIR%%/GS9_Color_Management.pdf
-%%PORTDOCS%%%%DOCSDIR%%/GS9_Color_Management.tex
 %%PORTDOCS%%%%DOCSDIR%%/History9.htm
 %%PORTDOCS%%%%DOCSDIR%%/Install.htm
 %%PORTDOCS%%%%DOCSDIR%%/Language.htm
@@ -108,11 +106,17 @@ share/color/icc/ghostscript/srgb.icc
 %%PORTDOCS%%%%DOCSDIR%%/VectorDevices.htm
 %%PORTDOCS%%%%DOCSDIR%%/WhatIsGS.htm
 %%PORTDOCS%%%%DOCSDIR%%/gdevds32.c
-%%PORTDOCS%%%%DOCSDIR%%/gs-vms.hlp
-%%PORTDOCS%%%%DOCSDIR%%/gsdoc.el
+%%PORTDOCS%%%%DOCSDIR%%/gs-style.css
+%%PORTDOCS%%%%DOCSDIR%%/images/Artifex_logo.png
+%%PORTDOCS%%%%DOCSDIR%%/images/favicon.png
+%%PORTDOCS%%%%DOCSDIR%%/images/ghostscript_logo.png
+%%PORTDOCS%%%%DOCSDIR%%/images/hamburger-light.png
+%%PORTDOCS%%%%DOCSDIR%%/images/x-light.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.js
 %%PORTDOCS%%%%DOCSDIR%%/pscet_status.txt
 %%PORTDOCS%%%%DOCSDIR%%/sample_downscale_device.htm
+%%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/subclass.htm
 %%PORTDOCS%%%%DOCSDIR%%/thirdparty.htm
 %%DATADIR%%/Resource/CIDFSubst/DroidSansFallback.ttf
diff --git a/print/ghostscript9-agpl-x11/Makefile b/print/ghostscript9-agpl-x11/Makefile
index 6b21985b3596..27498329fec3 100644
--- a/print/ghostscript9-agpl-x11/Makefile
+++ b/print/ghostscript9-agpl-x11/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghostscript
-PORTVERSION=	9.25
+PORTVERSION=	9.26
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/
 PKGNAMESUFFIX=	9-agpl-x11
@@ -29,11 +29,11 @@ CONFIGURE_ARGS=	--disable-compile-inits \
 		--disable-cups \
 		--disable-dbus \
 		--disable-gtk \
+		--disable-openjpeg \
 		--enable-contrib \
 		--enable-dynamic \
 		--enable-fontconfig \
 		--enable-freetype \
-		--enable-openjpeg \
 		--with-drivers=ALL \
 		--with-fontpath=${LOCALBASE}/share/fonts \
 		--with-jbig2dec \