[Midnightbsd-cvs] mports [19255] trunk/print/ghostscript8: fix ghostscript build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat May 30 12:13:03 EDT 2015


Revision: 19255
          http://svnweb.midnightbsd.org/mports/?rev=19255
Author:   laffer1
Date:     2015-05-30 12:13:03 -0400 (Sat, 30 May 2015)
Log Message:
-----------
fix ghostscript build

Modified Paths:
--------------
    trunk/print/ghostscript8/Makefile
    trunk/print/ghostscript8/files/Makefile.epag
    trunk/print/ghostscript8/files/patch-base-Makefile.in
    trunk/print/ghostscript8/files/patch-base-unixinst.mak
    trunk/print/ghostscript8/files/pkg-message.in
    trunk/print/ghostscript8/pkg-plist

Added Paths:
-----------
    trunk/print/ghostscript8/files/patch-base-ijs.mak
    trunk/print/ghostscript8/files/patch-base-lib.mak
    trunk/print/ghostscript8/files/patch-contrib-contrib.mak
    trunk/print/ghostscript8/files/patch-libpng15

Removed Paths:
-------------
    trunk/print/ghostscript8/files/patch-base-gdevpng.c
    trunk/print/ghostscript8/files/patch-base-png_.h

Modified: trunk/print/ghostscript8/Makefile
===================================================================
--- trunk/print/ghostscript8/Makefile	2015-05-30 15:47:18 UTC (rev 19254)
+++ trunk/print/ghostscript8/Makefile	2015-05-30 16:13:03 UTC (rev 19255)
@@ -167,9 +167,9 @@
 		${STAGEDIR}${DATADIR}/${PORTVERSION}/Resource/Init
 	${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}${CIDFONTDIR}/CIDFont
+	${LN} -sf gsc ${PREFIX}/bin/gs
+	(cd ${PREFIX}/share/ && ${LN} -s -f fonts/CIDFont \
+	    ghostscript/8.71/Resource/CIDFont)
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install: post-install-docs

Modified: trunk/print/ghostscript8/files/Makefile.epag
===================================================================
--- trunk/print/ghostscript8/files/Makefile.epag	2015-05-30 15:47:18 UTC (rev 19254)
+++ trunk/print/ghostscript8/files/Makefile.epag	2015-05-30 16:13:03 UTC (rev 19255)
@@ -1,4 +1,4 @@
-# $FreeBSD: head/print/ghostscript8/files/Makefile.epag 347164 2014-03-06 07:07:55Z hrs $
+# $FreeBSD: head/print/ghostscript8/files/Makefile.epag 381971 2015-03-22 23:53:18Z bdrewery $
 
 # EPAG - additional driver for Epson ESC/Page printers
 # http://www.humblesoft.com/gdevepag.html
@@ -14,7 +14,7 @@
 
 post-build-epag:
 	cd ${WRKSRC}/${EPAG_NAME} && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile
 
 post-install-epag:
 	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${STAGEDIR}${PREFIX}/bin

Modified: trunk/print/ghostscript8/files/patch-base-Makefile.in
===================================================================
--- trunk/print/ghostscript8/files/patch-base-Makefile.in	2015-05-30 15:47:18 UTC (rev 19254)
+++ trunk/print/ghostscript8/files/patch-base-Makefile.in	2015-05-30 16:13:03 UTC (rev 19255)
@@ -1,6 +1,6 @@
 --- base/Makefile.in.orig	2009-12-18 16:04:10.000000000 +0900
-+++ base/Makefile.in	2010-05-23 03:04:55.000000000 +0900
-@@ -47,9 +47,8 @@
++++ base/Makefile.in	2014-11-23 17:40:23.000000000 +0900
+@@ -47,9 +47,9 @@
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
  
@@ -7,12 +7,13 @@
 -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@
-@@ -156,7 +155,7 @@
+@@ -156,7 +156,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,
-@@ -164,12 +163,12 @@
+@@ -164,12 +164,12 @@
  # You may need to change this if the libpng version changes.
  # See libpng.mak for more information.
  
@@ -36,7 +37,7 @@
  TIFFSRCDIR=@LIBTIFFDIR@
  TIFFPLATFORM=unix
  TIFFCONFIG_SUFFIX=
