<pre style='margin:0'>
Andrea D'Amore (anddam) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/48f548d191c1c645a5375512c0ca5e0367c75eeb">https://github.com/macports/macports-ports/commit/48f548d191c1c645a5375512c0ca5e0367c75eeb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 48f548d191c1c645a5375512c0ca5e0367c75eeb
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Dec 13 01:17:57 2016 -0600
<span style='display:block; white-space:pre;color:#404040;'> transfig: Update to 3.2.5e
</span>---
print/transfig/Portfile | 12 ++++------
print/transfig/files/patch-c-cleanup.diff | 20 -----------------
print/transfig/files/patch-libpng-1.5.diff | 36 ------------------------------
3 files changed, 4 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/transfig/Portfile b/print/transfig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c3bf498..8567450 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/transfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/transfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
name transfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.5d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.2.5e
</span> categories print graphics
platforms darwin
license Permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,12 +19,11 @@ long_description TransFig is a set of tools for creating TeX documents \
</span> PiCTeX, PostScript, and TeXtyl.
homepage http://xfig.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:mcj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/mcj/mcj-source
</span> distname ${name}.${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 f9eac7f265668ecbfda6aaf7581989ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 90ff277cc9b3fa0d0313052fcf5e3ffad8652abc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6d6aff522bd9e886029bf317e7b9dcd495a5c0ef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cc919f081483c3f570abeca6a8cadd4796d25015 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8ec5a8f13254dd155622ed3ee0fda1382b1e2b5882d83b9aca1871f12a3e7744
</span>
depends_lib port:libpng \
port:xpm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +32,6 @@ depends_run port:netpbm
</span>
patchfiles patch-fig2dev-dev-Imakefile \
patch-fig2dev-Imakefile \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libpng-1.5.diff \
</span> patch-transfig-Imakefile \
patch-c-cleanup.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/transfig/files/patch-c-cleanup.diff b/print/transfig/files/patch-c-cleanup.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c026f00..2fe7724 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/transfig/files/patch-c-cleanup.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/transfig/files/patch-c-cleanup.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,26 +341,6 @@
</span>
/* print any whole-figure comments prefixed with "#" */
if (objects->comments) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./fig2dev/dev/readpng.c.orig 2013-04-10 15:00:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./fig2dev/dev/readpng.c 2013-04-10 15:01:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int bit_depth, color_type, interlace_type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int compression_type, filter_type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_bytep *row_pointers;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char *ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned char *ptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int num_palette;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_colorp palette;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_color_16 png_background;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -178,7 +182,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_read_image(png_ptr, row_pointers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* allocate the bitmap */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((pic->bitmap=malloc(rowsize*h))==NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((pic->bitmap=(unsigned char*)malloc(rowsize*h))==NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* copy it to our bitmap */
</span> --- ./fig2dev/dev/gencgm.c.orig 2013-04-10 14:17:32.000000000 -0400
+++ ./fig2dev/dev/gencgm.c 2013-04-10 14:19:57.000000000 -0400
@@ -139,7 +139,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/transfig/files/patch-libpng-1.5.diff b/print/transfig/files/patch-libpng-1.5.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 70e13d8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/transfig/files/patch-libpng-1.5.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fig2dev/dev/readpng.c.orig 2013-04-10 15:00:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fig2dev/dev/readpng.c 2013-04-10 15:01:25.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* set long jump here */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (setjmp(png_ptr->jmpbuf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (setjmp(png_jmpbuf(png_ptr))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* if we get here there was a problem reading the file */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,15 +78,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &interlace_type, &compression_type, &filter_type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (info_ptr->valid & PNG_INFO_gAMA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double gamma = 0.45;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (png_get_gAMA(png_ptr,info_ptr,&gamma))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_gamma(png_ptr, 2.2, gamma);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_set_gamma(png_ptr, 2.2, 0.45);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_gamma(png_ptr, 2.2, 0.45);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (info_ptr->valid & PNG_INFO_bKGD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* set the background to the one supplied */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- png_set_background(png_ptr, &info_ptr->background,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_color_16p background;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_get_bKGD(png_ptr,info_ptr,&background);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ png_set_background(png_ptr, background,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* blend the canvas background using the alpha channel */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (bgspec) {
</span></pre><pre style='margin:0'>
</pre>