Date: Sun, 23 Nov 2014 08:25:49 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373126 - in head/print/ghostscript9-agpl: . files Message-ID: <201411230825.sAN8PnoF021856@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun Nov 23 08:25:48 2014 New Revision: 373126 URL: https://svnweb.freebsd.org/changeset/ports/373126 QAT: https://qat.redports.org/buildarchive/r373126/ Log: Update to 9.15. Changes include: - pswrite has been removed in faver of ps2write. - epswrite has been removed in favor of eps2write. Added: head/print/ghostscript9-agpl/files/patch-Makefile.in - copied, changed from r373035, head/print/ghostscript9-agpl/files/patch-base-Makefile.in head/print/ghostscript9-agpl/files/patch-configure.ac - copied, changed from r365933, head/print/ghostscript9-agpl/files/patch-base-configure.ac head/print/ghostscript9-agpl/files/patch-devices-devs.mak - copied, changed from r365933, head/print/ghostscript9-agpl/files/patch-base-devs.mak head/print/ghostscript9-agpl/files/patch-devices-gdevl256.c - copied, changed from r365933, head/print/ghostscript9-agpl/files/patch-base-gdevl256.c head/print/ghostscript9-agpl/files/patch-devices-gdevperm.c - copied, changed from r365933, head/print/ghostscript9-agpl/files/patch-base-gdevperm.c head/print/ghostscript9-agpl/files/patch-devices-gdevplib.c - copied, changed from r365933, head/print/ghostscript9-agpl/files/patch-base-gdevplib.c head/print/ghostscript9-agpl/files/patch-devices-gdevvglb.c - copied, changed from r365933, head/print/ghostscript9-agpl/files/patch-base-gdevvglb.c head/print/ghostscript9-agpl/files/patch-openjpeg-src-lib-openjp2-opj_includes.h - copied, changed from r373035, head/print/ghostscript9-agpl/files/patch-openjpeg-libopenjpeg-opj_includes.h Deleted: head/print/ghostscript9-agpl/files/patch-base-Makefile.in head/print/ghostscript9-agpl/files/patch-base-configure.ac head/print/ghostscript9-agpl/files/patch-base-contrib.mak head/print/ghostscript9-agpl/files/patch-base-devs.mak head/print/ghostscript9-agpl/files/patch-base-gdevl256.c head/print/ghostscript9-agpl/files/patch-base-gdevperm.c head/print/ghostscript9-agpl/files/patch-base-gdevplib.c head/print/ghostscript9-agpl/files/patch-base-gdevvglb.c head/print/ghostscript9-agpl/files/patch-openjpeg-libopenjpeg-opj_includes.h head/print/ghostscript9-agpl/files/patch-openjpeg-libopenjpeg-opj_malloc.h Modified: head/print/ghostscript9-agpl/Makefile head/print/ghostscript9-agpl/Makefile.drivers head/print/ghostscript9-agpl/distinfo head/print/ghostscript9-agpl/files/Makefile.drivers_post head/print/ghostscript9-agpl/files/patch-base-unix-gcc.mak head/print/ghostscript9-agpl/files/patch-base-unixinst.mak head/print/ghostscript9-agpl/files/patch-contrib-contrib.mak head/print/ghostscript9-agpl/files/patch-contrib__japanese__gdevdmpr.c head/print/ghostscript9-agpl/files/pkg-message.in head/print/ghostscript9-agpl/pkg-plist Modified: head/print/ghostscript9-agpl/Makefile ============================================================================== --- head/print/ghostscript9-agpl/Makefile Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/Makefile Sun Nov 23 08:25:48 2014 (r373126) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ghostscript -PORTVERSION= 9.07 -PORTREVISION= 7 +PORTVERSION= 9.15 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ @@ -57,8 +56,7 @@ CONFIGURE_ARGS= --disable-compile-inits CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${WRKSRC}/lcms2/include \ -I${LOCALBASE}/include/libpng \ - -I${WRKSRC}/openjpeg/libopenjpeg \ - -I${WRKSRC}/openjpeg \ + -I${WRKSRC}/openjpeg/src/lib/openjp2 \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib XCFLAGS= ${PTHREAD_CFLAGS} \ @@ -158,8 +156,6 @@ post-install-docs: ( cd ${STAGEDIR}${DOCSDIR} && ${TAR} -xof - ) post-install: - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/${PORTVERSION} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gsc ${STAGEDIR}${PREFIX}/bin/gsx ${LN} -sf gsc ${STAGEDIR}${PREFIX}/bin/gs ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont \ ${STAGEDIR}${DATADIR}/${PORTVERSION}/Resource/CIDFont/fonts Modified: head/print/ghostscript9-agpl/Makefile.drivers ============================================================================== --- head/print/ghostscript9-agpl/Makefile.drivers Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/Makefile.drivers Sun Nov 23 08:25:48 2014 (r373126) @@ -295,16 +295,11 @@ OPTIONS_DEFINE+= \ GS_png16m \ GS_pngalpha \ GS_png48 \ - GS_psmono \ - GS_psgray \ - GS_psrgb \ - GS_pswrite \ GS_ps2write \ GS_epswrite \ GS_cfax \ GS_sgirgb \ GS_sunhmono \ - GS_svgwrite \ GS_tiffcrle \ GS_tiffg3 \ GS_tiffg32d \ @@ -551,6 +546,7 @@ OPTIONS_DEFAULT+= \ GS_pcx256 \ GS_pcx24b \ GS_pcxcmyk \ + GS_pcx2up \ GS_pdfwrite \ GS_psdrgb \ GS_psdcmyk \ @@ -586,20 +582,17 @@ OPTIONS_DEFAULT+= \ GS_pngmono \ GS_pnggray \ GS_png16 \ - GS_png256 \ GS_png16m \ + GS_png256 \ GS_pngalpha \ - GS_png48 \ - GS_psmono \ - GS_psgray \ - GS_psrgb \ - GS_pswrite \ + GS_pnggray \ + GS_pngmono \ + GS_psdf \ GS_ps2write \ GS_epswrite \ GS_cfax \ GS_sgirgb \ GS_sunhmono \ - GS_svgwrite \ GS_tiffcrle \ GS_tiffg3 \ GS_tiffg32d \ @@ -899,13 +892,11 @@ GS_png48_DESC= D: PNG 48-bit Color GS_psmono_DESC= D: PostScript (Level 1) monochrome image GS_psgray_DESC= D: PostScript (Level 1) 8-bit gray image GS_psrgb_DESC= D: PostScript (Level 2) 24-bit color image -GS_pswrite_DESC= D: PostScript (like PostScript Distiller) GS_ps2write_DESC= D: PostScript (Level 2) output -GS_epswrite_DESC= D: Encapsulated PostScript +GS_eps2write_DESC= D: Encapsulated PostScript GS_cfax_DESC= D: SFF format for CAPI FAX interface GS_sgirgb_DESC= D: SGI RGB pixmap format GS_sunhmono_DESC= D: Harlequin variant of 1-bit Sun raster file -GS_svgwrite_DESC= D: SVG driver GS_tiffcrle_DESC= D: TIFF CCITT RLE 1 dim (G3 FAX with no EOL) GS_tiffg3_DESC= D: TIFF Group 3 FAX (with EOL) GS_tiffg32d_DESC= D: TIFF Group 3 2-D FAX Modified: head/print/ghostscript9-agpl/distinfo ============================================================================== --- head/print/ghostscript9-agpl/distinfo Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/distinfo Sun Nov 23 08:25:48 2014 (r373126) @@ -1,4 +1,4 @@ -SHA256 (ghostscript/ghostscript-9.07.tar.bz2) = 1e3ee857743bad34280a1186bd92bb486cd847ccd1a838919f82bc96f6687410 -SIZE (ghostscript/ghostscript-9.07.tar.bz2) = 27776111 +SHA256 (ghostscript/ghostscript-9.15.tar.bz2) = e65daf25059e2f3dabd3535df3d936a42ca4933d36473a03095e39adcdd5315c +SIZE (ghostscript/ghostscript-9.15.tar.bz2) = 28826065 SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b SIZE (ghostscript/epag-3.09.tar.gz) = 12858 Modified: head/print/ghostscript9-agpl/files/Makefile.drivers_post ============================================================================== --- head/print/ghostscript9-agpl/files/Makefile.drivers_post Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/files/Makefile.drivers_post Sun Nov 23 08:25:48 2014 (r373126) @@ -18,7 +18,8 @@ EPAG_NAME= ${EPAG_SRCS:S,.tar.gz$,,} post-extract-epag: ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS} ${LN} -s -f ${EPAG_NAME} ${WRKSRC}/${EPAG_BASE} - ${INSTALL_DATA} ${FILESDIR}/epag.contrib.mak ${WRKSRC}/base/epag.contrib.mak + ${INSTALL_DATA} ${FILESDIR}/epag.contrib.mak \ + ${WRKSRC}/contrib/epag.contrib.mak post-extract: post-extract-epag @@ -137,7 +138,7 @@ DEVICE_DEVS6= bj10e.dev bj200.dev bjc600 pngalpha.dev DEVICE_DEVS7= faxg3.dev faxg32d.dev faxg4.dev DEVICE_DEVS8= pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev \ - pcxcmyk.dev svgwrite.dev plan.dev planc.dev plang.dev plank.dev \ + pcxcmyk.dev plan.dev planc.dev plang.dev plank.dev \ planm.dev plib.dev plibc.dev plibg.dev plibk.dev plibm.dev DEVICE_DEVS9= pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev \ pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev \ @@ -146,11 +147,10 @@ DEVICE_DEVS10= tiffcrle.dev tiffg3.dev t tifflzw.dev tiffpack.dev DEVICE_DEVS11= tiff12nc.dev tiff24nc.dev tiff48nc tiffgray.dev \ tiff32nc.dev tiff64nc.dev tiffsep.dev tiffsep1.dev -DEVICE_DEVS12= psmono.dev psgray.dev psrgb.dev bit.dev bitrgb.dev \ - bitcmyk.dev +DEVICE_DEVS12= bit.dev bitrgb.dev bitcmyk.dev DEVICE_DEVS13= DEVICE_DEVS14= jpeg.dev jpeggray.dev jpegcmyk.dev -DEVICE_DEVS15= pdfwrite.dev pswrite.dev ps2write.dev epswrite.dev \ +DEVICE_DEVS15= pdfwrite.dev ps2write.dev eps2write.dev \ txtwrite.dev pxlmono.dev pxlcolor.dev DEVICE_DEVS16= bbox.dev DEVICE_DEVS17= Copied and modified: head/print/ghostscript9-agpl/files/patch-Makefile.in (from r373035, head/print/ghostscript9-agpl/files/patch-base-Makefile.in) ============================================================================== --- head/print/ghostscript9-agpl/files/patch-base-Makefile.in Sat Nov 22 07:40:16 2014 (r373035, copy source) +++ head/print/ghostscript9-agpl/files/patch-Makefile.in Sun Nov 23 08:25:48 2014 (r373126) @@ -1,18 +1,19 @@ ---- base/Makefile.in.orig 2013-02-14 16:58:13.000000000 +0900 -+++ base/Makefile.in 2013-04-28 01:42:43.000000000 +0900 -@@ -49,9 +49,8 @@ +--- Makefile.in.orig 2014-03-26 21:53:48.000000000 +0900 ++++ Makefile.in 2014-11-23 17:01:12.000000000 +0900 +@@ -52,9 +52,9 @@ # the directories also define the default search path for the # initialization files (gs_*.ps) and the fonts. -INSTALL = $(GLSRCDIR)/instcopy -c -INSTALL_PROGRAM = $(INSTALL) -m 755 -INSTALL_DATA = $(INSTALL) -m 644 -+INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT} ++INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM} ++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} +INSTALL_DATA = ${BSD_INSTALL_DATA} INSTALL_SHARED = @INSTALL_SHARED@ prefix = @prefix@ -@@ -204,7 +203,7 @@ +@@ -199,7 +199,7 @@ # some older JPEG streams that violate the standard. If the JPEG # library built from local sources, the patch will be applied. @@ -21,7 +22,7 @@ JPEG_NAME=jpeg # Define the directory where the PNG library sources are stored, -@@ -212,12 +211,12 @@ +@@ -207,12 +207,12 @@ # You may need to change this if the libpng version changes. # See png.mak for more information. @@ -34,9 +35,9 @@ -SHARE_LIBTIFF=@SHARE_LIBTIFF@ +SHARE_LIBTIFF=1 TIFFSRCDIR=@LIBTIFFDIR@ + TIFFCONFDIR=@LIBTIFFCONFDIR@ TIFFPLATFORM=unix - TIFFCONFIG_SUFFIX= -@@ -226,7 +225,7 @@ +@@ -222,7 +222,7 @@ # Define the directory where the zlib sources are stored. # See zlib.mak for more information. @@ -45,7 +46,7 @@ ZSRCDIR=@ZLIBDIR@ #ZLIB_NAME=gz ZLIB_NAME=z -@@ -253,7 +252,7 @@ +@@ -249,7 +249,7 @@ JPX_LIB=@JPX_DECODER@ SHARE_JPX=@SHARE_JPX@ JPXSRCDIR=@JPXDIR@ @@ -54,7 +55,7 @@ # uncomment the following three lines and one of the last two to # compile in the Luratech lwf_jp2 codec -@@ -328,7 +327,7 @@ +@@ -336,7 +336,7 @@ # Define the added flags for standard, debugging, profiling # and shared object builds. @@ -63,7 +64,7 @@ CFLAGS_DEBUG=@DBG_CFLAGS@ CFLAGS_PROFILE=-pg @OPT_CFLAGS@ CFLAGS_SO=@DYNAMIC_CFLAGS@ -@@ -379,8 +378,8 @@ +@@ -389,8 +389,8 @@ # Solaris may need -lnsl -lsocket -lposix4. # (Libraries required by individual drivers are handled automatically.) @@ -74,7 +75,7 @@ # Define the standard libraries to search at the end of linking. # Most platforms require -lpthread for the POSIX threads library; -@@ -424,7 +423,7 @@ +@@ -434,7 +434,7 @@ # the pthread library. Otherwise use SYNC=nosync #SYNC=posync #SYNC=nosync @@ -83,9 +84,9 @@ # programs we use RM=rm -f -@@ -516,27 +515,27 @@ +@@ -528,28 +528,27 @@ #DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev - #DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev + #DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)psdcmykog.dev $(DD)fpng.dev DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@ -DEVICE_DEVS1=@F_DEVS@ -DEVICE_DEVS2=@P_DEVS@ @@ -94,8 +95,8 @@ -DEVICE_DEVS5=@OMNIDEVS@ -DEVICE_DEVS6=@PNG_DEVS@ -DEVICE_DEVS7=@JBIG2_DEVS@ --DEVICE_DEVS8=@SVG_DEVS@ --DEVICE_DEVS9= +-DEVICE_DEVS8= +-DEVICE_DEVS9=@XPS_DEVS@ -DEVICE_DEVS10= -DEVICE_DEVS11= -DEVICE_DEVS12= @@ -108,6 +109,7 @@ -DEVICE_DEVS19= -DEVICE_DEVS20= -DEVICE_DEVS21= +- +#DEVICE_DEVS1=@F_DEVS@ +#DEVICE_DEVS2=@P_DEVS@ +#DEVICE_DEVS3=@CUPS_DEVS@ @@ -115,8 +117,8 @@ +#DEVICE_DEVS5=@OMNIDEVS@ +#DEVICE_DEVS6=@PNG_DEVS@ +#DEVICE_DEVS7=@JBIG2_DEVS@ -+#DEVICE_DEVS8=@SVG_DEVS@ -+#DEVICE_DEVS9= ++#DEVICE_DEVS8= ++#DEVICE_DEVS9=@XPS_DEVS@ +#DEVICE_DEVS10= +#DEVICE_DEVS11= +#DEVICE_DEVS12= @@ -130,13 +132,13 @@ +#DEVICE_DEVS20= +#DEVICE_DEVS21= - # Shared library target to build. -@@ -581,6 +580,7 @@ + GS_SHARED_OBJS=@DYNAMIC_DEVS@ +@@ -592,6 +591,7 @@ # ---------------- End of platform-specific section ---------------- # INSTALL_CONTRIB=@INSTALL_CONTRIB@ +include $(GLSRCDIR)/drivers.mak include $(GLSRCDIR)/unixhead.mak include $(GLSRCDIR)/gs.mak - # psromfs.mak must precede lib.mak + include $(GLSRCDIR)/trio.mak Modified: head/print/ghostscript9-agpl/files/patch-base-unix-gcc.mak ============================================================================== --- head/print/ghostscript9-agpl/files/patch-base-unix-gcc.mak Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/files/patch-base-unix-gcc.mak Sun Nov 23 08:25:48 2014 (r373126) @@ -1,18 +1,23 @@ ---- base/unix-gcc.mak.orig 2013-02-14 16:58:13.000000000 +0900 -+++ base/unix-gcc.mak 2013-04-28 01:43:54.000000000 +0900 -@@ -22,16 +22,17 @@ +--- base/unix-gcc.mak.orig 2014-03-26 21:53:47.000000000 +0900 ++++ base/unix-gcc.mak 2014-08-25 00:19:13.000000000 +0900 +@@ -22,19 +22,19 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). -BINDIR=./$(BUILDDIRPREFIX)bin -GLSRCDIR=./base +-DEVSRCDIR=./devices -GLGENDIR=./$(BUILDDIRPREFIX)obj -GLOBJDIR=./$(BUILDDIRPREFIX)obj -+.CURDIR?=. +-DEVGENDIR=./$(BUILDDIRPREFIX)obj +-DEVOBJDIR=./$(BUILDDIRPREFIX)obj +BINDIR=${.CURDIR}/$(BUILDDIRPREFIX)bin +GLSRCDIR=${.CURDIR}/base ++DEVSRCDIR=${.CURDIR}/devices +GLGENDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj +GLOBJDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj ++DEVGENDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj ++DEVOBJDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj AUXDIR=$(GLGENDIR)/aux -PSSRCDIR=./psi -PSLIBDIR=./lib @@ -27,7 +32,7 @@ # Do not edit the next group of lines. -@@ -50,11 +51,10 @@ +@@ -53,11 +53,10 @@ # the directories also define the default search path for the # initialization files (gs_*.ps) and the fonts. @@ -42,7 +47,7 @@ exec_prefix = $(prefix) bindir = $(exec_prefix)/bin scriptdir = $(bindir) -@@ -104,7 +104,7 @@ +@@ -107,7 +106,7 @@ # This uses the more secure temporary file creation call # Enable this if it is available on your platform. @@ -51,7 +56,7 @@ # Define the name of the executable file. -@@ -139,7 +139,7 @@ +@@ -142,7 +141,7 @@ # some older JPEG streams that violate the standard. If the JPEG # library built from local sources, the patch will be applied. @@ -60,7 +65,7 @@ JPEG_NAME=jpeg # Define the directory where the PNG library sources are stored, -@@ -153,13 +153,13 @@ +@@ -156,13 +155,13 @@ # what its name is. # See gs.mak and Make.htm for more information. @@ -74,9 +79,9 @@ -SHARE_LIBTIFF=0 +SHARE_LIBTIFF=1 TIFFSRCDIR=tiff + TIFFCONFDIR=tiff TIFFPLATFORM=unix - TIFFCONFIG_SUFFIX=.unix -@@ -174,12 +174,12 @@ +@@ -180,12 +179,12 @@ # what its name is (usually libz, but sometimes libgz). # See gs.mak and Make.htm for more information. @@ -91,7 +96,7 @@ JBIG2_LIB=jbig2dec JBIG2SRCDIR=jbig2dec -@@ -219,7 +219,7 @@ +@@ -225,7 +224,7 @@ # Define the name of the C compiler. @@ -100,7 +105,7 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -236,7 +236,7 @@ +@@ -242,7 +241,7 @@ # Define the added flags for standard, debugging, profiling # and shared object builds. @@ -109,7 +114,7 @@ CFLAGS_DEBUG=-g -O0 CFLAGS_PROFILE=-pg -O2 CFLAGS_SO=-fPIC -@@ -252,7 +252,8 @@ +@@ -258,7 +257,8 @@ # We don't include -ansi, because this gets in the way of the platform- # specific stuff that <math.h> typically needs; nevertheless, we expect # gcc to accept ANSI-style function prototypes and function definitions. @@ -119,7 +124,7 @@ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) -@@ -263,7 +264,7 @@ +@@ -269,7 +269,7 @@ # -R /usr/local/xxx/lib:/usr/local/lib # giving the full path names of the shared library directories. # XLDFLAGS can be set from the command line. @@ -128,7 +133,7 @@ LDFLAGS=$(XLDFLAGS) -@@ -274,7 +275,7 @@ +@@ -280,7 +280,7 @@ # Solaris may need -lnsl -lsocket -lposix4. # (Libraries required by individual drivers are handled automatically.) @@ -137,7 +142,7 @@ # Define the standard libraries to search at the end of linking. # Most platforms require -lpthread for the POSIX threads library; -@@ -296,7 +297,7 @@ +@@ -302,7 +302,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). @@ -146,7 +151,7 @@ # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH -@@ -311,29 +312,29 @@ +@@ -317,29 +317,29 @@ #XLIBS=Xt SM ICE Xext X11 #XLIBDIRS=-L/usr/local/X/lib @@ -181,7 +186,7 @@ #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 -@@ -481,6 +482,7 @@ +@@ -488,6 +488,7 @@ include $(GLSRCDIR)/unix-dll.mak include $(GLSRCDIR)/unix-end.mak include $(GLSRCDIR)/unixinst.mak Modified: head/print/ghostscript9-agpl/files/patch-base-unixinst.mak ============================================================================== --- head/print/ghostscript9-agpl/files/patch-base-unixinst.mak Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/files/patch-base-unixinst.mak Sun Nov 23 08:25:48 2014 (r373126) @@ -1,11 +1,20 @@ ---- base/unixinst.mak.orig 2007-08-15 05:48:29.000000000 +0900 -+++ base/unixinst.mak 2008-05-05 16:48:06.000000000 +0900 -@@ -128,7 +128,7 @@ +--- base/unixinst.mak.orig 2014-03-26 21:53:47.000000000 +0900 ++++ base/unixinst.mak 2014-11-23 17:01:40.000000000 +0900 +@@ -45,7 +45,7 @@ + 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=gs/GS_EXECUTABLE=$(GS)/" > $(PSOBJDIR)/$$f); \ +- $(INSTALL_PROGRAM) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ ++ $(INSTALL_SCRIPT) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ + fi;\ + done' + +@@ -142,7 +142,7 @@ done' # install the man pages for each locale -MAN_LCDIRS=. de +MAN_LCDIRS=. MAN1_LINKS_PS2PS=eps2eps - MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13 + MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13 ps2pdf14 MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj Copied and modified: head/print/ghostscript9-agpl/files/patch-configure.ac (from r365933, head/print/ghostscript9-agpl/files/patch-base-configure.ac) ============================================================================== --- head/print/ghostscript9-agpl/files/patch-base-configure.ac Sun Aug 24 14:33:25 2014 (r365933, copy source) +++ head/print/ghostscript9-agpl/files/patch-configure.ac Sun Nov 23 08:25:48 2014 (r373126) @@ -1,5 +1,5 @@ ---- base/configure.ac.orig 2012-02-08 17:48:48.000000000 +0900 -+++ base/configure.ac 2012-02-13 00:31:19.000000000 +0900 +--- configure.ac.orig 2012-02-08 17:48:48.000000000 +0900 ++++ configure.ac 2012-02-13 00:31:19.000000000 +0900 @@ -1244,7 +1244,7 @@ X_DEVS="" X_LIBS="" Modified: head/print/ghostscript9-agpl/files/patch-contrib-contrib.mak ============================================================================== --- head/print/ghostscript9-agpl/files/patch-contrib-contrib.mak Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/files/patch-contrib-contrib.mak Sun Nov 23 08:25:48 2014 (r373126) @@ -1,11 +1,17 @@ ---- contrib/contrib.mak.orig 2012-04-08 01:05:18.000000000 +0900 -+++ contrib/contrib.mak 2012-04-08 01:05:44.000000000 +0900 +--- contrib/contrib.mak.orig 2014-03-26 21:53:47.000000000 +0900 ++++ contrib/contrib.mak 2014-08-25 00:49:19.000000000 +0900 @@ -943,7 +943,7 @@ - $(GLOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH) - $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c + $(DEVOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH) + $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c --$(GLOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h -+$(GLOBJ)dviprlib.$(OBJ) : $(arch_h) $(stdio__h) $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h - $(GLCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c +-$(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h ++$(DEVOBJ)dviprlib.$(OBJ) : $(arch_h) $(stdio__h) $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h + $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c extra-dmprt-install: +@@ -1095,3 +1095,5 @@ + ### ------------ Build/Install special features ------------ ### + + install-contrib-extras: extra-dmprt-install extra-upp-install ++ ++include ${CONTRIBDIR}/epag.contrib.mak Modified: head/print/ghostscript9-agpl/files/patch-contrib__japanese__gdevdmpr.c ============================================================================== --- head/print/ghostscript9-agpl/files/patch-contrib__japanese__gdevdmpr.c Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/files/patch-contrib__japanese__gdevdmpr.c Sun Nov 23 08:25:48 2014 (r373126) @@ -1,5 +1,5 @@ ---- contrib/japanese/gdevdmpr.c.orig 2011-08-05 20:12:20.000000000 +0900 -+++ contrib/japanese/gdevdmpr.c 2011-12-06 15:36:10.000000000 +0900 +--- contrib/japanese/gdevdmpr.c.orig 2014-03-26 21:53:47.000000000 +0900 ++++ contrib/japanese/gdevdmpr.c 2014-08-25 00:36:18.000000000 +0900 @@ -32,7 +32,7 @@ #include "gdevprn.h" @@ -41,13 +41,13 @@ strcpy(fname,fnamebase); - fp = lib_fopen(fname); -+ fp = fopen(fname,"r"); ++ fp = gp_fopen(fname, "r"); if (fp == NULL) { env = getenv("TEXCFG"); if (env) { strcpy(fname,env); strcat(fname, gp_file_name_concat_string(env,strlen(env))); - strcat(fname,fnamebase); - fp = fopen(fname,gp_fmode_rb); + fp = gp_fopen(fname,gp_fmode_rb); } } Copied and modified: head/print/ghostscript9-agpl/files/patch-devices-devs.mak (from r365933, head/print/ghostscript9-agpl/files/patch-base-devs.mak) ============================================================================== --- head/print/ghostscript9-agpl/files/patch-base-devs.mak Sun Aug 24 14:33:25 2014 (r365933, copy source) +++ head/print/ghostscript9-agpl/files/patch-devices-devs.mak Sun Nov 23 08:25:48 2014 (r373126) @@ -1,24 +1,24 @@ ---- base/devs.mak.orig 2009-02-14 09:46:58.000000000 +0900 -+++ base/devs.mak 2009-12-20 01:39:02.000000000 +0900 -@@ -418,10 +418,10 @@ +--- 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 @@ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - $(GLOBJ)lvga256.so : $(lvga256_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl $(XLDFLAGS) - - $(GLOBJ)vgalib.so : $(vgalib_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl $(XLDFLAGS) + $(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 -------------------------- ### -@@ -524,7 +524,7 @@ +@@ -538,7 +538,7 @@ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - $(GLOBJ)X11.so : $(x11alt_) $(x11_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) -+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L$(LOCALBASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) + $(DEVOBJ)X11.so : $(x11alt_) $(x11_) +- $(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) ###### --------------- Memory-buffered printer devices --------------- ###### Copied and modified: head/print/ghostscript9-agpl/files/patch-devices-gdevl256.c (from r365933, head/print/ghostscript9-agpl/files/patch-base-gdevl256.c) ============================================================================== --- head/print/ghostscript9-agpl/files/patch-base-gdevl256.c Sun Aug 24 14:33:25 2014 (r365933, copy source) +++ head/print/ghostscript9-agpl/files/patch-devices-gdevl256.c Sun Nov 23 08:25:48 2014 (r373126) @@ -1,5 +1,5 @@ ---- base/gdevl256.c.orig 2011-07-17 19:57:32.000000000 +0900 -+++ base/gdevl256.c 2011-07-17 19:57:39.000000000 +0900 +--- devices/gdevl256.c.orig 2011-07-17 19:57:32.000000000 +0900 ++++ devices/gdevl256.c 2011-07-17 19:57:39.000000000 +0900 @@ -302,12 +302,3 @@ gl_line(x0, y0, x1, y1, color); return 0; Copied and modified: head/print/ghostscript9-agpl/files/patch-devices-gdevperm.c (from r365933, head/print/ghostscript9-agpl/files/patch-base-gdevperm.c) ============================================================================== --- head/print/ghostscript9-agpl/files/patch-base-gdevperm.c Sun Aug 24 14:33:25 2014 (r365933, copy source) +++ head/print/ghostscript9-agpl/files/patch-devices-gdevperm.c Sun Nov 23 08:25:48 2014 (r373126) @@ -1,5 +1,5 @@ ---- base/gdevperm.c.orig 2012-02-08 17:48:48.000000000 +0900 -+++ base/gdevperm.c 2012-02-13 00:44:23.000000000 +0900 +--- devices/gdevperm.c.orig 2012-02-08 17:48:48.000000000 +0900 ++++ devices/gdevperm.c 2012-02-13 00:44:23.000000000 +0900 @@ -285,7 +285,7 @@ (strncmp((const char *)name, (const char *)str, name_size) == 0)) Copied and modified: head/print/ghostscript9-agpl/files/patch-devices-gdevplib.c (from r365933, head/print/ghostscript9-agpl/files/patch-base-gdevplib.c) ============================================================================== --- head/print/ghostscript9-agpl/files/patch-base-gdevplib.c Sun Aug 24 14:33:25 2014 (r365933, copy source) +++ head/print/ghostscript9-agpl/files/patch-devices-gdevplib.c Sun Nov 23 08:25:48 2014 (r373126) @@ -1,5 +1,5 @@ ---- base/gdevplib.c.orig 2012-02-08 17:48:47.000000000 +0900 -+++ base/gdevplib.c 2012-02-13 01:23:46.000000000 +0900 +--- 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 @@ #ifdef TESTING_WITH_NO_BAND_DONOR Copied and modified: head/print/ghostscript9-agpl/files/patch-devices-gdevvglb.c (from r365933, head/print/ghostscript9-agpl/files/patch-base-gdevvglb.c) ============================================================================== --- head/print/ghostscript9-agpl/files/patch-base-gdevvglb.c Sun Aug 24 14:33:25 2014 (r365933, copy source) +++ head/print/ghostscript9-agpl/files/patch-devices-gdevvglb.c Sun Nov 23 08:25:48 2014 (r373126) @@ -1,5 +1,5 @@ ---- base/gdevvglb.c.orig 2011-07-17 19:56:33.000000000 +0900 -+++ base/gdevvglb.c 2011-07-17 19:57:10.000000000 +0900 +--- devices/gdevvglb.c.orig 2011-07-17 19:56:33.000000000 +0900 ++++ devices/gdevvglb.c 2011-07-17 19:57:10.000000000 +0900 @@ -367,12 +367,3 @@ } return 0; Copied and modified: head/print/ghostscript9-agpl/files/patch-openjpeg-src-lib-openjp2-opj_includes.h (from r373035, head/print/ghostscript9-agpl/files/patch-openjpeg-libopenjpeg-opj_includes.h) ============================================================================== --- head/print/ghostscript9-agpl/files/patch-openjpeg-libopenjpeg-opj_includes.h Sat Nov 22 07:40:16 2014 (r373035, copy source) +++ head/print/ghostscript9-agpl/files/patch-openjpeg-src-lib-openjp2-opj_includes.h Sun Nov 23 08:25:48 2014 (r373126) @@ -1,5 +1,5 @@ ---- openjpeg/libopenjpeg/opj_includes.h.orig 2012-02-13 08:48:33.000000000 +0900 -+++ openjpeg/libopenjpeg/opj_includes.h 2012-02-13 08:50:41.000000000 +0900 +--- openjpeg/src/lib/openjp2/opj_includes.h.orig 2012-02-13 08:48:33.000000000 +0900 ++++ openjpeg/src/lib/openjp2/opj_includes.h 2012-02-13 08:50:41.000000000 +0900 @@ -77,7 +77,7 @@ #endif /* INLINE */ Modified: head/print/ghostscript9-agpl/files/pkg-message.in ============================================================================== --- head/print/ghostscript9-agpl/files/pkg-message.in Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/files/pkg-message.in Sun Nov 23 08:25:48 2014 (r373126) @@ -1,7 +1,5 @@ Note: in order to use the script "dvipdf", dvips must be installed. -This program may be provided by either print/dvips or print/dvipsk-tetex -(print/dvipsk-tetex may be preferable since it doesn't conflict with -tetex things). +This program is provided by another package print/tex-dvipsk. FAPIfontmap and FAPIcidfmap in %%DATADIR%%/%%PORTVERSION%%/Resource/Init have to be configured if you want to use FAPI feature. Modified: head/print/ghostscript9-agpl/pkg-plist ============================================================================== --- head/print/ghostscript9-agpl/pkg-plist Sun Nov 23 07:48:22 2014 (r373125) +++ head/print/ghostscript9-agpl/pkg-plist Sun Nov 23 08:25:48 2014 (r373126) @@ -51,7 +51,6 @@ man/man1/gsnd.1.gz %%GS_pcl3%%man/man1/pcl3opts.1.gz man/man1/pdf2dsc.1.gz man/man1/pdf2ps.1.gz -man/man1/pdfopt.1.gz man/man1/pf2afm.1.gz man/man1/pfbtopfa.1.gz man/man1/printafm.1.gz @@ -245,6 +244,10 @@ man/man1/wftopfa.1.gz %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Latin1 %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/StandardEncoding %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Unicode +%%DATADIR%%/%%GS_VERSION%%/Resource/Encoding/CEEncoding +%%DATADIR%%/%%GS_VERSION%%/Resource/Encoding/ExpertEncoding +%%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 @@ -281,6 +284,7 @@ man/man1/wftopfa.1.gz %%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/IdiomSet/Pscript5Idiom %%DATADIR%%/%%GS_VERSION%%/iccprofiles/default_cmyk.icc %%DATADIR%%/%%GS_VERSION%%/iccprofiles/default_gray.icc %%DATADIR%%/%%GS_VERSION%%/iccprofiles/default_rgb.icc @@ -505,7 +509,6 @@ man/man1/wftopfa.1.gz %%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps %%DATADIR%%/%%GS_VERSION%%/lib/gs_ce_e.ps %%DATADIR%%/%%GS_VERSION%%/lib/gs_cmdl.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_fform.ps %%DATADIR%%/%%GS_VERSION%%/lib/gs_il2_e.ps %%DATADIR%%/%%GS_VERSION%%/lib/gs_kanji.ps %%DATADIR%%/%%GS_VERSION%%/lib/gs_ksb_e.ps
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411230825.sAN8PnoF021856>