-@@ -178,7 +177,7 @@
+@@ -178,7 +178,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
-@@ -254,7 +253,7 @@
+@@ -254,7 +254,7 @@
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
@@ -54,7 +55,7 @@
  CFLAGS_DEBUG=-g -O0
  CFLAGS_PROFILE=-pg @OPT_CFLAGS@
  CFLAGS_SO=@DYNAMIC_CFLAGS@
-@@ -299,7 +298,7 @@
+@@ -299,7 +299,7 @@
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -63,7 +64,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -343,7 +342,7 @@
+@@ -343,7 +343,7 @@
  # the pthread library. Otherwise use SYNC=nosync
  #SYNC=posync
  #SYNC=nosync
@@ -72,7 +73,7 @@
  
  # programs we use
  RM=rm -f
-@@ -436,27 +435,27 @@
+@@ -436,27 +436,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_DEVS=$(DISPLAY_DEV) @X_DEVS@
@@ -121,7 +122,7 @@
  
  
  # Shared library target to build.
-@@ -490,6 +489,7 @@
+@@ -490,6 +490,7 @@
  # ---------------- End of platform-specific section ---------------- #
  
  INSTALL_CONTRIB=@INSTALL_CONTRIB@

Deleted: trunk/print/ghostscript8/files/patch-base-gdevpng.c
===================================================================
--- trunk/print/ghostscript8/files/patch-base-gdevpng.c	2015-05-30 15:47:18 UTC (rev 19254)
+++ trunk/print/ghostscript8/files/patch-base-gdevpng.c	2015-05-30 16:13:03 UTC (rev 19255)
@@ -1,11 +0,0 @@
---- base/gdevpng.c.orig	2008-07-17 04:34:01.000000000 +0200
-+++ base/gdevpng.c	2012-04-27 20:19:52.000000000 +0200
-@@ -280,7 +280,7 @@
- 	goto done;
-     }
-     /* set error handling */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* If we get here, we had a problem reading the file */
- 	code = gs_note_error(gs_error_VMerror);
- 	goto done;

Added: trunk/print/ghostscript8/files/patch-base-ijs.mak
===================================================================
--- trunk/print/ghostscript8/files/patch-base-ijs.mak	                        (rev 0)
+++ trunk/print/ghostscript8/files/patch-base-ijs.mak	2015-05-30 16:13:03 UTC (rev 19255)
@@ -0,0 +1,20 @@
+--- base/ijs.mak.orig	2012-06-13 02:06:36.000000000 +0900
++++ base/ijs.mak	2012-06-13 02:07:44.000000000 +0900
+@@ -41,7 +41,7 @@
+ ijs.clean : ijs.config-clean ijs.clean-not-config-clean
+ 
+ ### WRONG.  MUST DELETE OBJ AND GEN FILES SELECTIVELY.
+-ijs.clean-not-config-clean :
++ijs.clean-not-config-clean : $(ECHOGS_XE)
+ #	echo $(IJSSRC) $(IJSGEN) $(IJSOBJ) $(IJSO_)
+ 	$(EXP)$(ECHOGS_XE) $(IJSSRC) $(IJSGEN) $(IJSOBJ) $(IJSO_)
+ 	$(RM_) $(IJSOBJ)*.$(OBJ)
+@@ -61,7 +61,7 @@
+ ijs_client_h=$(IJSSRC)$(D)ijs_client.h
+ ijs_server_h=$(IJSSRC)$(D)ijs_server.h
+ 
+-$(IJSOBJ)ijs.$(OBJ) : $(IJSSRC)ijs.c $(IJSDEP) $(ijs_h)
++$(IJSOBJ)ijs.$(OBJ) : $(ECHOGS_XE) $(IJSSRC)ijs.c $(IJSDEP) $(ijs_h)
+ #	echo $(IJS_CCFLAGS)
+ 	$(EXP)$(ECHOGS_XE) $(IJS_CCFLAGS)
+ 	$(IJS_CC) $(IJSO_)ijs.$(OBJ) $(C_) $(IJSSRC)ijs.c


