[71102] trunk/dports/print
takanori at macports.org
takanori at macports.org
Wed Sep 1 03:32:06 PDT 2010
Revision: 71102
http://trac.macports.org/changeset/71102
Author: takanori at macports.org
Date: 2010-09-01 03:32:03 -0700 (Wed, 01 Sep 2010)
Log Message:
-----------
Ghostscript 9.00rc1
- http://permalink.gmane.org/gmane.comp.printing.ghostscript.devel/3242
- http://permalink.gmane.org/gmane.comp.printing.ghostscript.devel/3240
Modified Paths:
--------------
trunk/dports/print/ghostscript/Portfile
trunk/dports/print/ghostscript/files/patch-base_unix-dll.mak.diff
trunk/dports/print/ghostscript-fonts-hiragino/Portfile
Removed Paths:
-------------
trunk/dports/print/ghostscript/files/libpng14-compat.diff
trunk/dports/print/ghostscript/files/patch-Makefile.in.diff
trunk/dports/print/ghostscript/files/patch-base_gsfcmap.c.diff
trunk/dports/print/ghostscript/files/patch-doc_Use.htm.diff
trunk/dports/print/ghostscript/files/patch-psi_zfile.c.diff
Modified: trunk/dports/print/ghostscript/Portfile
===================================================================
--- trunk/dports/print/ghostscript/Portfile 2010-09-01 08:27:52 UTC (rev 71101)
+++ trunk/dports/print/ghostscript/Portfile 2010-09-01 10:32:03 UTC (rev 71102)
@@ -4,8 +4,8 @@
PortGroup muniversal 1.0
name ghostscript
-version 8.71
-revision 5
+version 9.00
+set version_sub rc1
categories print
maintainers takanori openmaintainer
description GPL Ghostscript, An interpreter for PostScript and PDF
@@ -15,21 +15,17 @@
supports many different printers and some displays.
platforms darwin
homepage http://www.cs.wisc.edu/~ghost/
-master_sites sourceforge:${name}:source \
+master_sites http://ghostscript.com/~chrisl/:source \
sourceforge:gs-fonts:fonts \
macports:pTeX:misc
-distfiles ${distname}.tar.gz:source \
+# sourceforge:${name}:source
+distfiles ${distname}${version_sub}.tar.gz:source \
ghostscript-fonts-other-6.0.tar.gz:fonts \
mappingresources4pdf_2unicode-20091208.tar.Z:misc \
mappingresources4pdf_other-20091208.tar.Z:misc
patchfiles patch-base_unix-dll.mak.diff \
- patch-base_stdpre.h.diff \
- libpng14-compat.diff \
- patch-psi_zfile.c.diff \
- patch-Makefile.in.diff \
- patch-doc_Use.htm.diff \
- patch-base_gsfcmap.c.diff
-checksums ${distname}.tar.gz rmd160 efce74cf22cf99b2b1a145df466e79a86e3dfefb \
+ patch-base_stdpre.h.diff
+checksums ${distname}${version_sub}.tar.gz rmd160 5ed89f680b7f5faa2b5fe207a87ee62a41a79581 \
ghostscript-fonts-other-6.0.tar.gz rmd160 ab60dbf71e7d91283a106c3df381cadfe173082f \
mappingresources4pdf_2unicode-20091208.tar.Z rmd160 bc1b86e6a5f0e022f88070195eb3e01e167114a7 \
mappingresources4pdf_other-20091208.tar.Z rmd160 1e2ea9af6be8b60c9a54963e542fa06ceb2daccd
@@ -77,19 +73,11 @@
configure.cppflags-delete "-I${prefix}/include"
configure.cppflags-append "-isystem${prefix}/include"
-# gs8.71: The default optimization flag (-O2) causes pdfwrite's strange 'Memory fault' problem.
-# See also: http://bugs.ghostscript.com/show_bug.cgi?id=691005
-configure.optflags -Os
-
configure.args --disable-compile-inits \
--disable-cups \
- --disable-gtk
+ --disable-gtk \
+ --with-system-libtiff
-pre-configure {
- # rebuild jbig2dec/configure manually
- system "cd ${worksrcpath}/jbig2dec && autoreconf ${autoreconf.pre_args} ${autoreconf.args}"
-}
-
build.target so
use_parallel_build no
Deleted: trunk/dports/print/ghostscript/files/libpng14-compat.diff
===================================================================
--- trunk/dports/print/ghostscript/files/libpng14-compat.diff 2010-09-01 08:27:52 UTC (rev 71101)
+++ trunk/dports/print/ghostscript/files/libpng14-compat.diff 2010-09-01 10:32:03 UTC (rev 71102)
@@ -1,24 +0,0 @@
-diff -Naur ghostscript-8.71.orig/base/configure.ac ghostscript-8.71/base/configure.ac
---- base/configure.ac 2009-11-24 09:36:27.000000000 +0100
-+++ base/configure.ac 2010-03-08 12:35:01.803968064 +0100
-@@ -402,7 +402,7 @@
- PNGDEVS="$PNGDEVS_ALL"
- else
- AC_MSG_RESULT([no])
-- AC_CHECK_LIB(png, png_check_sig, [
-+ AC_CHECK_LIB(png, png_sig_cmp, [
- AC_CHECK_HEADERS(png.h, [
- SHARE_LIBPNG=1
- PNGDEVS="$PNGDEVS_ALL"
-diff -Naur ghostscript-8.71.orig/jbig2dec/configure.ac ghostscript-8.71/jbig2dec/configure.ac
---- jbig2dec/configure.ac 2010-02-02 20:30:15.000000000 +0100
-+++ jbig2dec/configure.ac 2010-03-08 12:35:01.803968064 +0100
-@@ -45,7 +45,7 @@
- fi
- dnl libpng requires pow() which may be in libm
- AC_SEARCH_LIBS([pow], [m])
-- AC_CHECK_LIB([png], [png_check_sig], [
-+ AC_CHECK_LIB([png], [png_sig_cmp], [
- AC_CHECK_LIB([z], [deflate], [
- AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)])
- LIBS="-lpng -lz $LIBS"
Deleted: trunk/dports/print/ghostscript/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/print/ghostscript/files/patch-Makefile.in.diff 2010-09-01 08:27:52 UTC (rev 71101)
+++ trunk/dports/print/ghostscript/files/patch-Makefile.in.diff 2010-09-01 10:32:03 UTC (rev 71102)
@@ -1,17 +0,0 @@
---- Makefile.in.orig 2009-12-18 16:04:10.000000000 +0900
-+++ Makefile.in 2010-07-27 21:50:52.000000000 +0900
-@@ -96,12 +96,9 @@
-
- # Define whether or not searching for initialization files should always
- # look in the current directory first. This leads to well-known security
--# and confusion problems, but users insist on it.
--# NOTE: this also affects searching for files named on the command line:
--# see the "File searching" section of Use.htm for full details.
--# Because of this, setting SEARCH_HERE_FIRST to 0 is not recommended.
-+# and confusion problems, but may be convenient sometimes.
-
--SEARCH_HERE_FIRST=1
-+SEARCH_HERE_FIRST=0
-
- # Define the name of the interpreter initialization file.
- # (There is no reason to change this.)
Deleted: trunk/dports/print/ghostscript/files/patch-base_gsfcmap.c.diff
===================================================================
--- trunk/dports/print/ghostscript/files/patch-base_gsfcmap.c.diff 2010-09-01 08:27:52 UTC (rev 71101)
+++ trunk/dports/print/ghostscript/files/patch-base_gsfcmap.c.diff 2010-09-01 10:32:03 UTC (rev 71102)
@@ -1,23 +0,0 @@
---- base/gsfcmap.c 2010-05-03 04:13:30 UTC (rev 11169)
-+++ base/gsfcmap.c 2010-05-03 13:25:52 UTC (rev 11170)
-@@ -500,12 +500,20 @@
- break;
- }
- penum->index[1] = j;
-+ if (i > 255) {
- penum->entry.key[0][0] = (uchar)(i >> 8);
- penum->entry.key[0][cmap->key_size - 1] = (uchar)(i & 0xFF);
- penum->entry.key[1][0] = (uchar)(j >> 8);
- penum->entry.key[1][cmap->key_size - 1] = (uchar)((j - 1) & 0xFF);
- memcpy(penum->temp_value, map + i * gs_cmap_ToUnicode_code_bytes,
- gs_cmap_ToUnicode_code_bytes);
-+ } else {
-+ penum->entry.key[0][0] = (uchar)(i);
-+ penum->entry.key[1][0] = (uchar)(j-1);
-+ penum->entry.key_size = 1;
-+ memcpy(penum->temp_value, map + i * gs_cmap_ToUnicode_code_bytes,
-+ gs_cmap_ToUnicode_code_bytes);
-+ }
- return 0;
- }
-
Modified: trunk/dports/print/ghostscript/files/patch-base_unix-dll.mak.diff
===================================================================
--- trunk/dports/print/ghostscript/files/patch-base_unix-dll.mak.diff 2010-09-01 08:27:52 UTC (rev 71101)
+++ trunk/dports/print/ghostscript/files/patch-base_unix-dll.mak.diff 2010-09-01 10:32:03 UTC (rev 71102)
@@ -1,5 +1,5 @@
---- base/unix-dll.mak.orig 2009-10-20 05:24:53.000000000 +0900
-+++ base/unix-dll.mak 2010-02-12 12:39:01.000000000 +0900
+--- base/unix-dll.mak.orig 2010-07-23 17:22:43.000000000 +0900
++++ base/unix-dll.mak 2010-09-01 18:44:52.000000000 +0900
@@ -45,19 +45,19 @@
GS_SONAME_BASE=lib$(GS)
@@ -30,8 +30,8 @@
#LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
GS_SO=$(BINDIR)/$(GS_SONAME)
-@@ -80,11 +80,11 @@
-
+@@ -79,11 +79,11 @@
+ # Build the small Ghostscript loaders, with Gtk+ and without
$(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
- $(LDFLAGS) -L$(BINDIR) -l$(GS)
Deleted: trunk/dports/print/ghostscript/files/patch-doc_Use.htm.diff
===================================================================
--- trunk/dports/print/ghostscript/files/patch-doc_Use.htm.diff 2010-09-01 08:27:52 UTC (rev 71101)
+++ trunk/dports/print/ghostscript/files/patch-doc_Use.htm.diff 2010-09-01 10:32:03 UTC (rev 71102)
@@ -1,48 +0,0 @@
---- doc/Use.htm.orig 2010-02-11 03:17:48.000000000 +0900
-+++ doc/Use.htm 2010-07-27 21:55:47.000000000 +0900
-@@ -823,8 +823,8 @@
- using the name given. Otherwise it tries directories in this order:
-
- <ol>
--<li>The current directory (unless disabled by the
--<a href="#P-_switch"><code>-P-</code> switch</a>);
-+<li>The current directory if enabled by the
-+<a href="#P-_switch"><code>-P</code> switch</a>;
-
- <li>The directories specified by <a href="#I_switch"><code>-I</code>
- switches</a> in the command line, if any;
-@@ -847,13 +847,10 @@
- directory or a list of directories separated by a character appropriate for
- the operating system ("<code>:</code>" on Unix systems,
- "<code>,</code>" on VMS systems, and
--"<code>;</code>" on MS Windows systems). We think that trying
--the current directory first is a very bad idea -- it opens serious security
--loopholes and can lead to very confusing errors if one has more than one
--version of Ghostscript in one's environment -- but when we attempted to
--change it, users insisted that we change it back. You can disable looking
--in the current directory first by using the
--<a href="#P_switch"><code>-P-</code> switch</a>.
-+"<code>;</code>" on MS Windows systems).
-+By default, Ghostscript no longer searches the current directory first
-+but provides <a href="#P_switch"><code>-P</code> switch</a> for a degree
-+of backward compatibility.
-
- <p>
- Note that Ghostscript does not use this file searching algorithm for the
-@@ -2061,14 +2058,14 @@
- <dl>
- <dt><a name="P_switch"></a><code>-P</code>
- <dd>Makes Ghostscript look first in the current directory for library
--files. This is currently the default.
-+files.
- </dl>
-
- <dl>
- <dt><a name="P-_switch"></a><code>-P-</code>
- <dd>Makes Ghostscript <b><em>not</em></b> look first in the current
- directory for library files (unless, of course, the first explicitly
--supplied directory is "<code>.</code>").
-+supplied directory is "<code>.</code>"). This is now the default.
- </dl>
-
- <h4><a name="Parameters"></a>Setting parameters</h4>
Deleted: trunk/dports/print/ghostscript/files/patch-psi_zfile.c.diff
===================================================================
--- trunk/dports/print/ghostscript/files/patch-psi_zfile.c.diff 2010-09-01 08:27:52 UTC (rev 71101)
+++ trunk/dports/print/ghostscript/files/patch-psi_zfile.c.diff 2010-09-01 10:32:03 UTC (rev 71102)
@@ -1,208 +0,0 @@
---- psi/zfile.c.orig 2009-10-04 21:42:07.000000000 +0900
-+++ psi/zfile.c 2010-07-27 21:14:55.000000000 +0900
-@@ -902,6 +902,90 @@
- return 0;
- }
-
-+/* return zero for success, -ve for error, +1 for continue */
-+static int
-+lib_file_open_search_with_no_combine(gs_file_path_ptr lib_path, const gs_memory_t *mem, i_ctx_t *i_ctx_p,
-+ const char *fname, uint flen, char *buffer, int blen, uint *pclen, ref *pfile,
-+ gx_io_device *iodev, bool starting_arg_file, char *fmode)
-+{
-+ stream *s;
-+ uint blen1 = blen;
-+ if (gp_file_name_reduce(fname, flen, buffer, &blen1) != gp_combine_success)
-+ goto skip;
-+ if (iodev_os_open_file(iodev, (const char *)buffer, blen1,
-+ (const char *)fmode, &s, (gs_memory_t *)mem) == 0) {
-+ if (starting_arg_file ||
-+ check_file_permissions_aux(i_ctx_p, buffer, blen1) >= 0) {
-+ *pclen = blen1;
-+ make_stream_file(pfile, s, "r");
-+ return 0;
-+ }
-+ sclose(s);
-+ return_error(e_invalidfileaccess);
-+ }
-+ skip:;
-+ return 1;
-+}
-+
-+/* return zero for success, -ve for error, +1 for continue */
-+static int
-+lib_file_open_search_with_combine(gs_file_path_ptr lib_path, const gs_memory_t *mem, i_ctx_t *i_ctx_p,
-+ const char *fname, uint flen, char *buffer, int blen, uint *pclen, ref *pfile,
-+ gx_io_device *iodev, bool starting_arg_file, char *fmode)
-+{
-+ stream *s;
-+ const gs_file_path *pfpath = lib_path;
-+ uint pi;
-+
-+ for (pi = 0; pi < r_size(&pfpath->list); ++pi) {
-+ const ref *prdir = pfpath->list.value.refs + pi;
-+ const char *pstr = (const char *)prdir->value.const_bytes;
-+ uint plen = r_size(prdir), blen1 = blen;
-+ gs_parsed_file_name_t pname;
-+ gp_file_name_combine_result r;
-+
-+ /* We need to concatenate and parse the file name here
-+ * if this path has a %device% prefix. */
-+ if (pstr[0] == '%') {
-+ int code;
-+
-+ /* We concatenate directly since gp_file_name_combine_*
-+ * rules are not correct for other devices such as %rom% */
-+ code = gs_parse_file_name(&pname, pstr, plen);
-+ if (code < 0)
-+ continue;
-+ memcpy(buffer, pname.fname, pname.len);
-+ memcpy(buffer+pname.len, fname, flen);
-+ code = pname.iodev->procs.open_file(pname.iodev, buffer, pname.len + flen, fmode,
-+ &s, (gs_memory_t *)mem);
-+ if (code < 0)
-+ continue;
-+ make_stream_file(pfile, s, "r");
-+ /* fill in the buffer with the device concatenated */
-+ memcpy(buffer, pstr, plen);
-+ memcpy(buffer+plen, fname, flen);
-+ *pclen = plen + flen;
-+ return 0;
-+ } else {
-+ r = gp_file_name_combine(pstr, plen,
-+ fname, flen, false, buffer, &blen1);
-+ if (r != gp_combine_success)
-+ continue;
-+ if (iodev_os_open_file(iodev, (const char *)buffer, blen1, (const char *)fmode,
-+ &s, (gs_memory_t *)mem) == 0) {
-+ if (starting_arg_file ||
-+ check_file_permissions_aux(i_ctx_p, buffer, blen1) >= 0) {
-+ *pclen = blen1;
-+ make_stream_file(pfile, s, "r");
-+ return 0;
-+ }
-+ sclose(s);
-+ return_error(e_invalidfileaccess);
-+ }
-+ }
-+ }
-+ return 1;
-+}
-
- /* Return a file object of of the file searched for using the search paths. */
- /* The fname cannot contain a device part (%...%) but the lib paths might. */
-@@ -919,6 +1003,8 @@
- char fmode[4] = { 'r', 0, 0, 0 }; /* room for binary suffix */
- stream *s;
- gx_io_device *iodev = iodev_default;
-+ gs_main_instance *minst = get_minst_from_memory(mem);
-+ int code;
-
- /* when starting arg files (@ files) iodev_default is not yet set */
- if (iodev == 0)
-@@ -932,75 +1018,36 @@
- search_with_no_combine = starting_arg_file;
- search_with_combine = true;
- }
-- if (search_with_no_combine) {
-- uint blen1 = blen;
--
-- if (gp_file_name_reduce(fname, flen, buffer, &blen1) != gp_combine_success)
-- goto skip;
-- if (iodev_os_open_file(iodev, (const char *)buffer, blen1,
-- (const char *)fmode, &s, (gs_memory_t *)mem) == 0) {
-- if (starting_arg_file ||
-- check_file_permissions_aux(i_ctx_p, buffer, blen1) >= 0) {
-- *pclen = blen1;
-- make_stream_file(pfile, s, "r");
-- return 0;
-- }
-- sclose(s);
-- return_error(e_invalidfileaccess);
-- }
-- skip:;
-- }
-- if (search_with_combine) {
-- const gs_file_path *pfpath = lib_path;
-- uint pi;
--
-- for (pi = 0; pi < r_size(&pfpath->list); ++pi) {
-- const ref *prdir = pfpath->list.value.refs + pi;
-- const char *pstr = (const char *)prdir->value.const_bytes;
-- uint plen = r_size(prdir), blen1 = blen;
-- gs_parsed_file_name_t pname;
-- gp_file_name_combine_result r;
--
-- /* We need to concatenate and parse the file name here
-- * if this path has a %device% prefix. */
-- if (pstr[0] == '%') {
-- int code;
--
-- /* We concatenate directly since gp_file_name_combine_*
-- * rules are not correct for other devices such as %rom% */
-- code = gs_parse_file_name(&pname, pstr, plen);
-- if (code < 0)
-- continue;
-- memcpy(buffer, pname.fname, pname.len);
-- memcpy(buffer+pname.len, fname, flen);
-- code = pname.iodev->procs.open_file(pname.iodev, buffer, pname.len + flen, fmode,
-- &s, (gs_memory_t *)mem);
-- if (code < 0)
-- continue;
-- make_stream_file(pfile, s, "r");
-- /* fill in the buffer with the device concatenated */
-- memcpy(buffer, pstr, plen);
-- memcpy(buffer+plen, fname, flen);
-- *pclen = plen + flen;
-- return 0;
-- } else {
-- r = gp_file_name_combine(pstr, plen,
-- fname, flen, false, buffer, &blen1);
-- if (r != gp_combine_success)
-- continue;
-- if (iodev_os_open_file(iodev, (const char *)buffer, blen1, (const char *)fmode,
-- &s, (gs_memory_t *)mem) == 0) {
-- if (starting_arg_file ||
-- check_file_permissions_aux(i_ctx_p, buffer, blen1) >= 0) {
-- *pclen = blen1;
-- make_stream_file(pfile, s, "r");
-- return 0;
-- }
-- sclose(s);
-- return_error(e_invalidfileaccess);
-- }
-- }
-- }
-+ if (minst->search_here_first) {
-+ if (search_with_no_combine) {
-+ code = lib_file_open_search_with_no_combine(lib_path, mem, i_ctx_p,
-+ fname, flen, buffer, blen, pclen, pfile,
-+ iodev, starting_arg_file, fmode);
-+ if (code <= 0) /* +ve means continue continue */
-+ return code;
-+ }
-+ if (search_with_combine) {
-+ code = lib_file_open_search_with_combine(lib_path, mem, i_ctx_p,
-+ fname, flen, buffer, blen, pclen, pfile,
-+ iodev, starting_arg_file, fmode);
-+ if (code <= 0) /* +ve means continue searching */
-+ return code;
-+ }
-+ } else {
-+ if (search_with_combine) {
-+ code = lib_file_open_search_with_combine(lib_path, mem, i_ctx_p,
-+ fname, flen, buffer, blen, pclen, pfile,
-+ iodev, starting_arg_file, fmode);
-+ if (code <= 0) /* +ve means continue searching */
-+ return code;
-+ }
-+ if (search_with_no_combine) {
-+ code = lib_file_open_search_with_no_combine(lib_path, mem, i_ctx_p,
-+ fname, flen, buffer, blen, pclen, pfile,
-+ iodev, starting_arg_file, fmode);
-+ if (code <= 0) /* +ve means continue searching */
-+ return code;
-+ }
- }
- return_error(e_undefinedfilename);
- }
Modified: trunk/dports/print/ghostscript-fonts-hiragino/Portfile
===================================================================
--- trunk/dports/print/ghostscript-fonts-hiragino/Portfile 2010-09-01 08:27:52 UTC (rev 71101)
+++ trunk/dports/print/ghostscript-fonts-hiragino/Portfile 2010-09-01 10:32:03 UTC (rev 71102)
@@ -3,13 +3,14 @@
PortSystem 1.0
name ghostscript-fonts-hiragino
-version 8.71
+version 9.00
categories print japanese chinese
maintainers takanori openmaintainer
description Hiragino font for ghostscript ${version}
long_description \
${description}
platforms macosx
+supported_archs noarch
homepage
master_sites
distfiles
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100901/5112c544/attachment-0001.html>
More information about the macports-changes
mailing list