diff options
-rw-r--r-- | print/ghostscript-agpl/Makefile | 6 | ||||
-rw-r--r-- | print/ghostscript-agpl/Makefile.common | 4 | ||||
-rw-r--r-- | print/ghostscript-agpl/PLIST | 4 | ||||
-rw-r--r-- | print/ghostscript-agpl/distinfo | 16 | ||||
-rw-r--r-- | print/ghostscript-agpl/patches/patch-af | 22 | ||||
-rw-r--r-- | print/ghostscript-agpl/patches/patch-al | 10 | ||||
-rw-r--r-- | print/ghostscript-agpl/patches/patch-devices_devs.mak | 20 |
7 files changed, 34 insertions, 48 deletions
diff --git a/print/ghostscript-agpl/Makefile b/print/ghostscript-agpl/Makefile index 57a22766ae8..89b6a05e7d7 100644 --- a/print/ghostscript-agpl/Makefile +++ b/print/ghostscript-agpl/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2016/02/25 17:52:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2016/04/07 08:52:05 adam 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/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=ArtifexSoftware/ghostpdl-downloads/releases/download/gs919/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/print/ghostscript-agpl/Makefile.common b/print/ghostscript-agpl/Makefile.common index 9369f0322b8..59d21b58c8d 100644 --- a/print/ghostscript-agpl/Makefile.common +++ b/print/ghostscript-agpl/Makefile.common @@ -1,5 +1,5 @@ -# $NetBSD: Makefile.common,v 1.7 2015/10/10 11:55:18 adam Exp $ +# $NetBSD: Makefile.common,v 1.8 2016/04/07 08:52:05 adam Exp $ # used by print/ghostscript-agpl/Makefile # used by fonts/ghostscript-cidfonts-ryumin/Makefile -GS_VERSION= 9.18 +GS_VERSION= 9.19 diff --git a/print/ghostscript-agpl/PLIST b/print/ghostscript-agpl/PLIST index 37d81612e08..78d023858c1 100644 --- a/print/ghostscript-agpl/PLIST +++ b/print/ghostscript-agpl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2015/12/10 11:58:58 markd Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/04/07 08:52:05 adam Exp $ bin/dvipdf bin/eps2eps bin/font2c @@ -404,8 +404,6 @@ share/ghostscript/${PKGVERSION}/doc/News.htm share/ghostscript/${PKGVERSION}/doc/Projects.htm share/ghostscript/${PKGVERSION}/doc/Ps-style.htm share/ghostscript/${PKGVERSION}/doc/Ps2epsi.htm -share/ghostscript/${PKGVERSION}/doc/Ps2pdf.htm -share/ghostscript/${PKGVERSION}/doc/Ps2ps2.htm share/ghostscript/${PKGVERSION}/doc/Psfiles.htm share/ghostscript/${PKGVERSION}/doc/Readme.htm share/ghostscript/${PKGVERSION}/doc/Release.htm diff --git a/print/ghostscript-agpl/distinfo b/print/ghostscript-agpl/distinfo index 91181fe35d0..cfa975f4734 100644 --- a/print/ghostscript-agpl/distinfo +++ b/print/ghostscript-agpl/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.11 2015/12/10 11:58:58 markd Exp $ +$NetBSD: distinfo,v 1.12 2016/04/07 08:52:05 adam 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) = 11c348036c61478db8e612d7924c6f49e22c32f3 +SHA1 (ghostscript-9.19.tar.bz2) = 6ac5c1fb665b3201622e1149f04c641c506bf6c4 +RMD160 (ghostscript-9.19.tar.bz2) = c869357b20ab50d36a6d6ec656732f711e2d36ed +SHA512 (ghostscript-9.19.tar.bz2) = d92d05c90ab4849ccca0d8aa0c583d41da3fe6089fd724a84f1fbddb3e65e116ee064ae0933b77019609332f765840146b62607e2f94dbfff90aa0597e1271ea +Size (ghostscript-9.19.tar.bz2) = 29616270 bytes +SHA1 (patch-af) = ad8fbc52a814905b25dbd10ff51ae8615579a7d1 SHA1 (patch-ah) = db74a482e22771414f223a97dd71df5215553d85 SHA1 (patch-ai) = 427504a85cc08e49c18d607b434febe65c9880a2 -SHA1 (patch-al) = f0816b9fd61c6af0ebde05ccb464560b8d0a80f4 +SHA1 (patch-al) = 8245bdac049567139570b5b2d3f7b784f82a6848 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909 -SHA1 (patch-devices_devs.mak) = 08af9e55d0b93f748de10e475bfcc16538f0115c +SHA1 (patch-devices_devs.mak) = ceb89a4d50765e146c0f3199c31b2c053bf2be09 SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = bf7e47c77e6960df473d3bf97dfa78f207a14a01 diff --git a/print/ghostscript-agpl/patches/patch-af b/print/ghostscript-agpl/patches/patch-af index 474e4c800da..7be2fa88d80 100644 --- a/print/ghostscript-agpl/patches/patch-af +++ b/print/ghostscript-agpl/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.5 2015/12/10 11:58:58 markd Exp $ +$NetBSD: patch-af,v 1.6 2016/04/07 08:52:06 adam 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,11 +8,9 @@ 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.orig 2016-03-23 08:22:48.000000000 +0000 +++ base/unix-dll.mak -@@ -64,11 +64,11 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$ +@@ -66,11 +66,11 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$ # MacOS X @@ -29,25 +27,17 @@ Add gserrors.h to the installed files (Bug 696301) #LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR) #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME) -@@ -94,11 +94,11 @@ so-links-subtarget: $(GS_SO) +@@ -96,11 +96,11 @@ so-links-subtarget: $(GS_SO) $(UNIX_DLL_ # Build the small Ghostscript loaders, with Gtk+ and without - $(GSSOC_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) + $(GSSOC_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS) $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \ - -L$(BINDIR) -l$(GS_SO_BASE) + -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE) - $(GSSOX_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) + $(GSSOX_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS) $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \ - -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS) + -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS_SO_BASE) $(SOC_LIBS) # ------------------------- 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: diff --git a/print/ghostscript-agpl/patches/patch-al b/print/ghostscript-agpl/patches/patch-al index 67eddcb4ecf..414fa0f70f9 100644 --- a/print/ghostscript-agpl/patches/patch-al +++ b/print/ghostscript-agpl/patches/patch-al @@ -1,11 +1,11 @@ -$NetBSD: patch-al,v 1.3 2015/10/10 11:55:19 adam Exp $ +$NetBSD: patch-al,v 1.4 2016/04/07 08:52:06 adam Exp $ ---- base/unixlink.mak.orig 2015-10-05 08:21:11.000000000 +0000 +--- base/unixlink.mak.orig 2016-03-23 08:22:48.000000000 +0000 +++ base/unixlink.mak -@@ -58,7 +58,7 @@ $(GS_A): $(PSOBJ)gsromfs$(COMPILE_INITS) - ldt_tr=$(PSOBJ)ldt.tr +@@ -60,7 +60,7 @@ ldt_tr=$(PSOBJ)ldt.tr - $(GS_XE): $(ld_tr) $(gs_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) + $(GS_XE): $(ld_tr) $(gs_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) \ + $(UNIXLINK_MAK) - $(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE) + $(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) $(LDFLAGS_SO) -o $(GS_XE) $(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(PSOBJ)gs.$(OBJ) -s diff --git a/print/ghostscript-agpl/patches/patch-devices_devs.mak b/print/ghostscript-agpl/patches/patch-devices_devs.mak index acc1e77cc99..763a200eeec 100644 --- a/print/ghostscript-agpl/patches/patch-devices_devs.mak +++ b/print/ghostscript-agpl/patches/patch-devices_devs.mak @@ -1,24 +1,24 @@ -$NetBSD: patch-devices_devs.mak,v 1.4 2015/10/10 11:55:19 adam Exp $ +$NetBSD: patch-devices_devs.mak,v 1.5 2016/04/07 08:52:06 adam Exp $ Don't depend on src/zlib.h. ---- devices/devs.mak.orig 2015-10-05 08:21:11.000000000 +0000 +--- devices/devs.mak.orig 2016-03-23 08:22:48.000000000 +0000 +++ devices/devs.mak -@@ -1226,7 +1226,7 @@ $(libtiff_dev) $(MAKEDIRS) +@@ -1233,7 +1233,7 @@ $(gximdecode_h) $(DEVS_MAK) $(MAKEDIRS) - $(DEVOBJ)gdevxps.$(OBJ) : $(DEVVECSRC)gdevxps.c $(gdevvec_h) \ + $(DEVOBJ)gdevxps_0.$(OBJ) : $(DEVVECSRC)gdevxps.c $(gdevvec_h) \ $(string__h) $(stdio__h) $(libtiff_dev) $(gx_h) $(gserrors_h) \ -$(gxpath_h) $(gzcpath_h) $(stream_h) $(zlib_h) \ +$(gxpath_h) $(gzcpath_h) $(stream_h) \ $(stdint__h) $(gdevtifs_h) $(gsicc_create_h) $(gsicc_cache_h) \ - $(gximdecode_h) $(MAKEDIRS) - $(XPSDEVCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps.$(OBJ) $(C_) $(DEVVECSRC)gdevxps.c -@@ -1399,7 +1399,7 @@ $(DD)gprf.dev : $(DEVS_MAK) $(gprf_) $(G + $(gximdecode_h) $(DEVS_MAK) $(MAKEDIRS) + $(XPSDEVCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps_0.$(OBJ) $(C_) $(DEVVECSRC)gdevxps.c +@@ -1417,7 +1417,7 @@ $(DEVOBJ)gdevgprf_1.$(OBJ) : $(DEVSRC)gd - $(DEVOBJ)gdevgprf.$(OBJ) : $(DEVSRC)gdevgprf.c $(PDEVH) $(math__h)\ + $(DEVOBJ)gdevgprf_0.$(OBJ) : $(DEVSRC)gdevgprf.c $(PDEVH) $(math__h)\ $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\ - $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h) $(zlib_h)\ + $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h) \ $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h) $(gxgetbit_h)\ - $(gdevppla_h) $(MAKEDIRS) - $(DEVCC) $(DEVO_)gdevgprf.$(OBJ) $(II)$(ZI_)$(_I) $(C_) $(DEVSRC)gdevgprf.c + $(gdevppla_h) $(DEVS_MAK) $(MAKEDIRS) + $(DEVCC) $(DEVO_)gdevgprf_0.$(OBJ) $(II)$(ZI_)$(_I) $(C_) $(DEVSRC)gdevgprf.c |