Date: Sat, 20 Sep 2008 11:59:56 GMT From: bf <bf2006a@yahoo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/127506: [PATCH]print/ghostscript8: update to 8.63 Message-ID: <200809201159.m8KBxuUu054091@www.freebsd.org> Resent-Message-ID: <200809201200.m8KC01bC021545@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127506 >Category: ports >Synopsis: [PATCH]print/ghostscript8: update to 8.63 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Sep 20 12:00:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: bf >Release: 7-STABLE i386 >Organization: - >Environment: >Description: Update to 8.63. Add some devices: cairo, cups, txtwrite, pamcmyk32, jpegcmyk. Ensure that the svgwrite device is only built when selected. Add two new compile-time tunables that were introduced in 8.63. Make sure the display device is always built with the gsx loader, and that the gsx loader is always built with gtk, as intended. Mark the svgalib devices as broken, rather than removing them entirely, to encourage someone to fix them (cf. PR ports/126513). Since we wipe out DISPLAY_DEV with our driver list, make sure that our driver list always starts with a reasonable choice for the default device (display, one of the x11 devices, bbox, in that order of preference). Include suggested changes from PR ports/127165. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN ghostscript8.orig/Makefile ghostscript8/Makefile --- ghostscript8.orig/Makefile 2008-07-25 08:24:08.000000000 -0400 +++ ghostscript8/Makefile 2008-09-20 07:36:55.194313340 -0400 @@ -6,8 +6,8 @@ # PORTNAME= ghostscript8 -PORTVERSION= 8.62 -PORTREVISION= 5 +PORTVERSION= 8.63 +PORTREVISION= 0 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs/} \ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \ @@ -35,8 +35,7 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \ - EXTRALIBS="${EXTRALIBS}" \ - SOC_LOADER="dxmainc.c" + EXTRALIBS="${EXTRALIBS}" CONFIGURE_ENV= ${MAKE_ENV} \ CPPFLAGS="-DUPD_SIGNAL=0 -I. -I${WRKSRC}/jasper/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -44,8 +43,27 @@ --enable-contrib \ --enable-dynamic \ --with-ijs \ - --with-jasper -XCFLAGS= ${PTHREAD_CFLAGS} + --with-jasper \ + --with-jbig2dec \ + --without-omni + +#A GS_CLIENT_COLOR_MAX_COMPONENTS value of 252 is needed for Adobe CPSI +#compatibility and for RIPS that want to use a large number of DeviceN +#colorants, but this increases the size of some allocations, slows down +#performance, and is much too large for printers. Setting this to 6 or 8 is +#probably plenty. Currently only the tiffsep and psdcmyk devices can generate +#more than 8 separations, and then only when USE_COMPRESSED_ENCODING is used to +#fit more than 8 components in a 64-bit color value. +GS_CLIENT_COLOR_MAX_COMPONENTS?= 8 +#MAX_BITMAP_PATTERN_SIZE controls when the clist pattern accumulator is used, +#and on most machines , the previous default of 1 Mb is too small and causes the +#slower clist method to be used too often. Setting this to 32 Mb is probably better, +#although low-memory systems may want to set this to a smaller value. +MAX_BITMAP_PATTERN_SIZE?= 33554432 # =32*1024*1024 + +XCFLAGS= ${PTHREAD_CFLAGS} \ + -DMAX_BITMAP_PATTERN_SIZE=${MAX_BITMAP_PATTERN_SIZE} \ + -DGS_CLIENT_COLOR_MAX_COMPONENTS=${GS_CLIENT_COLOR_MAX_COMPONENTS} XLDFLAGS= ${PTHREAD_LIBS} PLIST_SUB= GS_VERSION="${PORTVERSION}" \ @@ -109,6 +127,7 @@ .if defined(WITH_GS_lvga256) \ || defined(WITH_GS_vgalib) +IGNORE= the svgalib-dependent devices are currently broken: disable lvga256 and vgalib . if defined(WITHOUT_SVGALIB) . warning drivers incompatible with WITHOUT_SVGALIB will be removed automatically . undef WITH_GS_lvga256 @@ -176,6 +195,43 @@ .endif .endif +.if defined(WITH_GS_cairo) +.if defined(WITHOUT_X11) +IGNORE= WITH_GS_cairo is incompatible with WITHOUT_X11 +.endif +LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo +.endif + +.if defined(WITH_GS_cups) +LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base +CONFIGURE_ARGS+= --enable-cups +CONFLICTS+= cups-pstoraster-[0-9]* +MAKE_ENV+= CUPSDATA="${PREFIX}/share/cups" \ + CUPSSERVERBIN="${PREFIX}/libexec/cups" \ + CUPSSERVERROOT="${PREFIX}/etc/cups" +.else +CONFIGURE_ARGS+= --disable-cups +.endif + +#When the display device is desired, build gsx as the default loader, using +#dxmain.c as SOC_LOADER and linking with x11-toolkits/gtk20 for faster +#drawing. (Always build the other loader, gsc, with dxmainc.c, which is +#independent of gtk20.) +.if defined(WITH_GS_display) +.if defined(WITHOUT_X11) +IGNORE= WITH_GS_display is incompatible with WITHOUT_X11 +.endif +USE_GNOME+= gtk20 +CONFIGURE_ARGS+= --enable-gtk +LOADERS= gsc gsx +DEFAULT_LOADER?= gsx +.else +EXTRA_PATCHES+= ${FILESDIR}/no_gtk_patch-src-unix-dll.mak +CONFIGURE_ARGS+= --disable-gtk +LOADERS= gsc +DEFAULT_LOADER= gsc +.endif + .if !defined(WITHOUT_FONTCONFIG) LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+= --enable-fontconfig @@ -193,7 +249,9 @@ ALL_TARGET= so INSTALL_TARGET= soinstall -USE_LDCONFIG= yes +.if defined(WITH_GS_cups) +INSTALL_TARGET+= install-cups +.endif PLIST_SUB+= SHLIB_VER="${PORTVERSION:R}" PORTDOCS= japanese chp2200 epson740 lxm3200-tweaked md2k_md5k @@ -250,8 +308,8 @@ ${INSTALL_DATA} ${WRKSRC}/contrib/japanese/doc/* ${WRKSRC}/contrib/japanese ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/contrib && \ - ${TAR} cf - ${PORTDOC_FILES} | \ - ( cd ${DOCSDIR} && ${TAR} xof - ) + ${TAR} -cf - ${PORTDOC_FILES} | \ + ( cd ${DOCSDIR} && ${TAR} -xof - ) .if defined(WITH_FT_BRIDGE) post-install-fapi: @@ -263,8 +321,10 @@ .endif post-install: - ${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx - ${LN} -sf gsc ${PREFIX}/bin/gs + for _L in ${LOADERS} ; do \ + ${STRIP_CMD} ${PREFIX}/bin/$${_L} ; \ + done + ${LN} -s -f ${PREFIX}/bin/${DEFAULT_LOADER} ${PREFIX}/bin/gs ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont @${ECHO_MSG} @${CAT} ${PKGMESSAGE} diff -ruN ghostscript8.orig/Makefile.drivers ghostscript8/Makefile.drivers --- ghostscript8.orig/Makefile.drivers 2008-06-20 14:12:06.000000000 -0400 +++ ghostscript8/Makefile.drivers 2008-09-20 07:36:55.194313340 -0400 @@ -43,19 +43,28 @@ GS_x11rg32x "D: X Window System G11/B10/R11 pixel layout" ${OPTIONS_X11_DEFAULT} OPTIONS_SVGALIB= \ -GS_lvga256 "D: SVGAlib, 256-color VGA modes" ${OPTIONS_SVGALIB_DEFAULT} \ -GS_vgalib "D: SVGAlib, 16-color VGA modes" ${OPTIONS_SVGALIB_DEFAULT} +GS_lvga256 "D: SVGAlib, 256-color VGA modes(broken)" ${OPTIONS_SVGALIB_DEFAULT} \ +GS_vgalib "D: SVGAlib, 16-color VGA modes(broken)" ${OPTIONS_SVGALIB_DEFAULT} OPTIONS_ICONV= \ GS_oprp "D: OpenPrinting Raster driver interface" ${OPTIONS_ICONV_DEFAULT} \ GS_opvp "D: OpenPrinting Vecter driver interface" ${OPTIONS_ICONV_DEFAULT} + +OPTIONS+= \ +GS_display "D: GTK+-2 display device" ${OPTIONS_GS_DEFAULT_OFF} \ + OPTIONS+= ${OPTIONS_X11} OPTIONS+= ${OPTIONS_SVGALIB} + +OPTIONS+= \ +GS_bbox "D: Bounding box output" ${OPTIONS_GS_DEFAULT_ON} \ +GS_cairo "D: Cairo device" ${OPTIONS_GS_DEFAULT_OFF} \ +GS_cups "D: CUPS device" ${OPTIONS_GS_DEFAULT_OFF} \ + OPTIONS+= ${OPTIONS_ICONV} OPTIONS+= \ -GS_display "D: display device for GS shared library" ${OPTIONS_GS_DEFAULT_ON} \ GS_md2k "D: ALPS MD-2000/2010/4000/1300/1500/5000" ${OPTIONS_GS_DEFAULT_ON} \ GS_md5k "D: ALPS MD-5000 Eco Mode" ${OPTIONS_GS_DEFAULT_ON} \ GS_md50Mono "D: ALPS MD-5000 Monochrome" ${OPTIONS_GS_DEFAULT_ON} \ @@ -264,6 +273,7 @@ GS_miff24 "D: ImageMagick MIFF, 24-bit direct color, RLE" ${OPTIONS_GS_DEFAULT_ON} \ GS_inferno "D: Inferno bitmaps" ${OPTIONS_GS_DEFAULT_ON} \ GS_jpeg "D: JPEG format, RGB output" ${OPTIONS_GS_DEFAULT_ON} \ +GS_jpegcmyk "D: JPEG format, CMYK output" ${OPTIONS_GS_DEFAULT_ON} \ GS_jpeggray "D: JPEG format, gray output" ${OPTIONS_GS_DEFAULT_ON} \ GS_mag16 "D: MAG format, 16-color" ${OPTIONS_GS_DEFAULT_ON} \ GS_mag256 "D: MAG format, 256-color" ${OPTIONS_GS_DEFAULT_ON} \ @@ -287,6 +297,7 @@ GS_bitcmyk "D: Plain bits, CMYK" ${OPTIONS_GS_DEFAULT_ON} \ GS_plan9bm "D: Plan 9 bitmap format" ${OPTIONS_GS_DEFAULT_ON} \ GS_pam "D: Portable Arbitrary Map file" ${OPTIONS_GS_DEFAULT_ON} \ +GS_pamcmyk32 "D: Portable Arbitrary Map file, 32-bit CMYK" ${OPTIONS_GS_DEFAULT_ON} \ GS_pbm "D: Portable Bitmap, plain" ${OPTIONS_GS_DEFAULT_ON} \ GS_pbmraw "D: Portable Bitmap, raw" ${OPTIONS_GS_DEFAULT_ON} \ GS_pgm "D: Portable Graymap, plain" ${OPTIONS_GS_DEFAULT_ON} \ @@ -316,6 +327,8 @@ GS_cfax "D: SFF format for CAPI FAX interface" ${OPTIONS_GS_DEFAULT_ON} \ GS_sgirgb "D: SGI RGB pixmap format" ${OPTIONS_GS_DEFAULT_ON} \ GS_sunhmono "D: Harlequin variant of 1-bit Sun raster file" ${OPTIONS_GS_DEFAULT_ON} \ +GS_svgwrite "D: Scalable Vector Graphics" ${OPTIONS_GS_DEFAULT_ON} \ +GS_txtwrite "D: Text output, ASCII or Unicode" ${OPTIONS_GS_DEFAULT_ON} \ GS_tiffcrle "D: TIFF CCITT RLE 1 dim (G3 FAX with no EOL)" ${OPTIONS_GS_DEFAULT_ON} \ GS_tiffg3 "D: TIFF Group 3 FAX (with EOL)" ${OPTIONS_GS_DEFAULT_ON} \ GS_tiffg32d "D: TIFF Group 3 2-D FAX" ${OPTIONS_GS_DEFAULT_ON} \ @@ -327,7 +340,6 @@ GS_tiffsep "D: TIFF gray + CMYK composite" ${OPTIONS_GS_DEFAULT_ON} \ GS_tifflzw "D: TIFF LZW, tag = 5, mono" ${OPTIONS_GS_DEFAULT_ON} \ GS_tiffpack "D: TIFF PackBits, tag = 32773, mono" ${OPTIONS_GS_DEFAULT_ON} \ -GS_bbox "D: Bounding box output" ${OPTIONS_GS_DEFAULT_ON} \ GS_devicen "D: DeviceN process color model device" ${OPTIONS_GS_DEFAULT_ON} \ GS_perm "D: DeviceN which permutes color components" ${OPTIONS_GS_DEFAULT_ON} \ GS_spotcmyk "D: DeviceN with CMYK and spot color support" ${OPTIONS_GS_DEFAULT_ON} \ diff -ruN ghostscript8.orig/distinfo ghostscript8/distinfo --- ghostscript8.orig/distinfo 2008-06-01 08:58:36.000000000 -0400 +++ ghostscript8/distinfo 2008-09-20 07:36:55.194313340 -0400 @@ -1,6 +1,6 @@ -MD5 (ghostscript/ghostscript-8.62.tar.bz2) = 40d673a3c6e11d2bf14f972b84551104 -SHA256 (ghostscript/ghostscript-8.62.tar.bz2) = 09671c76237c7b1df905697d30278a4f2cb9da238f9659f8fd1e8b2ae43ace4d -SIZE (ghostscript/ghostscript-8.62.tar.bz2) = 15063641 +MD5 (ghostscript/ghostscript-8.63.tar.bz2) = c770eedfdd846a53e211e3ba5339de21 +SHA256 (ghostscript/ghostscript-8.63.tar.bz2) = 0801ec174fa8ee67679c9ae42af547f5cbc2cc98faab6268187f69c22b86b0a1 +SIZE (ghostscript/ghostscript-8.63.tar.bz2) = 15017410 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3 SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b SIZE (ghostscript/epag-3.09.tar.gz) = 12858 diff -ruN ghostscript8.orig/files/no_gtk_patch-src-unix-dll.mak ghostscript8/files/no_gtk_patch-src-unix-dll.mak --- ghostscript8.orig/files/no_gtk_patch-src-unix-dll.mak 1969-12-31 19:00:00.000000000 -0500 +++ ghostscript8/files/no_gtk_patch-src-unix-dll.mak 2008-09-20 07:36:55.194313340 -0400 @@ -0,0 +1,33 @@ +--- src/unix-dll.mak.orig 2008-09-06 08:45:23.832956426 -0400 ++++ src/unix-dll.mak 2008-09-06 08:48:59.626271498 -0400 +@@ -100,13 +100,13 @@ + + # Normal shared object + so: SODIRS +- $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX) ++ $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) + + # Debug shared object + # Note that this is in the same directory as the normal shared + # object, so you will need to use 'make soclean', 'make sodebug' + sodebug: SODIRS +- $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX) ++ $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) + + install-so: so + -mkdir -p $(DESTDIR)$(prefix) +@@ -117,7 +117,6 @@ + -mkdir -p $(DESTDIR)$(libdir) + -mkdir -p $(DESTDIR)$(gsincludedir) + $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) +- $(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) +@@ -143,6 +142,5 @@ + $(RM_) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME) + $(RM_) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR) + $(RM_) $(GSSOC) +- $(RM_) $(GSSOX) + + # End of unix-dll.mak diff -ruN ghostscript8.orig/files/patch-Makefile.in ghostscript8/files/patch-Makefile.in --- ghostscript8.orig/files/patch-Makefile.in 1969-12-31 19:00:00.000000000 -0500 +++ ghostscript8/files/patch-Makefile.in 2008-09-20 07:36:55.194313340 -0400 @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2008-09-20 05:38:41.585283980 -0400 ++++ Makefile.in 2008-09-20 05:40:20.496803740 -0400 +@@ -439,7 +439,7 @@ + DEVICE_DEVS5=@OMNIDEVS@ + DEVICE_DEVS6=@PNGDEVS@ + DEVICE_DEVS7=@JBIG2DEVS@ +-DEVICE_DEVS8=$(DD)svgwrite.dev ++DEVICE_DEVS8= + DEVICE_DEVS9= + DEVICE_DEVS10= + DEVICE_DEVS11= diff -ruN ghostscript8.orig/files/patch-src-Makefile.in ghostscript8/files/patch-src-Makefile.in --- ghostscript8.orig/files/patch-src-Makefile.in 2008-05-05 09:16:25.000000000 -0400 +++ ghostscript8/files/patch-src-Makefile.in 2008-09-20 07:36:55.194313340 -0400 @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig 2008-02-29 17:13:08.000000000 +0900 -+++ src/Makefile.in 2008-03-05 00:25:31.000000000 +0900 +--- src/Makefile.in.orig 2008-09-05 09:13:19.760633431 -0400 ++++ src/Makefile.in 2008-09-05 09:18:52.385740533 -0400 @@ -46,9 +46,8 @@ # the directories also define the default search path for the # initialization files (gs_*.ps) and the fonts. @@ -44,7 +44,7 @@ -CFLAGS_STANDARD=@OPT_CFLAGS@ +CFLAGS_STANDARD?=@OPT_CFLAGS@ - CFLAGS_DEBUG=-g -O + CFLAGS_DEBUG=-g -O0 CFLAGS_PROFILE=-pg @OPT_CFLAGS@ CFLAGS_SO=@DYNAMIC_CFLAGS@ @@ -295,7 +294,7 @@ @@ -56,19 +56,15 @@ # Define the standard libraries to search at the end of linking. # Most platforms require -lpthread for the POSIX threads library; -@@ -340,10 +339,10 @@ +@@ -337,7 +336,7 @@ # If POSIX sync primitives are used, also change the STDLIBS to include - # the pthread library. + # the pthread library. Otherwise use SYNC=nosync -#SYNC=posync +SYNC=posync + #SYNC=nosync + SYNC=@SYNC@ - # Default is No sync primitives since some platforms don't have it (HP-UX) --SYNC=nosync -+#SYNC=nosync - - # programs we use - RM=rm -f @@ -498,6 +497,7 @@ # ---------------- End of platform-specific section ---------------- # diff -ruN ghostscript8.orig/pkg-descr ghostscript8/pkg-descr --- ghostscript8.orig/pkg-descr 2008-06-01 08:58:36.000000000 -0400 +++ ghostscript8/pkg-descr 2008-09-20 07:36:55.194313340 -0400 @@ -10,7 +10,7 @@ o HP8XX driver for HP DeskJet 880C/882C/895C - http://www.gelhaus.net/hp880c/ o PCL3 driver for HP DeskJet series - - http://home.vrweb.de/martin.lottermoser/pcl3.html + - http://home.vrweb.de/martin.lottermoser/pcl3/index.html o DJ970 driver for HP DeskJet 970CXi - http://www.harsch.net/Ghostscript/ghostscript.html o Special drivers for verious printer models diff -ruN ghostscript8.orig/pkg-plist ghostscript8/pkg-plist --- ghostscript8.orig/pkg-plist 2008-06-01 08:58:36.000000000 -0400 +++ ghostscript8/pkg-plist 2008-09-20 07:36:55.204314331 -0400 @@ -14,7 +14,7 @@ bin/gslj bin/gslp bin/gsnd -bin/gsx +%%GS_display%%bin/gsx bin/lprsetup.sh %%GS_pcl3%%bin/pcl3opts bin/pdf2dsc @@ -42,6 +42,11 @@ lib/libgs.so lib/libgs.so.%%SHLIB_VER%% lib/libgs.so.%%GS_VERSION%% +%%GS_cups%%libexec/cups/filter/pstoraster +%%GS_cups%%libexec/cups/filter/pstopxl +%%GS_cups%%etc/cups/pstoraster.convs +%%GS_cups%%share/cups/model/pxlcolor.ppd +%%GS_cups%%share/cups/model/pxlmono.ppd %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-H %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-V %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-H @@ -369,7 +374,6 @@ %%DATADIR%%/%%GS_VERSION%%/doc/Readme.htm %%DATADIR%%/%%GS_VERSION%%/doc/Release.htm %%DATADIR%%/%%GS_VERSION%%/doc/Source.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Testing.htm %%DATADIR%%/%%GS_VERSION%%/doc/Unix-lpr.htm %%DATADIR%%/%%GS_VERSION%%/doc/Use.htm %%DATADIR%%/%%GS_VERSION%%/doc/Xfonts.htm >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809201159.m8KBxuUu054091>