Property changes on: trunk/print/ghostscript8/files/patch-base-ijs.mak
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/ghostscript8/files/patch-base-lib.mak
===================================================================
--- trunk/print/ghostscript8/files/patch-base-lib.mak	                        (rev 0)
+++ trunk/print/ghostscript8/files/patch-base-lib.mak	2015-05-30 16:13:03 UTC (rev 19255)
@@ -0,0 +1,17 @@
+--- base/lib.mak.orig	2013-04-18 04:24:52.000000000 +0900
++++ base/lib.mak	2013-04-18 04:25:13.000000000 +0900
+@@ -2684,12 +2684,12 @@
+ # This is used to access compressed, compiled-in support files
+ gsiorom_h=$(GLSRC)gsiorom.h
+ romfs_=$(GLOBJ)gsiorom.$(OBJ)
+-$(GLD)romfs1.dev : $(LIB_MAK) $(ECHO_XE) $(romfs_)
++$(GLD)romfs1.dev : $(LIB_MAK) $(ECHOGS_XE) $(romfs_)
+ 	$(SETMOD) $(GLD)romfs1 $(romfs_)
+ 	$(ADDMOD) $(GLD)romfs1 -iodev rom
+ 
+ # A dummy romfs when we aren't using COMPILE_INITS
+-$(GLD)romfs0.dev :  $(LIB_MAK) $(ECHO_XE) 
++$(GLD)romfs0.dev :  $(LIB_MAK) $(ECHOGS_XE) 
+ 	$(SETMOD) $(GLD)romfs0 
+ 
+ $(GLGEN)gsromfs1.c : $(MKROMFS_XE) $(PS_ROMFS_DEPS)


Property changes on: trunk/print/ghostscript8/files/patch-base-lib.mak
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/print/ghostscript8/files/patch-base-png_.h
===================================================================
--- trunk/print/ghostscript8/files/patch-base-png_.h	2015-05-30 15:47:18 UTC (rev 19254)
+++ trunk/print/ghostscript8/files/patch-base-png_.h	2015-05-30 16:13:03 UTC (rev 19255)
@@ -1,9 +0,0 @@
---- base/png_.h.orig	2007-06-06 00:23:38.000000000 +0200
-+++ base/png_.h	2012-04-27 19:31:55.000000000 +0200
-@@ -22,5 +22,6 @@
- #else
- #include "png.h"
- #endif
-+#include "pngpriv.h"
- 
- #endif /* png__INCLUDED */

Modified: trunk/print/ghostscript8/files/patch-base-unixinst.mak
===================================================================
--- trunk/print/ghostscript8/files/patch-base-unixinst.mak	2015-05-30 15:47:18 UTC (rev 19254)
+++ trunk/print/ghostscript8/files/patch-base-unixinst.mak	2015-05-30 16:13:03 UTC (rev 19255)
@@ -1,5 +1,14 @@
---- base/unixinst.mak.orig	2007-08-15 05:48:29.000000000 +0900
-+++ base/unixinst.mak	2008-05-05 16:48:06.000000000 +0900
+--- base/unixinst.mak.orig	2009-11-19 09:09:15.000000000 +0900
++++ base/unixinst.mak	2014-11-23 17:40:46.000000000 +0900
+@@ -44,7 +44,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'
+ 
 @@ -128,7 +128,7 @@
  	done'
  

