5 files changed, 45 insertions, 60 deletions

diff --git a/print/ghostscript9-agpl/Makefile b/print/ghostscript9-agpl/Makefile
index de2b4d31a709..89019bf52815 100644
--- a/print/ghostscript9-agpl/Makefile
+++ b/print/ghostscript9-agpl/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghostscript
-PORTVERSION=	9.15
-PORTREVISION=	1
+PORTVERSION=	9.16
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -33,10 +32,9 @@ CONFLICTS_INSTALL= \
 		ghostscript[789]-[0-9]* \
 		ghostscript[789]-nox11-[0-9]*
 
-USES=		gmake jpeg pkgconfig:build tar:bzip2
+USES=		gmake jpeg pkgconfig:build autoreconf tar:bzip2
 WANT_GNOME=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 
 MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
diff --git a/print/ghostscript9-agpl/distinfo b/print/ghostscript9-agpl/distinfo
index 7ea0075fb4e9..b7eb565b3b3f 100644
--- a/print/ghostscript9-agpl/distinfo
+++ b/print/ghostscript9-agpl/distinfo
@@ -1,4 +1,4 @@
-SHA256 (ghostscript/ghostscript-9.15.tar.bz2) = e65daf25059e2f3dabd3535df3d936a42ca4933d36473a03095e39adcdd5315c
-SIZE (ghostscript/ghostscript-9.15.tar.bz2) = 28826065
+SHA256 (ghostscript/ghostscript-9.16.tar.bz2) = 3e2d44f925aabb4764b985a966880eafca2fd63a6998491308604d16a75cb86d
+SIZE (ghostscript/ghostscript-9.16.tar.bz2) = 29163348
 SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b
 SIZE (ghostscript/epag-3.09.tar.gz) = 12858
diff --git a/print/ghostscript9-agpl/files/patch-devices-devs.mak b/print/ghostscript9-agpl/files/patch-devices-devs.mak
index b4f383a589e7..a1c1d134dd66 100644
--- a/print/ghostscript9-agpl/files/patch-devices-devs.mak
+++ b/print/ghostscript9-agpl/files/patch-devices-devs.mak
@@ -1,22 +1,9 @@
---- devices/devs.mak.orig	2014-03-26 21:53:48.000000000 +0900
-+++ devices/devs.mak	2014-08-25 00:38:44.000000000 +0900
-@@ -438,10 +438,10 @@
+--- devices/devs.mak.orig	2015-03-30 17:21:24.000000000 +0900
++++ devices/devs.mak	2015-07-14 08:48:48.795797000 +0900
+@@ -546,7 +546,7 @@
  ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
  
- $(DEVOBJ)lvga256.so : $(lvga256_)
--	$(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)lvga256.so $(lvga256_) -lvga -lvgagl
-+	$(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)lvga256.so $(lvga256_) -lvga -lvgagl $(XLDFLAGS)
- 
- $(DEVOBJ)vgalib.so : $(vgalib_)
--	$(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)vgalib.so $(vgalib_) -lvga -lvgagl
-+	$(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)vgalib.so $(vgalib_) -lvga -lvgagl $(XLDFLAGS)
- 
- ### -------------------------- The X11 device -------------------------- ###
- 
-@@ -538,7 +538,7 @@
- ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
- 
- $(DEVOBJ)X11.so : $(x11alt_) $(x11_)
+ $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(MAKEDIRS)
 -	$(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
 +	$(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)X11.so $(x11alt_) $(x11_) -L$(LOCALBASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
  
diff --git a/print/ghostscript9-agpl/files/patch-devices-gdevplib.c b/print/ghostscript9-agpl/files/patch-devices-gdevplib.c
index fba0ff78c3aa..b14a47184e50 100644
--- a/print/ghostscript9-agpl/files/patch-devices-gdevplib.c
+++ b/print/ghostscript9-agpl/files/patch-devices-gdevplib.c
@@ -1,11 +1,11 @@
---- devices/gdevplib.c.orig	2012-02-08 17:48:47.000000000 +0900
-+++ devices/gdevplib.c	2012-02-13 01:23:46.000000000 +0900
-@@ -151,7 +151,11 @@
+--- devices/gdevplib.c.orig	2015-03-30 17:21:24.000000000 +0900
++++ devices/gdevplib.c	2015-07-14 08:51:50.711673000 +0900
+@@ -156,7 +156,11 @@
  
  #ifdef  TESTING_WITH_NO_BAND_DONOR
  
 +#if !defined(__FreeBSD__)
- #include <malloc.h>
+ #include <malloc_.h>
 +#else
 +#include <stdlib.h>
 +#endif
diff --git a/print/ghostscript9-agpl/pkg-plist b/print/ghostscript9-agpl/pkg-plist
index 183a56f0e14d..0728c2d6a6d5 100644
--- a/print/ghostscript9-agpl/pkg-plist
+++ b/print/ghostscript9-agpl/pkg-plist
@@ -249,41 +249,41 @@ man/man1/wftopfa.1.gz
 %%DATADIR%%/%%GS_VERSION%%/Resource/Encoding/ExpertSubsetEncoding
 %%DATADIR%%/%%GS_VERSION%%/Resource/Encoding/NotDefEncoding
 %%DATADIR%%/%%GS_VERSION%%/Resource/Encoding/Wingdings
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-Bold
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-BoldItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-Ital
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-Roma
 %%DATADIR%%/%%GS_VERSION%%/Resource/Font/Dingbats
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-Bold
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-BoldObli
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-Regu
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-ReguObli
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-Medi
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-MediItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-Regu
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-ReguItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-Bold
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-BoldCond
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-BoldCondItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-BoldItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-Regu
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-ReguCond
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-ReguCondItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-ReguItal
 %%DATADIR%%/%%GS_VERSION%%/Resource/Font/StandardSymL
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-DemiBold
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-DemiBoldItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-Ligh
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-LighItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWChanceryL-MediItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-Book
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-BookObli
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-Demi
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-DemiObli
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-Bold
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-BoldItal
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-Ital
-%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-Roma
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/BookmanURW-DemBol
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/BookmanURW-DemBolIta
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/BookmanURW-Lig
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/BookmanURW-LigIta
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchURW-Bol
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchURW-BolIta
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchURW-Ita
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchURW-Rom
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/ChanceryURW-MedIta
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMon-Bol
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMon-BolObl
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMon-Obl
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMon-Reg
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRom-Ita
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRom-Med
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRom-MedIta
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRom-Reg
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSan-Bol
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSan-BolIta
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSan-Ita
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSan-Reg
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanNar-Bol
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanNar-BolIta
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanNar-Ita
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanNar-Reg
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/PalladioURW-Bol
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/PalladioURW-BolIta
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/PalladioURW-Ita
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/PalladioURW-Rom
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothic-Boo
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothic-BooObl
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothic-Dem
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothic-DemObl
 %%DATADIR%%/%%GS_VERSION%%/Resource/IdiomSet/Pscript5Idiom
 %%DATADIR%%/%%GS_VERSION%%/iccprofiles/default_cmyk.icc
 %%DATADIR%%/%%GS_VERSION%%/iccprofiles/default_gray.icc