Intermediate update to ghostscript-9.07. Yes, I know gs-9.10 is
already out, but I'd like to do this in smaller steps.
Please note that this version lacks JPX support (because the patched
jasper had been removed and I didn't yet manage to get gs built
with openjpeg).
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
retrieving revision 1.100
diff -u -p -r1.100 Makefile
--- Makefile 22 Aug 2013 09:14:32 -0000 1.100
+++ Makefile 17 Dec 2013 21:10:37 -0000
@@ -2,11 +2,10 @@
COMMENT= GNU PostScript interpreter
-VERSION= 9.06
+VERSION= 9.07
DISTNAME= ghostscript-${VERSION}
CATEGORIES= print lang
SHARED_LIBS= gs 15.0
-REVISION= 4
MASTER_SITES= http://downloads.ghostscript.com/public/
@@ -150,7 +149,8 @@ post-extract:
find ${WRKDIST} -name '*.orig' -type f | xargs -r rm
ln -s base/unix-gcc.mak ${WRKDIST}/Makefile
cd ${WRKSRC} && mkdir junk && \
- mv freetype ijs jasper jpeg libpng jbig2dec tiff zlib junk
+ mv expat freetype ijs jpeg lcms lcms2 libpng jbig2dec \
+ openjpeg tiff zlib junk
pre-build:
mkdir -p ${WRKDIST}/obj
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 22 Aug 2012 06:24:17 -0000 1.16
+++ distinfo 27 Oct 2013 17:49:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (ghostscript-9.06.tar.gz) = wzZyHDtpFhiTTyqFgtGb5IX3asEXNKPEDBFgV0kVHvs=
-SIZE (ghostscript-9.06.tar.gz) = 33552015
+SHA256 (ghostscript-9.07.tar.gz) = RIANAExT8TGS0bXbQTEZGY3fyKEcTSoDCqwvL9qCLr8=
+SIZE (ghostscript-9.07.tar.gz) = 31911560
Index: patches/patch-base_devs_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-base_devs_mak,v
retrieving revision 1.8
diff -u -p -r1.8 patch-base_devs_mak
--- patches/patch-base_devs_mak 22 Aug 2013 09:14:32 -0000 1.8
+++ patches/patch-base_devs_mak 27 Oct 2013 17:49:24 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-base_devs_mak,v 1.8 2013/08/22 09:14:32 ajacoutot Exp $
---- base/devs.mak.orig Wed Aug 8 10:01:36 2012
-+++ base/devs.mak Thu Feb 14 19:52:13 2013
-@@ -1831,14 +1831,11 @@ $(DD)plibk.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $
+--- base/devs.mak.orig Thu Feb 14 08:58:13 2013
++++ base/devs.mak Tue Sep 17 19:58:33 2013
+@@ -1841,14 +1841,11 @@ $(DD)plibk.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $
$(SETPDEV2) $(DD)plibk $(plib_)
### ------------------------------- CUPS ------------------------------- ###
Index: patches/patch-base_jasper_mak
===================================================================
RCS file: patches/patch-base_jasper_mak
diff -N patches/patch-base_jasper_mak
--- patches/patch-base_jasper_mak 22 Aug 2012 06:24:17 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-base_jasper_mak,v 1.2 2012/08/22 06:24:17 ajacoutot Exp $
---- base/jasper.mak.orig Wed Aug 8 10:01:36 2012
-+++ base/jasper.mak Fri Aug 17 15:12:56 2012
-@@ -161,7 +161,7 @@ JAS_EXCF_=\
- $(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D)
-
- # define our specific compiler
--JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
-+JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(CCFLAGS)
$(JAS_EXCF_)
- JASO_=$(O_)$(JASOBJ)
-
- # switch in the selected .dev
Index: patches/patch-base_unix-dll_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-base_unix-dll_mak,v
retrieving revision 1.5
diff -u -p -r1.5 patch-base_unix-dll_mak
--- patches/patch-base_unix-dll_mak 22 Aug 2012 06:24:17 -0000 1.5
+++ patches/patch-base_unix-dll_mak 27 Oct 2013 17:49:24 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-base_unix-dll_mak,v 1.5 2012/08/22 06:24:17 ajacoutot Exp $
---- base/unix-dll.mak.orig Wed Aug 8 10:01:36 2012
-+++ base/unix-dll.mak Fri Aug 17 15:12:56 2012
+--- base/unix-dll.mak.orig Thu Feb 14 08:58:13 2013
++++ base/unix-dll.mak Tue Sep 17 20:11:00 2013
@@ -24,10 +24,6 @@
# export LD_LIBRARY_PATH=/insert-path-here/sobin
# export GS_LIB=/insert-path-here/lib
@@ -71,7 +71,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.5
# ------------------------- Recursive make targets ------------------------- #
-@@ -100,6 +94,13 @@ SODEFS=\
+@@ -105,6 +99,13 @@ SODEFS_FINAL=\
STDIO_IMPLEMENTATION=c\
BUILDDIRPREFIX=$(BUILDDIRPREFIX)
@@ -85,7 +85,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.5
# This is a bit nasty; because of the directory name rewriting that happens
# on a recursive build, we have to recurse twice before we are sure that
# all the targets are correct.
-@@ -118,19 +119,27 @@ sodebug:
+@@ -123,19 +124,27 @@ sodebug:
fi
$(MAKE) so-subtarget$(FOR_MAC) GENOPT='-DDEBUG'
BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
@@ -107,7 +107,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.5
+ @echo USE_GTK = $(USE_GTK)
+ @echo GSSOC = $(GSSOC)
+ @echo GSSOX = $(GSSOX)
- $(MAKE) $(SODEFS) GENOPT='$(GENOPT)' LDFLAGS='$(LDFLAGS)'\
+ $(MAKE) $(SODEFS_FINAL) GENOPT='$(GENOPT)' LDFLAGS='$(LDFLAGS)'\
CFLAGS='$(CFLAGS_STANDARD) $(GCFLAGS) $(AC_CFLAGS) $(XCFLAGS)'
prefix=$(prefix)\
- $(GSSOC_XE) $(GSSOX_XE)
+ USE_GTK=$(USE_GTK) \
@@ -115,7 +115,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.5
# special so-subtarget for MAC OS X
so-subtarget_1:
-@@ -162,13 +171,11 @@ install-so-subtarget: so-subtarget$(FOR_MAC)
+@@ -167,13 +176,11 @@ install-so-subtarget: so-subtarget$(FOR_MAC)
-mkdir -p $(DESTDIR)$(bindir)
-mkdir -p $(DESTDIR)$(libdir)
-mkdir -p $(DESTDIR)$(gsincludedir)
@@ -131,7 +131,7 @@ $OpenBSD: patch-base_unix-dll_mak,v 1.5
$(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
$(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
$(INSTALL_DATA) $(GLSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
-@@ -180,6 +187,8 @@ sodebuginstall:
+@@ -185,6 +192,8 @@ sodebuginstall:
$(MAKE) soinstall-subtarget GENOPT='-DDEBUG'
BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
soinstall-subtarget: install-so install-scripts install-data
$(INSTALL_SHARED) $(INSTALL_CONTRIB)
Index: patches/patch-base_unix-gcc_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-base_unix-gcc_mak,v
retrieving revision 1.9
diff -u -p -r1.9 patch-base_unix-gcc_mak
--- patches/patch-base_unix-gcc_mak 22 Aug 2013 09:14:32 -0000 1.9
+++ patches/patch-base_unix-gcc_mak 27 Oct 2013 17:49:24 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-base_unix-gcc_mak,v 1.9 2013/08/22 09:14:32 ajacoutot Exp $
---- base/unix-gcc.mak.orig Wed Aug 8 10:01:36 2012
-+++ base/unix-gcc.mak Fri Aug 17 15:12:56 2012
+--- base/unix-gcc.mak.orig Thu Feb 14 08:58:13 2013
++++ base/unix-gcc.mak Tue Sep 17 20:59:54 2013
@@ -32,6 +32,7 @@ PSLIBDIR=./lib
PSRESDIR=./Resource
PSGENDIR=./$(BUILDDIRPREFIX)obj
@@ -24,7 +24,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.9
# Define whether or not searching for initialization files should always
# look in the current directory first. This leads to well-known security
-@@ -212,9 +213,17 @@ IJS_NAME=
+@@ -208,6 +209,9 @@ IJS_NAME=
IJSSRCDIR=ijs
IJSEXECTYPE=unix
@@ -34,15 +34,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.9
# Define how to build the library archives. (These are not used in any
# standard configuration.)
-+JPX_LIB=jasper
-+JPXSRCDIR=jasper
-+SHARE_JPX=0
-+JPX_CFLAGS=-DJAS_CONFIGURE
-+
- AR=ar
- ARFLAGS=qc
- RANLIB=ranlib
-@@ -223,7 +232,7 @@ RANLIB=ranlib
+@@ -219,7 +223,7 @@ RANLIB=ranlib
# Define the name of the C compiler.
@@ -51,7 +43,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.9
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
-@@ -235,7 +244,7 @@ CCLD=$(CC)
+@@ -231,7 +235,7 @@ CCLD=$(CC)
# the 2.7.0-2.7.2 optimizer bug, either "-Dconst=" or
# "-Wcast-qual -Wwrite-strings" is automatically included.
@@ -60,7 +52,16 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.9
# Define the added flags for standard, debugging, profiling
# and shared object builds.
-@@ -375,8 +384,6 @@ DISPLAY_DEV=
+@@ -333,7 +337,7 @@ SOC_LOADER=dxmainc.c
+
+ # Choose the language feature(s) to include. See gs.mak for details.
+
+-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev
$(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev
++FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev
$(PSD)epsf.dev $(GLD)pipe.dev
+ #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
+ # The following is strictly for testing.
+ FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev
$(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev
$(PSD)stocht.dev $(GLD)pipe.dev
+@@ -371,8 +375,6 @@ DISPLAY_DEV=
# Choose the device(s) to include. See devs.mak for details,
# devs.mak and contrib.mak for the list of available devices.
@@ -69,7 +70,7 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.9
#DEVICE_DEVS1=
#DEVICE_DEVS2=
#DEVICE_DEVS3=
-@@ -398,36 +405,18 @@ DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.
+@@ -394,36 +396,18 @@ DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.
#DEVICE_DEVS19=
#DEVICE_DEVS20=
@@ -112,18 +113,16 @@ $OpenBSD: patch-base_unix-gcc_mak,v 1.9
# ---------------------------- End of options --------------------------- #
-@@ -476,8 +465,9 @@ include $(GLSRCDIR)/zlib.mak
+@@ -472,7 +456,7 @@ include $(GLSRCDIR)/zlib.mak
include $(GLSRCDIR)/png.mak
include $(GLSRCDIR)/tiff.mak
include $(GLSRCDIR)/jbig2.mak
-+include $(GLSRCDIR)/jasper.mak
- include $(GLSRCDIR)/icclib.mak
-include $(GLSRCDIR)/lcms.mak
+include $(GLSRCDIR)/lcms2.mak
include $(GLSRCDIR)/ijs.mak
include $(GLSRCDIR)/devs.mak
include $(GLSRCDIR)/contrib.mak
-@@ -486,6 +476,8 @@ include $(GLSRCDIR)/unixlink.mak
+@@ -481,6 +465,8 @@ include $(GLSRCDIR)/unixlink.mak
include $(GLSRCDIR)/unix-dll.mak
include $(GLSRCDIR)/unix-end.mak
include $(GLSRCDIR)/unixinst.mak
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST
--- pkg/PLIST 22 Aug 2013 08:02:22 -0000 1.26
+++ pkg/PLIST 17 Dec 2013 21:17:22 -0000
@@ -17,7 +17,6 @@ bin/gsnd
bin/lprsetup.sh
bin/pdf2dsc
bin/pdf2ps
-bin/pdfopt
bin/pf2afm
bin/pfbtopfa
bin/pphs
@@ -554,7 +553,6 @@ share/ghostscript/${VERSION}/lib/necp2x6
share/ghostscript/${VERSION}/lib/packfile.ps
share/ghostscript/${VERSION}/lib/pcharstr.ps
share/ghostscript/${VERSION}/lib/pdf2dsc.ps
-share/ghostscript/${VERSION}/lib/pdfopt.ps
share/ghostscript/${VERSION}/lib/pdfwrite.ps
share/ghostscript/${VERSION}/lib/pf2afm.ps
share/ghostscript/${VERSION}/lib/pfbtopfa.ps
