On Sun, Oct 11, 2009 at 09:23:52PM +0200, Matthias Kilian wrote: > > Please test and cry. > > Looks like this needs some more work.
This one should be better; at least it works for me on powerpc. Note that I've disabled the build of pdftoraster for now, because I really don't want the cups dependency creeping back into ghostscript. Index: Makefile =================================================================== RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v retrieving revision 1.69 diff -u -p -r1.69 Makefile --- Makefile 13 Sep 2009 20:59:16 -0000 1.69 +++ Makefile 12 Oct 2009 15:38:13 -0000 @@ -2,9 +2,8 @@ COMMENT= GNU PostScript interpreter -VERSION= 8.63 +VERSION= 8.64 DISTNAME= ghostscript-${VERSION} -PKGNAME= ${DISTNAME}p9 CATEGORIES= print lang SHARED_LIBS= gs 11.0 @@ -47,6 +46,7 @@ CFLAGS+= -DSYS_TYPES_HAS_STDINT_TYPES \ MAKE_FLAGS= BINDIR=./obj \ CFLAGS_STANDARD='${CFLAGS} -fPIC' \ + COMPILE_INITS=0 \ CUPSCFLAGS="$$(cups-config --cflags)" \ CUPSSERVERBIN="$$(cups-config --serverbin)" \ CUPSSERVERROOT="$$(cups-config --serverroot)" \ @@ -55,7 +55,7 @@ MAKE_FLAGS= BINDIR=./obj \ EXTRALIBS="${EXTRALIBS}" \ GLGENDIR=./obj \ GLOBJDIR=./obj \ - GLSRCDIR=./src \ + GLSRCDIR=./base \ ICCSRCDIR=./icclib \ INSTALL='${INSTALL}' \ INSTALL_DATA='${INSTALL_DATA}' \ @@ -66,7 +66,7 @@ MAKE_FLAGS= BINDIR=./obj \ PSGENDIR=./obj \ PSLIBDIR=./lib \ PSOBJDIR=./obj \ - PSSRCDIR=./src \ + PSSRCDIR=./psi \ SHARE_IJS=1 \ SHARE_JPEG=1 \ SHARE_LIBPNG=1 \ @@ -75,6 +75,7 @@ MAKE_FLAGS= BINDIR=./obj \ SOOBJRELDIR=../obj \ SOC_CFLAGS="${SOC_CFLAGS}" \ SOC_LIBS="${SOC_LIBS}" \ + SOC_LOADER=dxmainc.c \ STDLIBS='-pthread -lm -liconv' \ SYNC=posync \ TRUE_PREFIX='${LOCALBASE}' \ @@ -147,7 +148,7 @@ NO_REGRESS= Yes # Use the old-style (non-autoconf) build. post-extract: find ${WRKDIST} -name '*.orig' -type f | xargs -r rm - ln -s src/unix-gcc.mak ${WRKDIST}/Makefile + ln -s base/unix-gcc.mak ${WRKDIST}/Makefile cd ${WRKSRC} && rm -rf zlib ijs jpeg libpng pre-build: Index: distinfo =================================================================== RCS file: /cvs/ports/print/ghostscript/gnu/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo 28 Oct 2008 17:53:42 -0000 1.11 +++ distinfo 12 Oct 2009 15:38:13 -0000 @@ -1,5 +1,5 @@ -MD5 (ghostscript-8.63.tar.gz) = si5omyN6ZZTRykCPK1WokQ== -RMD160 (ghostscript-8.63.tar.gz) = GgKzAi/jkmpReDJhdCh+42Kubis= -SHA1 (ghostscript-8.63.tar.gz) = WLZI4Dg9YWfl6pOy3eAz7Os2ZJE= -SHA256 (ghostscript-8.63.tar.gz) = NR1VwlzL4H7xfayh0BYsz2vBTfrA2Zi906D91aER2H8= -SIZE (ghostscript-8.63.tar.gz) = 17446458 +MD5 (ghostscript-8.64.tar.gz) = 3ZJ+z35Ns4tivj3BexsE0g== +RMD160 (ghostscript-8.64.tar.gz) = wNWrmjXLxzEXCKuR8KTEfjMtsSE= +SHA1 (ghostscript-8.64.tar.gz) = Llai/deRLA0ErVLAXQ6T4+RzsTE= +SHA256 (ghostscript-8.64.tar.gz) = NJPaKXayZnB8lONuHYIAZSkGP7PzidU0iN/g2Ledn/U= +SIZE (ghostscript-8.64.tar.gz) = 19413692 Index: patches/patch-base_devs_mak =================================================================== RCS file: patches/patch-base_devs_mak diff -N patches/patch-base_devs_mak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-base_devs_mak 12 Oct 2009 15:38:13 -0000 @@ -0,0 +1,22 @@ +$OpenBSD$ +--- base/devs.mak.orig Fri Nov 7 19:49:34 2008 ++++ base/devs.mak Fri Feb 6 21:10:39 2009 +@@ -651,14 +651,13 @@ $(GLOBJ)gdevlj56.$(OBJ) : $(GLSRC)gdevlj56.c $(PDEVH) + + ### -------------------- The ijs client ----------------- ### + +-ijs_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \ +- $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ) ++ijs_=$(GLOBJ)gdevijs.$(OBJ) + +-$(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev ++$(DD)ijs.dev : $(ijs_) $(GLD)page.dev + $(SETPDEV) $(DD)ijs $(ijs_) ++ $(ADDMOD) $(DD)ijs -lib ijs + +-$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\ +- $(ijs_h) $(ijs_client_h) ++$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h) + $(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(GLF_) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c + + # Please see ijs.mak for the Makefile fragment which builds the IJS Index: patches/patch-base_ijs_mak =================================================================== RCS file: patches/patch-base_ijs_mak diff -N patches/patch-base_ijs_mak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-base_ijs_mak 12 Oct 2009 15:38:13 -0000 @@ -0,0 +1,33 @@ +$OpenBSD$ +--- base/ijs.mak.orig Wed Jun 6 00:23:38 2007 ++++ base/ijs.mak Fri Sep 14 21:11:40 2007 +@@ -18,6 +18,8 @@ + # in spawning the server. currently + # 'unix' and 'win' are supported. + # BINDIR - where to put the executible examples ++# SHARE_IJS - 0 to compile the library, 1 to share ++# IJS_NAME - if SHARE_IJS = 1, the name of the shared library + + # This partial makefile compiles the IJS client library for use in + # Ghostscript. +@@ -51,9 +53,19 @@ ijs.config-clean : + + IJSDEP=$(AK) + ++# Define the version of ijslib.dev that we are actually using. ++$(IJSGEN)ijslib.dev : $(TOP_MAKEFILES) $(IJSGEN)ijslib_$(SHARE_IJS).dev ++ $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev ++ ++# Define the shared version of libpng. ++# Note that it requires libz, which must be searched *after* libpng. ++$(IJSGEN)ijslib_1.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(ECHOGS_XE) ++ $(SETMOD) $(IJSGEN)ijslib_1 -lib $(IJS_NAME) ++ ++# Define the non-shared version of ijslib. + ijslib_=$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_server.$(OBJ) \ + $(IJSOBJ)ijs_client.$(OBJ) $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ) +-$(IJSGEN)ijslib.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_) ++$(IJSGEN)ijslib_0.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_) + $(SETMOD) $(IJSGEN)ijslib $(ijslib_) + + ijs_h=$(IJSSRC)ijs.h Index: patches/patch-base_jasper_mak =================================================================== RCS file: patches/patch-base_jasper_mak diff -N patches/patch-base_jasper_mak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-base_jasper_mak 12 Oct 2009 15:38:13 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- base/jasper.mak.orig Thu Oct 18 02:36:37 2007 ++++ base/jasper.mak Sat Apr 26 14:03:43 2008 +@@ -159,7 +159,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_lib_mak =================================================================== RCS file: patches/patch-base_lib_mak diff -N patches/patch-base_lib_mak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-base_lib_mak 12 Oct 2009 15:38:13 -0000 @@ -0,0 +1,18 @@ +$OpenBSD$ +--- base/lib.mak.orig Tue Jul 17 11:55:56 2007 ++++ base/lib.mak Mon Sep 3 15:27:31 2007 +@@ -25,12 +25,12 @@ GLO_=$(O_)$(GLOBJ) + GLI_=$(GLGENDIR) $(II)$(GLSRCDIR) + GLF_= + GLCCFLAGS=$(I_)$(GLI_)$(_I) $(GLF_) +-GLCC=$(CC_) $(GLCCFLAGS) ++GLCC=$(CC) $(GLCCFLAGS) $(CCFLAGS) + GLICCCC=$(CC_) $(I_)$(GLI_) $(II)$(ICCI_)$(_I) $(ICCCF_) $(GLF_) + GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_) + GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_) + GLJBIG2CC=$(CC_) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_) +-GLJASCC=$(CC_) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) ++GLJASCC=$(CC) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) ${CCFLAGS} + GLLDFJB2CC=$(CC_) $(I_)$(LDF_JB2I_) $(II)$(GLI_)$(_I) $(JB2CF_) $(GLF_) + GLLWFJPXCC=$(CC_) $(I_)$(LWF_JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) + GLCCSHARED=$(CC_SHARED) $(GLCCFLAGS) Index: patches/patch-base_unix-aux_mak =================================================================== RCS file: patches/patch-base_unix-aux_mak diff -N patches/patch-base_unix-aux_mak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-base_unix-aux_mak 12 Oct 2009 15:38:13 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- base/unix-aux.mak.orig Fri Jun 29 00:08:46 2007 ++++ base/unix-aux.mak Mon Sep 3 15:27:31 2007 +@@ -77,7 +77,7 @@ $(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) + $(GENINIT_XE): $(GLSRC)geninit.c $(AK) $(GENINIT_DEPS) + $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENINIT_XE) $(GLSRC)geninit.c + +-MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ ++MKROMFS_OBJS=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ + $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \ + $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \ + $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ) Index: patches/patch-base_unix-dll_mak =================================================================== RCS file: patches/patch-base_unix-dll_mak diff -N patches/patch-base_unix-dll_mak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-base_unix-dll_mak 12 Oct 2009 15:38:13 -0000 @@ -0,0 +1,62 @@ +$OpenBSD$ +--- base/unix-dll.mak.orig Sat Sep 13 22:22:25 2008 ++++ base/unix-dll.mak Sun Oct 11 18:45:34 2009 +@@ -39,7 +39,9 @@ GSSOC=$(BINDIR)/$(SOBINRELDIR)/$(GSSOC_XENAME) + # loader suporting display device using Gtk+ + GSSOX_XENAME=$(GS)x$(XE) + GSSOX_XE=$(BINDIR)/$(GSSOX_XENAME) +-GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME) ++GSSOX-Yes=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME) ++GSSOX-No= ++GSSOX=$(GSSOX-$(USE_GTK)) + + # shared library + GS_SONAME_BASE=lib$(GS) +@@ -47,9 +49,9 @@ GS_SONAME_BASE=lib$(GS) + # GNU/Linux + GS_SOEXT=so + GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) +-GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) +-GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) +-LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR) ++GS_SONAME_MAJOR=$(GS_SONAME).$(basename $(LIBgs_VERSION)) ++GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(LIBgs_VERSION) ++LDFLAGS_SO=-shared + + # MacOS X + #GS_SOEXT=dylib +@@ -78,8 +80,9 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) + + # Build the small Ghostscript loaders, with Gtk+ and without + +-$(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) +- $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c -L$(BINDIR) -l$(GS) ++$(GSSOC_XE): $(GS_SO) $(PSSRC)dxmainc.c ++ $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c -L$(BINDIR) -l$(GS) \ ++ $(SOC_LIBS) + + $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) + $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \ +@@ -100,7 +103,7 @@ SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\ + + # Normal shared object + so: SODIRS +- $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX) ++ $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX) + + # Debug shared object + # Note that this is in the same directory as the normal shared +@@ -117,12 +120,9 @@ install-so: so + -mkdir -p $(DESTDIR)$(libdir) + -mkdir -p $(DESTDIR)$(gsincludedir) + $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) ++ [ "$(USE_GTK)" = No ] || \ + $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME) + $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR) +- $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME) +- ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME) +- $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) +- 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)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h Index: patches/patch-base_unix-gcc_mak =================================================================== RCS file: patches/patch-base_unix-gcc_mak diff -N patches/patch-base_unix-gcc_mak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-base_unix-gcc_mak 12 Oct 2009 15:38:13 -0000 @@ -0,0 +1,121 @@ +$OpenBSD$ +--- base/unix-gcc.mak.orig Thu Oct 2 21:33:22 2008 ++++ base/unix-gcc.mak Mon Oct 12 15:45:23 2009 +@@ -30,6 +30,7 @@ PSLIBDIR=./lib + PSRESDIR=./Resource + PSGENDIR=./obj + PSOBJDIR=./obj ++CONTRIBDIR=./contrib + + # Do not edit the next group of lines. + +@@ -68,12 +69,12 @@ gsincludedir = $(includedir)/ghostscript/ + + docdir=$(gsdatadir)/doc + exdir=$(gsdatadir)/examples +-GS_DOCDIR=$(docdir) ++GS_DOCDIR=$(TRUEPREFIX)/share/ghostscript/$(GS_DOT_VERSION)/doc + + # Define the default directory/ies for the runtime + # initialization, resource and font files. Separate multiple directories with a :. + +-GS_LIB_DEFAULT=$(gsdatadir)/Resource/Init:$(gsdatadir)/lib:$(gsdatadir)/Resource/Font:$(gsdir)/fonts ++GS_LIB_DEFAULT=$(TRUEPREFIX)/share/ghostscript/$(GS_DOT_VERSION)/Resource/Init:$(TRUEPREFIX)/share/ghostscript/$(GS_DOT_VERSION)/lib:$(TRUEPREFIX)/share/ghostscript/$(GS_DOT_VERSION)/Resource/Font:$(TRUEPREFIX)/share/ghostscript/fonts + + # Define whether or not searching for initialization files should always + # look in the current directory first. This leads to well-known security +@@ -178,6 +179,9 @@ ICCSRCDIR=icclib + IJSSRCDIR=ijs + IJSEXECTYPE=unix + ++SHARED_IJS=0 ++IJS_NAME=ijs ++ + # Define how to build the library archives. (These are not used in any + # standard configuration.) + +@@ -186,6 +190,11 @@ IJSEXECTYPE=unix + + IMDISRCDIR=imdi + ++JPX_LIB=jasper ++JPXSRCDIR=jasper ++SHARE_JPX=0 ++JPX_CFLAGS=-DJAS_CONFIGURE ++ + AR=ar + ARFLAGS=qc + RANLIB=ranlib +@@ -194,7 +203,7 @@ RANLIB=ranlib + + # Define the name of the C compiler. + +-CC=gcc ++#CC=gcc + + # Define the name of the linker for the final link step. + # Normally this is the same as the C compiler. +@@ -342,8 +351,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. + +-DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev +- + #DEVICE_DEVS1= + #DEVICE_DEVS2= + #DEVICE_DEVS3= +@@ -365,33 +372,13 @@ DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha. + #DEVICE_DEVS19= + #DEVICE_DEVS20= + +-DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)stcolor.dev +-DEVICE_DEVS2=$(DD)epson.dev $(DD)eps9high.dev $(DD)eps9mid.dev $(DD)epsonc.dev $(DD)ibmpro.dev +-DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev +-DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev +-DEVICE_DEVS5=$(DD)uniprint.dev $(DD)ijs.dev +-DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev +-DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev +-DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev +-DEVICE_DEVS9=$(DD)pbm.dev $(DD)pbmraw.dev $(DD)pgm.dev $(DD)pgmraw.dev $(DD)pgnm.dev $(DD)pgnmraw.dev $(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev $(DD)ppmraw.dev $(DD)pkm.dev $(DD)pkmraw.dev $(DD)pksm.dev $(DD)pksmraw.dev +-DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev +-DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev $(DD)tiffgray.dev $(DD)tiff32nc.dev $(DD)tiffsep.dev +-DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev +-DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev $(DD)pngalpha.dev +-DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev $(DD)jpegcmyk.dev +-DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)ps2write.dev $(DD)epswrite.dev $(DD)txtwrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev +-DEVICE_DEVS16=$(DD)bbox.dev +- +-DEVICE_DEVS17= +-DEVICE_DEVS18= +-DEVICE_DEVS19= +-DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev +-DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)pamcmyk32.dev +- + # Shared library target to build. +-GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so ++#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so + #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so + ++# Copied from Makefile.in ++EXTRA_INIT_FILES= Fontmap cidfmap xlatmap FAPI FCOfontmap-PCLPS2 gs_cet.ps ++ + # ---------------------------- End of options --------------------------- # + + # Define the name of the partial makefile that specifies options -- +@@ -429,6 +416,7 @@ include $(GLSRCDIR)/jpeg.mak + include $(GLSRCDIR)/zlib.mak + include $(GLSRCDIR)/libpng.mak + include $(GLSRCDIR)/jbig2.mak ++include $(GLSRCDIR)/jasper.mak + include $(GLSRCDIR)/icclib.mak + include $(GLSRCDIR)/ijs.mak + include $(GLSRCDIR)/devs.mak +@@ -438,6 +426,8 @@ include $(GLSRCDIR)/unixlink.mak + include $(GLSRCDIR)/unix-dll.mak + include $(GLSRCDIR)/unix-end.mak + include $(GLSRCDIR)/unixinst.mak ++include contrib/contrib.mak ++include cups/cups.mak + + # This has to come last so it won't be taken as the default target. + $(AK): Index: patches/patch-base_unixinst_mak =================================================================== RCS file: patches/patch-base_unixinst_mak diff -N patches/patch-base_unixinst_mak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-base_unixinst_mak 12 Oct 2009 15:38:13 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- base/unixinst.mak.orig Tue Aug 14 22:48:29 2007 ++++ base/unixinst.mak Mon Oct 12 15:05:34 2009 +@@ -43,7 +43,7 @@ pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa printafm \ + ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr ps2ps ps2ps2 \ + wftopfa fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\ + do if ( test -f $(PSLIBDIR)/$$f ); then \ +- (cat $(PSLIBDIR)/$$f | sed -e "s/GS_EXECUTABLE=[^ \t]*/GS_EXECUTABLE=$(GS)/" > $(PSOBJDIR)/$$f); \ ++ (cat $(PSLIBDIR)/$$f | sed -e "s/GS_EXECUTABLE=[^\"][^ \t]*/GS_EXECUTABLE=$(GS)/" > $(PSOBJDIR)/$$f); \ + $(INSTALL_PROGRAM) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ + fi;\ + done' Index: patches/patch-contrib_lips4_gdevlprn_h =================================================================== RCS file: patches/patch-contrib_lips4_gdevlprn_h diff -N patches/patch-contrib_lips4_gdevlprn_h --- patches/patch-contrib_lips4_gdevlprn_h 28 Oct 2008 17:53:42 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-contrib_lips4_gdevlprn_h,v 1.1 2008/10/28 17:53:42 kili Exp $ ---- contrib/lips4/gdevlprn.h.orig Fri Jul 27 06:27:36 2007 -+++ contrib/lips4/gdevlprn.h Tue Oct 28 16:29:41 2008 -@@ -86,6 +86,7 @@ - 0/*false*/, -1, /* Duplex[_set] */\ - 0/*false*/, 0, 0, 0, /* file_is_new ... buf */\ - 0, 0, 0, 0, 0/*false*/, 0, 0, /* buffer_memory ... clist_dis'_mask */\ -+ 0, /* num_render_threads_requested */\ - { 0 }, /* ... orig_procs */\ - image_out,\ - 0/*false*/, /* initialized */\ -@@ -129,6 +130,7 @@ - 0/*false*/, 0, /* Duplex[_set] */\ - 0/*false*/, 0, 0, 0, /* file_is_new ... buf */\ - 0, 0, 0, 0, 0/*false*/, 0, 0, /* buffer_memory ... clist_dis'_mask */\ -+ 0, /* num_render_threads_requested */\ - { 0 }, /* ... orig_procs */\ - image_out,\ - 0/*false*/, /* initialized */\ Index: patches/patch-cups_cups_mak =================================================================== RCS file: patches/patch-cups_cups_mak diff -N patches/patch-cups_cups_mak --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cups_cups_mak 12 Oct 2009 15:38:13 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +No, I don't want gs to depend on cups again. If someone really needs +that pdftoraster thingy, please let me know and i'll find a workaround. + +--- cups/cups.mak.orig Sat Oct 18 00:58:21 2008 ++++ cups/cups.mak Mon Oct 12 14:28:36 2009 +@@ -53,14 +53,12 @@ $(PDFTORASTER_XE): $(pdftoraster_) + + install: install-cups + +-install-cups: cups ++install-cups: + -mkdir -p $(DESTDIR)$(CUPSSERVERBIN)/filter + $(INSTALL_PROGRAM) cups/pstoraster $(DESTDIR)$(CUPSSERVERBIN)/filter +- $(INSTALL_PROGRAM) $(PDFTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter + $(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter + -mkdir -p $(DESTDIR)$(CUPSSERVERROOT) + $(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSSERVERROOT) +- $(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSSERVERROOT) + -mkdir -p $(DESTDIR)$(CUPSDATA)/model + $(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model + $(INSTALL_DATA) cups/pxlmono.ppd $(DESTDIR)$(CUPSDATA)/model Index: patches/patch-cups_gdevcups_c =================================================================== RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-cups_gdevcups_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-cups_gdevcups_c --- patches/patch-cups_gdevcups_c 27 Apr 2009 08:26:23 -0000 1.2 +++ patches/patch-cups_gdevcups_c 12 Oct 2009 15:38:13 -0000 @@ -33,10 +33,10 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.2 20 } gx_device_cups; private gx_device_procs cups_procs = -@@ -352,7 +361,14 @@ gx_device_cups gs_cups_device = - 0, /* cupsRowCount */ - 0, /* cupsRowFeed */ - 0 /* cupsRowStep */ +@@ -367,7 +376,14 @@ gx_device_cups gs_cups_device = + "", /* cupsRenderingIntent */ + "Letter" /* cupsPageSizeName */ + #endif /* CUPS_RASTER_SYNCv1 */ - } + }, + 0, /* landscape */ @@ -49,7 +49,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.2 20 }; /* -@@ -426,7 +442,7 @@ cups_close(gx_device *pdev) /* I - Device info */ +@@ -441,7 +457,7 @@ cups_close(gx_device *pdev) /* I - Device info */ if (cups->stream != NULL) { @@ -58,7 +58,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.2 20 cups->stream = NULL; } -@@ -2496,6 +2512,35 @@ cups_open(gx_device *pdev) /* I - Device info */ +@@ -2521,6 +2537,35 @@ cups_open(gx_device *pdev) /* I - Device info */ dprintf1("DEBUG2: cups_open(%p)\n", pdev); @@ -94,7 +94,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.2 20 cups->printer_procs.get_space_params = cups_get_space_params; if (cups->page == 0) -@@ -2510,7 +2555,7 @@ cups_open(gx_device *pdev) /* I - Device info */ +@@ -2535,7 +2580,7 @@ cups_open(gx_device *pdev) /* I - Device info */ return (code); if (cupsPPD == NULL) @@ -103,7 +103,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.2 20 return (0); } -@@ -2597,7 +2642,7 @@ cups_print_pages(gx_device_printer *pdev, +@@ -2622,7 +2667,7 @@ cups_print_pages(gx_device_printer *pdev, if (cups->stream == NULL) { @@ -112,7 +112,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.2 20 CUPS_RASTER_WRITE)) == NULL) { perror("ERROR: Unable to open raster stream - "); -@@ -3669,7 +3714,7 @@ cups_print_chunked(gx_device_printer *pdev, +@@ -3714,7 +3759,7 @@ cups_print_chunked(gx_device_printer *pdev, * Write the bitmap data to the raster stream... */ @@ -121,7 +121,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.2 20 } else { -@@ -3677,7 +3722,7 @@ cups_print_chunked(gx_device_printer *pdev, +@@ -3722,7 +3767,7 @@ cups_print_chunked(gx_device_printer *pdev, * Write the scanline data to the raster stream... */ @@ -130,7 +130,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.2 20 } } } -@@ -4345,7 +4390,7 @@ cups_print_banded(gx_device_printer *pdev, +@@ -4390,7 +4435,7 @@ cups_print_banded(gx_device_printer *pdev, * Write the bitmap data to the raster stream... */ @@ -139,7 +139,7 @@ $OpenBSD: patch-cups_gdevcups_c,v 1.2 20 } } -@@ -4716,7 +4761,7 @@ cups_print_planar(gx_device_printer *pdev, +@@ -4761,7 +4806,7 @@ cups_print_planar(gx_device_printer *pdev, * Write the bitmap data to the raster stream... */ Index: patches/patch-src_devs_mak =================================================================== RCS file: patches/patch-src_devs_mak diff -N patches/patch-src_devs_mak --- patches/patch-src_devs_mak 1 Apr 2008 20:37:01 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_devs_mak,v 1.2 2008/04/01 20:37:01 kili Exp $ ---- src/devs.mak.orig Thu Jan 17 14:37:19 2008 -+++ src/devs.mak Sat Mar 22 22:28:22 2008 -@@ -653,14 +653,13 @@ $(GLOBJ)gdevlj56.$(OBJ) : $(GLSRC)gdevlj56.c $(PDEVH) - - ### -------------------- The ijs client ----------------- ### - --ijs_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \ -- $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ) -+ijs_=$(GLOBJ)gdevijs.$(OBJ) - --$(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev -+$(DD)ijs.dev : $(ijs_) $(GLD)page.dev - $(SETPDEV) $(DD)ijs $(ijs_) -+ $(ADDMOD) $(DD)ijs -lib ijs - --$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\ -- $(ijs_h) $(ijs_client_h) -+$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h) - $(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(GLF_) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c - - # Please see ijs.mak for the Makefile fragment which builds the IJS Index: patches/patch-src_gdevcdj_c =================================================================== RCS file: patches/patch-src_gdevcdj_c diff -N patches/patch-src_gdevcdj_c --- patches/patch-src_gdevcdj_c 16 Jun 2009 21:03:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,33 +0,0 @@ -$OpenBSD: patch-src_gdevcdj_c,v 1.1 2009/06/16 21:03:59 sthen Exp $ - -fix ghostscript bug 690032, failure printing PDFs with bjc600/800. - ---- src/gdevcdj.c.orig Tue Jun 16 12:10:45 2009 -+++ src/gdevcdj.c Tue Jun 16 12:10:51 2009 -@@ -1107,6 +1107,7 @@ bjc_put_params(gx_device *pdev, gs_param_list *plist) - gs_param_string pprocesscolors; - gs_param_string pmedia; - gs_param_string pquality; -+ gs_param_string dithering; - - gs_param_float_array hwra; - -@@ -1143,6 +1144,9 @@ bjc_put_params(gx_device *pdev, gs_param_list *plist) - (bjc->ptype == BJC800 ? bjc800_printQualityStrings : - bjc600_printQualityStrings), ¶ms->printQuality, code); - -+ code = put_param_string(plist, (unsigned char *)BJC_OPTION_DITHERINGTYPE, &dithering, -+ bjc_ditheringTypeStrings, ¶ms->ditheringType, code); -+ - switch (ncode = param_read_int(plist, - oname = BJC_OPTION_MEDIAWEIGHT, ¶ms->mediaWeight)) { - case 0: -@@ -3576,7 +3580,7 @@ cdj_param_check_float(gs_param_list *plist, gs_param_n - switch ( code = param_read_float(plist, pname, &new_value) ) - { - case 0: -- if ( is_defined && new_value == fval) -+ if ( is_defined && new_value == (float)fval) - break; - code = gs_note_error(gs_error_rangecheck); - goto e; Index: patches/patch-src_gdevpdtb_c =================================================================== RCS file: patches/patch-src_gdevpdtb_c diff -N patches/patch-src_gdevpdtb_c --- patches/patch-src_gdevpdtb_c 6 Apr 2009 17:06:33 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_gdevpdtb_c,v 1.1 2009/04/06 17:06:33 jasper Exp $ - -Security fix for SA34534, which could trigger a buffer overflow. -Patch taken from: http://bugs.ghostscript.com/show_bug.cgi?id=690211 - ---- src/gdevpdtb.c.orig Mon Apr 6 12:39:38 2009 -+++ src/gdevpdtb.c Mon Apr 6 12:40:06 2009 -@@ -133,7 +133,7 @@ pdf_base_font_alloc(gx_device_pdf *pdev, pdf_base_font - &st_pdf_base_font, "pdf_base_font_alloc"); - const gs_font_name *pfname = &font->font_name; - gs_const_string font_name; -- char fnbuf[3 + sizeof(long) / 3 + 1]; /* .F#######\0 */ -+ char fnbuf[2*sizeof(long) + 3]; /* .F########\0 */ - int code; - - if (pbfont == 0) Index: patches/patch-src_gximage1_c =================================================================== RCS file: patches/patch-src_gximage1_c diff -N patches/patch-src_gximage1_c --- patches/patch-src_gximage1_c 28 Oct 2008 17:53:42 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_gximage1_c,v 1.1 2008/10/28 17:53:42 kili Exp $ ---- src/gximage1.c.orig Tue Jun 24 16:16:29 2008 -+++ src/gximage1.c Tue Oct 28 16:30:59 2008 -@@ -18,6 +18,7 @@ - #include "gxiparam.h" - #include "gximage.h" - #include "stream.h" -+#include <string.h> - - /* Structure descriptor */ - public_st_gs_image1(); Index: patches/patch-src_ijs_mak =================================================================== RCS file: patches/patch-src_ijs_mak diff -N patches/patch-src_ijs_mak --- patches/patch-src_ijs_mak 19 Nov 2007 20:06:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,33 +0,0 @@ -$OpenBSD: patch-src_ijs_mak,v 1.1 2007/11/19 20:06:56 kili Exp $ ---- src/ijs.mak.orig Wed Jun 6 00:23:38 2007 -+++ src/ijs.mak Fri Sep 14 21:11:40 2007 -@@ -18,6 +18,8 @@ - # in spawning the server. currently - # 'unix' and 'win' are supported. - # BINDIR - where to put the executible examples -+# SHARE_IJS - 0 to compile the library, 1 to share -+# IJS_NAME - if SHARE_IJS = 1, the name of the shared library - - # This partial makefile compiles the IJS client library for use in - # Ghostscript. -@@ -51,9 +53,19 @@ ijs.config-clean : - - IJSDEP=$(AK) - -+# Define the version of ijslib.dev that we are actually using. -+$(IJSGEN)ijslib.dev : $(TOP_MAKEFILES) $(IJSGEN)ijslib_$(SHARE_IJS).dev -+ $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev -+ -+# Define the shared version of libpng. -+# Note that it requires libz, which must be searched *after* libpng. -+$(IJSGEN)ijslib_1.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(ECHOGS_XE) -+ $(SETMOD) $(IJSGEN)ijslib_1 -lib $(IJS_NAME) -+ -+# Define the non-shared version of ijslib. - ijslib_=$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_server.$(OBJ) \ - $(IJSOBJ)ijs_client.$(OBJ) $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ) --$(IJSGEN)ijslib.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_) -+$(IJSGEN)ijslib_0.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_) - $(SETMOD) $(IJSGEN)ijslib $(ijslib_) - - ijs_h=$(IJSSRC)ijs.h Index: patches/patch-src_jasper_mak =================================================================== RCS file: patches/patch-src_jasper_mak diff -N patches/patch-src_jasper_mak --- patches/patch-src_jasper_mak 9 May 2008 19:29:44 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_jasper_mak,v 1.4 2008/05/09 19:29:44 kili Exp $ ---- src/jasper.mak.orig Thu Oct 18 02:36:37 2007 -+++ src/jasper.mak Sat Apr 26 14:03:43 2008 -@@ -159,7 +159,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-src_lib_mak =================================================================== RCS file: patches/patch-src_lib_mak diff -N patches/patch-src_lib_mak --- patches/patch-src_lib_mak 19 Nov 2007 20:06:56 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-src_lib_mak,v 1.2 2007/11/19 20:06:56 kili Exp $ ---- src/lib.mak.orig Tue Jul 17 11:55:56 2007 -+++ src/lib.mak Mon Sep 3 15:27:31 2007 -@@ -25,12 +25,12 @@ GLO_=$(O_)$(GLOBJ) - GLI_=$(GLGENDIR) $(II)$(GLSRCDIR) - GLF_= - GLCCFLAGS=$(I_)$(GLI_)$(_I) $(GLF_) --GLCC=$(CC_) $(GLCCFLAGS) -+GLCC=$(CC) $(GLCCFLAGS) $(CCFLAGS) - GLICCCC=$(CC_) $(I_)$(GLI_) $(II)$(ICCI_)$(_I) $(ICCCF_) $(GLF_) - GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_) - GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_) - GLJBIG2CC=$(CC_) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_) --GLJASCC=$(CC_) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) -+GLJASCC=$(CC) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) ${CCFLAGS} - GLLDFJB2CC=$(CC_) $(I_)$(LDF_JB2I_) $(II)$(GLI_)$(_I) $(JB2CF_) $(GLF_) - GLLWFJPXCC=$(CC_) $(I_)$(LWF_JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) - GLCCSHARED=$(CC_SHARED) $(GLCCFLAGS) Index: patches/patch-src_unix-aux_mak =================================================================== RCS file: patches/patch-src_unix-aux_mak diff -N patches/patch-src_unix-aux_mak --- patches/patch-src_unix-aux_mak 19 Nov 2007 20:06:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_unix-aux_mak,v 1.1 2007/11/19 20:06:56 kili Exp $ ---- src/unix-aux.mak.orig Fri Jun 29 00:08:46 2007 -+++ src/unix-aux.mak Mon Sep 3 15:27:31 2007 -@@ -77,7 +77,7 @@ $(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) - $(GENINIT_XE): $(GLSRC)geninit.c $(AK) $(GENINIT_DEPS) - $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENINIT_XE) $(GLSRC)geninit.c - --MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ -+MKROMFS_OBJS=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ - $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \ - $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \ - $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ) Index: patches/patch-src_unix-dll_mak =================================================================== RCS file: patches/patch-src_unix-dll_mak diff -N patches/patch-src_unix-dll_mak --- patches/patch-src_unix-dll_mak 19 Jan 2009 12:46:23 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,67 +0,0 @@ -$OpenBSD: patch-src_unix-dll_mak,v 1.7 2009/01/19 12:46:23 kili Exp $ ---- src/unix-dll.mak.orig Tue Nov 27 23:58:40 2007 -+++ src/unix-dll.mak Sun Jan 18 13:00:33 2009 -@@ -39,7 +39,9 @@ GSSOC=$(BINDIR)/$(SOBINRELDIR)/$(GSSOC_XENAME) - # loader suporting display device using Gtk+ - GSSOX_XENAME=$(GS)x$(XE) - GSSOX_XE=$(BINDIR)/$(GSSOX_XENAME) --GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME) -+GSSOX-Yes=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME) -+GSSOX-No= -+GSSOX=$(GSSOX-$(USE_GTK)) - - # shared library - GS_SONAME_BASE=lib$(GS) -@@ -47,9 +49,9 @@ GS_SONAME_BASE=lib$(GS) - # GNU/Linux - GS_SOEXT=so - GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) --GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) --GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) --LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR) -+GS_SONAME_MAJOR=$(GS_SONAME).$(basename $(LIBgs_VERSION)) -+GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(LIBgs_VERSION) -+LDFLAGS_SO=-shared - - # MacOS X - #GS_SOEXT=dylib -@@ -78,11 +80,12 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) - - # Build the small Ghostscript loaders, with Gtk+ and without - --$(GSSOC_XE): $(GS_SO) $(GLSRC)$(SOC_LOADER) -- $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) -+$(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c -+ $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) \ -+ $(SOC_LIBS) - --$(GSSOX_XE): $(GS_SO) $(GLSRC)$(SOC_LOADER) -- $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(GLSRC)$(SOC_LOADER) \ -+$(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c -+ $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(GLSRC)dxmain.c \ - -L$(BINDIR) -l$(GS) $(SOC_LIBS) - - # ------------------------- Recursive make targets ------------------------- # -@@ -100,7 +103,7 @@ SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\ - - # Normal shared object - so: SODIRS -- $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX) -+ $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX) - - # Debug shared object - # Note that this is in the same directory as the normal shared -@@ -117,12 +120,9 @@ install-so: so - -mkdir -p $(DESTDIR)$(libdir) - -mkdir -p $(DESTDIR)$(gsincludedir) - $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) -+ [ "$(USE_GTK)" = No ] || \ - $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME) - $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR) -- $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME) -- ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME) -- $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) -- 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) $(PSSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)/gdevdsp.h Index: patches/patch-src_unix-gcc_mak =================================================================== RCS file: patches/patch-src_unix-gcc_mak diff -N patches/patch-src_unix-gcc_mak --- patches/patch-src_unix-gcc_mak 6 Apr 2008 15:48:13 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,121 +0,0 @@ -$OpenBSD: patch-src_unix-gcc_mak,v 1.7 2008/04/06 15:48:13 kili Exp $ ---- src/unix-gcc.mak.orig Fri Feb 29 09:13:08 2008 -+++ src/unix-gcc.mak Fri Apr 4 19:44:50 2008 -@@ -30,6 +30,7 @@ PSLIBDIR=./lib - PSRESDIR=./Resource - PSGENDIR=./obj - PSOBJDIR=./obj -+CONTRIBDIR=./contrib - - # Do not edit the next group of lines. - -@@ -68,12 +69,12 @@ gsincludedir = $(includedir)/ghostscript/ - - docdir=$(gsdatadir)/doc - exdir=$(gsdatadir)/examples --GS_DOCDIR=$(docdir) -+GS_DOCDIR=$(TRUEPREFIX)/share/ghostscript/$(GS_DOT_VERSION)/doc - - # Define the default directory/ies for the runtime - # initialization, resource and font files. Separate multiple directories with a :. - --GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdatadir)/Resource:$(gsdir)/fonts -+GS_LIB_DEFAULT=$(TRUEPREFIX)/share/ghostscript/$(GS_DOT_VERSION)/lib:$(TRUEPREFIX)/share/ghostscript/$(GS_DOT_VERSION)/Resource:$(TRUEPREFIX)/share/ghostscript/fonts - - # Define whether or not searching for initialization files should always - # look in the current directory first. This leads to well-known security -@@ -188,6 +189,9 @@ ICCSRCDIR=icclib - IJSSRCDIR=ijs - IJSEXECTYPE=unix - -+SHARED_IJS=0 -+IJS_NAME=ijs -+ - # Define how to build the library archives. (These are not used in any - # standard configuration.) - -@@ -196,6 +200,11 @@ IJSEXECTYPE=unix - - IMDISRCDIR=imdi - -+JPX_LIB=jasper -+JPXSRCDIR=jasper -+SHARE_JPX=0 -+JPX_CFLAGS=-DJAS_CONFIGURE -+ - AR=ar - ARFLAGS=qc - RANLIB=ranlib -@@ -204,7 +213,7 @@ RANLIB=ranlib - - # Define the name of the C compiler. - --CC=gcc -+#CC=gcc - - # Define the name of the linker for the final link step. - # Normally this is the same as the C compiler. -@@ -352,8 +361,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. - --DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev -- - #DEVICE_DEVS1= - #DEVICE_DEVS2= - #DEVICE_DEVS3= -@@ -375,33 +382,13 @@ DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha. - #DEVICE_DEVS19= - #DEVICE_DEVS20= - --DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)stcolor.dev --DEVICE_DEVS2=$(DD)epson.dev $(DD)eps9high.dev $(DD)eps9mid.dev $(DD)epsonc.dev $(DD)ibmpro.dev --DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev --DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev --DEVICE_DEVS5=$(DD)uniprint.dev $(DD)ijs.dev --DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev --DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev --DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev --DEVICE_DEVS9=$(DD)pbm.dev $(DD)pbmraw.dev $(DD)pgm.dev $(DD)pgmraw.dev $(DD)pgnm.dev $(DD)pgnmraw.dev $(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev $(DD)ppmraw.dev $(DD)pkm.dev $(DD)pkmraw.dev $(DD)pksm.dev $(DD)pksmraw.dev --DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev --DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev $(DD)tiffgray.dev $(DD)tiff32nc.dev $(DD)tiffsep.dev --DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev --DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev $(DD)pngalpha.dev --DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev $(DD)jpegcmyk.dev --DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)ps2write.dev $(DD)epswrite.dev $(DD)txtwrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev --DEVICE_DEVS16=$(DD)bbox.dev -- --DEVICE_DEVS17= --DEVICE_DEVS18= --DEVICE_DEVS19= --DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev --DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)pamcmyk32.dev -- - # Shared library target to build. --GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so -+#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so - #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so - -+# Copied from Makefile.in -+EXTRA_INIT_FILES= Fontmap cidfmap xlatmap FAPI FCOfontmap-PCLPS2 gs_cet.ps -+ - # ---------------------------- End of options --------------------------- # - - # Define the name of the partial makefile that specifies options -- -@@ -440,6 +427,7 @@ include $(GLSRCDIR)/jpeg.mak - include $(GLSRCDIR)/zlib.mak - include $(GLSRCDIR)/libpng.mak - include $(GLSRCDIR)/jbig2.mak -+include $(GLSRCDIR)/jasper.mak - include $(GLSRCDIR)/icclib.mak - include $(GLSRCDIR)/ijs.mak - include $(GLSRCDIR)/devs.mak -@@ -449,6 +437,8 @@ include $(GLSRCDIR)/unixlink.mak - include $(GLSRCDIR)/unix-dll.mak - include $(GLSRCDIR)/unix-end.mak - include $(GLSRCDIR)/unixinst.mak -+include contrib/contrib.mak -+include cups/cups.mak - - # This has to come last so it won't be taken as the default target. - $(AK): Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/print/ghostscript/gnu/pkg/PLIST,v retrieving revision 1.17 diff -u -p -r1.17 PLIST --- pkg/PLIST 19 Jan 2009 12:46:23 -0000 1.17 +++ pkg/PLIST 12 Oct 2009 15:38:13 -0000 @@ -379,6 +379,75 @@ share/ghostscript/${VERSION}/Resource/Fo share/ghostscript/${VERSION}/Resource/Font/URWPalladioL-BoldItal share/ghostscript/${VERSION}/Resource/Font/URWPalladioL-Ital share/ghostscript/${VERSION}/Resource/Font/URWPalladioL-Roma +share/ghostscript/${VERSION}/Resource/Init/ +share/ghostscript/${VERSION}/Resource/Init/FCOfontmap-PCLPS2 +share/ghostscript/${VERSION}/Resource/Init/Fontmap +share/ghostscript/${VERSION}/Resource/Init/Fontmap.GS +share/ghostscript/${VERSION}/Resource/Init/cidfmap +share/ghostscript/${VERSION}/Resource/Init/gs_agl.ps +share/ghostscript/${VERSION}/Resource/Init/gs_btokn.ps +share/ghostscript/${VERSION}/Resource/Init/gs_cet.ps +share/ghostscript/${VERSION}/Resource/Init/gs_cff.ps +share/ghostscript/${VERSION}/Resource/Init/gs_cidcm.ps +share/ghostscript/${VERSION}/Resource/Init/gs_ciddc.ps +share/ghostscript/${VERSION}/Resource/Init/gs_cidfm.ps +share/ghostscript/${VERSION}/Resource/Init/gs_cidfn.ps +share/ghostscript/${VERSION}/Resource/Init/gs_cidtt.ps +share/ghostscript/${VERSION}/Resource/Init/gs_cmap.ps +share/ghostscript/${VERSION}/Resource/Init/gs_cspace.ps +share/ghostscript/${VERSION}/Resource/Init/gs_css_e.ps +share/ghostscript/${VERSION}/Resource/Init/gs_dbt_e.ps +share/ghostscript/${VERSION}/Resource/Init/gs_diskf.ps +share/ghostscript/${VERSION}/Resource/Init/gs_diskn.ps +share/ghostscript/${VERSION}/Resource/Init/gs_dpnxt.ps +share/ghostscript/${VERSION}/Resource/Init/gs_dps.ps +share/ghostscript/${VERSION}/Resource/Init/gs_dps1.ps +share/ghostscript/${VERSION}/Resource/Init/gs_dps2.ps +share/ghostscript/${VERSION}/Resource/Init/gs_dscp.ps +share/ghostscript/${VERSION}/Resource/Init/gs_epsf.ps +share/ghostscript/${VERSION}/Resource/Init/gs_fapi.ps +share/ghostscript/${VERSION}/Resource/Init/gs_fntem.ps +share/ghostscript/${VERSION}/Resource/Init/gs_fonts.ps +share/ghostscript/${VERSION}/Resource/Init/gs_frsd.ps +share/ghostscript/${VERSION}/Resource/Init/gs_icc.ps +share/ghostscript/${VERSION}/Resource/Init/gs_il1_e.ps +share/ghostscript/${VERSION}/Resource/Init/gs_img.ps +share/ghostscript/${VERSION}/Resource/Init/gs_init.ps +share/ghostscript/${VERSION}/Resource/Init/gs_l2img.ps +share/ghostscript/${VERSION}/Resource/Init/gs_lev2.ps +share/ghostscript/${VERSION}/Resource/Init/gs_ll3.ps +share/ghostscript/${VERSION}/Resource/Init/gs_mex_e.ps +share/ghostscript/${VERSION}/Resource/Init/gs_mgl_e.ps +share/ghostscript/${VERSION}/Resource/Init/gs_mro_e.ps +share/ghostscript/${VERSION}/Resource/Init/gs_pdf_e.ps +share/ghostscript/${VERSION}/Resource/Init/gs_pdfwr.ps +share/ghostscript/${VERSION}/Resource/Init/gs_res.ps +share/ghostscript/${VERSION}/Resource/Init/gs_resmp.ps +share/ghostscript/${VERSION}/Resource/Init/gs_setpd.ps +share/ghostscript/${VERSION}/Resource/Init/gs_statd.ps +share/ghostscript/${VERSION}/Resource/Init/gs_std_e.ps +share/ghostscript/${VERSION}/Resource/Init/gs_sym_e.ps +share/ghostscript/${VERSION}/Resource/Init/gs_trap.ps +share/ghostscript/${VERSION}/Resource/Init/gs_ttf.ps +share/ghostscript/${VERSION}/Resource/Init/gs_typ32.ps +share/ghostscript/${VERSION}/Resource/Init/gs_typ42.ps +share/ghostscript/${VERSION}/Resource/Init/gs_type1.ps +share/ghostscript/${VERSION}/Resource/Init/gs_wan_e.ps +share/ghostscript/${VERSION}/Resource/Init/opdfread.ps +share/ghostscript/${VERSION}/Resource/Init/pdf_base.ps +share/ghostscript/${VERSION}/Resource/Init/pdf_cslayer.ps +share/ghostscript/${VERSION}/Resource/Init/pdf_draw.ps +share/ghostscript/${VERSION}/Resource/Init/pdf_font.ps +share/ghostscript/${VERSION}/Resource/Init/pdf_main.ps +share/ghostscript/${VERSION}/Resource/Init/pdf_ops.ps +share/ghostscript/${VERSION}/Resource/Init/pdf_rbld.ps +share/ghostscript/${VERSION}/Resource/Init/pdf_sec.ps +share/ghostscript/${VERSION}/Resource/Init/xlatmap +share/ghostscript/${VERSION}/Resource/SubstCID/ +share/ghostscript/${VERSION}/Resource/SubstCID/CNS1-WMode +share/ghostscript/${VERSION}/Resource/SubstCID/GB1-WMode +share/ghostscript/${VERSION}/Resource/SubstCID/Japan1-WMode +share/ghostscript/${VERSION}/Resource/SubstCID/Korea1-WMode share/ghostscript/${VERSION}/doc/ share/ghostscript/${VERSION}/doc/API.htm share/ghostscript/${VERSION}/doc/C-style.htm @@ -402,8 +471,6 @@ share/ghostscript/${VERSION}/doc/History share/ghostscript/${VERSION}/doc/History6.htm share/ghostscript/${VERSION}/doc/History7.htm share/ghostscript/${VERSION}/doc/History8.htm -share/ghostscript/${VERSION}/doc/Htmstyle.htm -share/ghostscript/${VERSION}/doc/Humor.htm share/ghostscript/${VERSION}/doc/Install.htm share/ghostscript/${VERSION}/doc/Issues.htm share/ghostscript/${VERSION}/doc/Language.htm @@ -442,9 +509,6 @@ share/ghostscript/${VERSION}/examples/ti share/ghostscript/${VERSION}/examples/vasarely.ps share/ghostscript/${VERSION}/examples/waterfal.ps share/ghostscript/${VERSION}/lib/ -share/ghostscript/${VERSION}/lib/FCOfontmap-PCLPS2 -share/ghostscript/${VERSION}/lib/Fontmap -share/ghostscript/${VERSION}/lib/Fontmap.GS share/ghostscript/${VERSION}/lib/PDFA_def.ps share/ghostscript/${VERSION}/lib/PDFX_def.ps share/ghostscript/${VERSION}/lib/acctest.ps @@ -481,7 +545,6 @@ share/ghostscript/${VERSION}/lib/cdj550. share/ghostscript/${VERSION}/lib/cdj690.upp share/ghostscript/${VERSION}/lib/cdj690ec.upp share/ghostscript/${VERSION}/lib/cid2code.ps -share/ghostscript/${VERSION}/lib/cidfmap share/ghostscript/${VERSION}/lib/decrypt.ps share/ghostscript/${VERSION}/lib/dnj750c.upp share/ghostscript/${VERSION}/lib/dnj750m.upp @@ -490,87 +553,28 @@ share/ghostscript/${VERSION}/lib/dumphin share/ghostscript/${VERSION}/lib/font2c.ps share/ghostscript/${VERSION}/lib/font2pcl.ps share/ghostscript/${VERSION}/lib/ghostpdf.ppd -share/ghostscript/${VERSION}/lib/gs_agl.ps -share/ghostscript/${VERSION}/lib/gs_btokn.ps -share/ghostscript/${VERSION}/lib/gs_ccfnt.ps share/ghostscript/${VERSION}/lib/gs_ce_e.ps -share/ghostscript/${VERSION}/lib/gs_cet.ps -share/ghostscript/${VERSION}/lib/gs_cff.ps -share/ghostscript/${VERSION}/lib/gs_cidcm.ps -share/ghostscript/${VERSION}/lib/gs_ciddc.ps -share/ghostscript/${VERSION}/lib/gs_cidfm.ps -share/ghostscript/${VERSION}/lib/gs_cidfn.ps -share/ghostscript/${VERSION}/lib/gs_cidtt.ps -share/ghostscript/${VERSION}/lib/gs_ciecs2.ps -share/ghostscript/${VERSION}/lib/gs_ciecs3.ps -share/ghostscript/${VERSION}/lib/gs_cmap.ps share/ghostscript/${VERSION}/lib/gs_cmdl.ps -share/ghostscript/${VERSION}/lib/gs_cspace.ps -share/ghostscript/${VERSION}/lib/gs_css_e.ps -share/ghostscript/${VERSION}/lib/gs_dbt_e.ps -share/ghostscript/${VERSION}/lib/gs_devcs.ps -share/ghostscript/${VERSION}/lib/gs_devn.ps -share/ghostscript/${VERSION}/lib/gs_devpxl.ps -share/ghostscript/${VERSION}/lib/gs_diskf.ps -share/ghostscript/${VERSION}/lib/gs_diskn.ps -share/ghostscript/${VERSION}/lib/gs_dpnxt.ps -share/ghostscript/${VERSION}/lib/gs_dps.ps -share/ghostscript/${VERSION}/lib/gs_dps1.ps -share/ghostscript/${VERSION}/lib/gs_dps2.ps -share/ghostscript/${VERSION}/lib/gs_dscp.ps -share/ghostscript/${VERSION}/lib/gs_epsf.ps -share/ghostscript/${VERSION}/lib/gs_fapi.ps share/ghostscript/${VERSION}/lib/gs_fform.ps -share/ghostscript/${VERSION}/lib/gs_fntem.ps -share/ghostscript/${VERSION}/lib/gs_fonts.ps -share/ghostscript/${VERSION}/lib/gs_frsd.ps -share/ghostscript/${VERSION}/lib/gs_icc.ps -share/ghostscript/${VERSION}/lib/gs_il1_e.ps share/ghostscript/${VERSION}/lib/gs_il2_e.ps -share/ghostscript/${VERSION}/lib/gs_img.ps -share/ghostscript/${VERSION}/lib/gs_indxd.ps -share/ghostscript/${VERSION}/lib/gs_init.ps share/ghostscript/${VERSION}/lib/gs_kanji.ps share/ghostscript/${VERSION}/lib/gs_ksb_e.ps share/ghostscript/${VERSION}/lib/gs_l.xbm share/ghostscript/${VERSION}/lib/gs_l.xpm -share/ghostscript/${VERSION}/lib/gs_l2img.ps share/ghostscript/${VERSION}/lib/gs_l_m.xbm -share/ghostscript/${VERSION}/lib/gs_lev2.ps share/ghostscript/${VERSION}/lib/gs_lgo_e.ps share/ghostscript/${VERSION}/lib/gs_lgx_e.ps -share/ghostscript/${VERSION}/lib/gs_ll3.ps share/ghostscript/${VERSION}/lib/gs_m.xbm share/ghostscript/${VERSION}/lib/gs_m.xpm share/ghostscript/${VERSION}/lib/gs_m_m.xbm -share/ghostscript/${VERSION}/lib/gs_mex_e.ps -share/ghostscript/${VERSION}/lib/gs_mgl_e.ps -share/ghostscript/${VERSION}/lib/gs_mro_e.ps -share/ghostscript/${VERSION}/lib/gs_patrn.ps -share/ghostscript/${VERSION}/lib/gs_pdf_e.ps -share/ghostscript/${VERSION}/lib/gs_pdfwr.ps share/ghostscript/${VERSION}/lib/gs_pfile.ps share/ghostscript/${VERSION}/lib/gs_rdlin.ps -share/ghostscript/${VERSION}/lib/gs_res.ps -share/ghostscript/${VERSION}/lib/gs_resmp.ps -share/ghostscript/${VERSION}/lib/gs_resst.ps share/ghostscript/${VERSION}/lib/gs_s.xbm share/ghostscript/${VERSION}/lib/gs_s.xpm share/ghostscript/${VERSION}/lib/gs_s_m.xbm -share/ghostscript/${VERSION}/lib/gs_sepr.ps -share/ghostscript/${VERSION}/lib/gs_setpd.ps -share/ghostscript/${VERSION}/lib/gs_statd.ps -share/ghostscript/${VERSION}/lib/gs_std_e.ps -share/ghostscript/${VERSION}/lib/gs_sym_e.ps share/ghostscript/${VERSION}/lib/gs_t.xbm share/ghostscript/${VERSION}/lib/gs_t.xpm share/ghostscript/${VERSION}/lib/gs_t_m.xbm -share/ghostscript/${VERSION}/lib/gs_trap.ps -share/ghostscript/${VERSION}/lib/gs_ttf.ps -share/ghostscript/${VERSION}/lib/gs_typ32.ps -share/ghostscript/${VERSION}/lib/gs_typ42.ps -share/ghostscript/${VERSION}/lib/gs_type1.ps -share/ghostscript/${VERSION}/lib/gs_wan_e.ps share/ghostscript/${VERSION}/lib/gs_wl1_e.ps share/ghostscript/${VERSION}/lib/gs_wl2_e.ps share/ghostscript/${VERSION}/lib/gs_wl5_e.ps @@ -588,18 +592,9 @@ share/ghostscript/${VERSION}/lib/markpat share/ghostscript/${VERSION}/lib/mkcidfm.ps share/ghostscript/${VERSION}/lib/necp2x.upp share/ghostscript/${VERSION}/lib/necp2x6.upp -share/ghostscript/${VERSION}/lib/opdfread.ps share/ghostscript/${VERSION}/lib/packfile.ps share/ghostscript/${VERSION}/lib/pcharstr.ps share/ghostscript/${VERSION}/lib/pdf2dsc.ps -share/ghostscript/${VERSION}/lib/pdf_base.ps -share/ghostscript/${VERSION}/lib/pdf_cslayer.ps -share/ghostscript/${VERSION}/lib/pdf_draw.ps -share/ghostscript/${VERSION}/lib/pdf_font.ps -share/ghostscript/${VERSION}/lib/pdf_main.ps -share/ghostscript/${VERSION}/lib/pdf_ops.ps -share/ghostscript/${VERSION}/lib/pdf_rbld.ps -share/ghostscript/${VERSION}/lib/pdf_sec.ps share/ghostscript/${VERSION}/lib/pdfopt.ps share/ghostscript/${VERSION}/lib/pdfwrite.ps share/ghostscript/${VERSION}/lib/pf2afm.ps @@ -669,5 +664,4 @@ share/ghostscript/${VERSION}/lib/viewps2 share/ghostscript/${VERSION}/lib/wftopfa.ps share/ghostscript/${VERSION}/lib/winmaps.ps share/ghostscript/${VERSION}/lib/wrfont.ps -share/ghostscript/${VERSION}/lib/xlatmap share/ghostscript/${VERSION}/lib/zeroline.ps