Added: trunk/print/ghostscript8/files/patch-contrib-contrib.mak
===================================================================
--- trunk/print/ghostscript8/files/patch-contrib-contrib.mak	                        (rev 0)
+++ trunk/print/ghostscript8/files/patch-contrib-contrib.mak	2015-05-30 16:13:03 UTC (rev 19255)
@@ -0,0 +1,11 @@
+--- contrib/contrib.mak.orig	2012-06-13 01:22:12.000000000 +0900
++++ contrib/contrib.mak	2012-06-13 01:22:40.000000000 +0900
+@@ -956,7 +956,7 @@
+ $(GLOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH)
+ 	$(GLCC) $(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
+ 
+ extra-dmprt-install:


Property changes on: trunk/print/ghostscript8/files/patch-contrib-contrib.mak
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/ghostscript8/files/patch-libpng15
===================================================================
--- trunk/print/ghostscript8/files/patch-libpng15	                        (rev 0)
+++ trunk/print/ghostscript8/files/patch-libpng15	2015-05-30 16:13:03 UTC (rev 19255)
@@ -0,0 +1,196 @@
+$NetBSD: patch-ak,v 1.5 2011/01/15 14:08:10 wiz Exp $
+
+Fix build with png-1.5. From John Bowler.
+
+--- base/gdevpng.c.orig	2008-07-17 02:34:01.000000000 +0000
++++ base/gdevpng.c
+@@ -36,12 +36,14 @@
+ #include "gdevpccm.h"
+ #include "gscdefs.h"
+ 
+-#define PNG_INTERNAL
+ /*
+  * libpng versions 1.0.3 and later allow disabling access to the stdxxx
+  * files while retaining support for FILE * I/O.
++ *
++ * This is a misunderstanding - this is a build time option for libpng,
++ * it has no effect on a user of libpng.
+  */
+-#define PNG_NO_CONSOLE_IO
++/*#define PNG_NO_CONSOLE_IO*/
+ /*
+  * Earlier libpng versions require disabling FILE * I/O altogether.
+  * This produces a compiler warning about no prototype for png_init_io.
+@@ -280,7 +282,7 @@ png_print_page(gx_device_printer * pdev,
+ 	goto done;
+     }
+     /* set error handling */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* If we get here, we had a problem reading the file */
+ 	code = gs_note_error(gs_error_VMerror);
+ 	goto done;
+@@ -290,19 +292,12 @@ png_print_page(gx_device_printer * pdev,
+     png_init_io(png_ptr, file);
+ 
+     /* set the file information here */
+-    info_ptr->width = pdev->width;
+-    info_ptr->height = pdev->height;
+-    /* resolution is in pixels per meter vs. dpi */
+-    info_ptr->x_pixels_per_unit =
+-	(png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54));
+-    info_ptr->y_pixels_per_unit =
+-	(png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54));
+-    info_ptr->phys_unit_type = PNG_RESOLUTION_METER;
+-    info_ptr->valid |= PNG_INFO_pHYs;
+     switch (depth) {
+ 	case 32:
+-	    info_ptr->bit_depth = 8;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	8, PNG_COLOR_TYPE_RGB_ALPHA,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    png_set_invert_alpha(png_ptr);
+ 	    {   gx_device_pngalpha *ppdev = (gx_device_pngalpha *)pdev;
+ 		png_color_16 background;
+@@ -315,57 +310,69 @@ png_print_page(gx_device_printer * pdev,
+ 	    }
+ 	    break;
+ 	case 48:
+-	    info_ptr->bit_depth = 16;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	16, PNG_COLOR_TYPE_RGB,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ #if defined(ARCH_IS_BIG_ENDIAN) && (!ARCH_IS_BIG_ENDIAN) 
+ 	    png_set_swap(png_ptr);
+ #endif
+ 	    break;
+ 	case 24:
+-	    info_ptr->bit_depth = 8;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	8, PNG_COLOR_TYPE_RGB,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    break;
+ 	case 8:
+-	    info_ptr->bit_depth = 8;
+-	    if (gx_device_has_color(pdev))
+-		info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+-	    else
+-		info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	8, gx_device_has_color(pdev) ?
++			PNG_COLOR_TYPE_PALETTE : PNG_COLOR_TYPE_GRAY,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    break;
+ 	case 4:
+-	    info_ptr->bit_depth = 4;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	4, PNG_COLOR_TYPE_PALETTE,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    break;
+ 	case 1:
+-	    info_ptr->bit_depth = 1;
+-	    info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++	    png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++	    	1, PNG_COLOR_TYPE_GRAY,
++		PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++		PNG_FILTER_TYPE_DEFAULT);
+ 	    /* invert monocrome pixels */
+ 	    png_set_invert_mono(png_ptr);
+ 	    break;
++	default:
++	    png_error(png_ptr, "invalid bit depth");
+     }
+ 
++    /* resolution is in pixels per meter vs. dpi */
++    png_set_pHYs(png_ptr, info_ptr, 
++	(png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54)),
++	(png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54)),
++	PNG_RESOLUTION_METER);
++
+     /* set the palette if there is one */
+-    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
++    if (png_get_color_type(png_ptr, info_ptr)  == PNG_COLOR_TYPE_PALETTE) {
+ 	int i;
+ 	int num_colors = 1 << depth;
+ 	gx_color_value rgb[3];
++	png_color palette[256];
++
++	if (num_colors > 256)
++	    num_colors = 256;
+ 
+-	info_ptr->palette =
+-	    (void *)gs_alloc_bytes(mem, 256 * sizeof(png_color),
+-				   "png palette");
+-	if (info_ptr->palette == 0) {
+-	    code = gs_note_error(gs_error_VMerror);
+-	    goto done;
+-	}
+-	info_ptr->num_palette = num_colors;
+-	info_ptr->valid |= PNG_INFO_PLTE;
+ 	for (i = 0; i < num_colors; i++) {
+ 	    (*dev_proc(pdev, map_color_rgb)) ((gx_device *) pdev,
+ 					      (gx_color_index) i, rgb);
+-	    info_ptr->palette[i].red = gx_color_value_to_byte(rgb[0]);
+-	    info_ptr->palette[i].green = gx_color_value_to_byte(rgb[1]);
+-	    info_ptr->palette[i].blue = gx_color_value_to_byte(rgb[2]);
++	    palette[i].red = gx_color_value_to_byte(rgb[0]);
++	    palette[i].green = gx_color_value_to_byte(rgb[1]);
++	    palette[i].blue = gx_color_value_to_byte(rgb[2]);
+ 	}
++	png_set_PLTE(png_ptr, info_ptr, palette, num_colors);
+     }
+     /* add comment */
+     strncpy(software_key, "Software", sizeof(software_key));
+@@ -375,15 +382,14 @@ png_print_page(gx_device_printer * pdev,
+     text_png.key = software_key;
+     text_png.text = software_text;
+     text_png.text_length = strlen(software_text);
+-    info_ptr->text = &text_png;
+-    info_ptr->num_text = 1;
++    png_set_text(png_ptr, info_ptr, &text_png, 1);
+ 
+     /* write the file information */
+     png_write_info(png_ptr, info_ptr);
+ 
+     /* don't write the comments twice */
+-    info_ptr->num_text = 0;
+-    info_ptr->text = NULL;
++    /*info_ptr->num_text = 0;*/
++    /*info_ptr->text = NULL;*/
+ 
+     /* Write the contents of the image. */
+     for (y = 0; y < height; y++) {
+@@ -395,7 +401,7 @@ png_print_page(gx_device_printer * pdev,
+     png_write_end(png_ptr, info_ptr);
+ 
+     /* if you alloced the palette, free it here */
+-    gs_free_object(mem, info_ptr->palette, "png palette");
++    /*gs_free_object(mem, info_ptr->palette, "png palette");*/
+ 
+   done:
+     /* free the structures */
+@@ -405,6 +411,7 @@ png_print_page(gx_device_printer * pdev,
+     return code;
+ }
+ 
++#if 0 /* not required in 1.5 */
+ /*
+  * Patch around a static reference to a never-used procedure.
+  * This could be avoided if we were willing to edit pngconf.h to
+@@ -422,6 +429,7 @@ png_push_fill_buffer(png_structp png_ptr
+ {
+ }
+ #endif
++#endif
+ 
+ static int
+ pngalpha_open(gx_device * pdev)


Property changes on: trunk/print/ghostscript8/files/patch-libpng15
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/print/ghostscript8/files/pkg-message.in
===================================================================
--- trunk/print/ghostscript8/files/pkg-message.in	2015-05-30 15:47:18 UTC (rev 19254)
+++ trunk/print/ghostscript8/files/pkg-message.in	2015-05-30 16:13:03 UTC (rev 19255)
@@ -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).
+Note: in order to use the script "dvipdf", dvips must be installed.
+This program is provided by another package print/tex-dvipsk.
 
-Also note that FAPIfontmap and FAPIcidfmap in
-%%DATADIR%%/%%PORTVERSION%%/Resource/Init have to be configured first.
+FAPIfontmap and FAPIcidfmap in %%DATADIR%%/%%PORTVERSION%%/Resource/Init
+have to be configured if you want to use FAPI feature.

Modified: trunk/print/ghostscript8/pkg-plist
===================================================================
--- trunk/print/ghostscript8/pkg-plist	2015-05-30 15:47:18 UTC (rev 19254)
+++ trunk/print/ghostscript8/pkg-plist	2015-05-30 16:13:03 UTC (rev 19255)
@@ -680,4 +680,4 @@
 %%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
 %%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Letter.ps
 %%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
-%%CIDFONTDIR%%/CIDFont
+share/ghostscript/8.71/Resource/CIDFont



More information about the Midnightbsd-cvs mailing list