<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118745] trunk/dports/graphics/jbigkit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118745">118745</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-04-10 05:16:56 -0700 (Thu, 10 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>jbigkit: update to 2.1 (#43308); update master_sites to avoid redirects and to fix the livecheck; use the right compiler and flags in all parts of the build, not just the main Makefile</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsjbigkitPortfile">trunk/dports/graphics/jbigkit/Portfile</a></li>
<li><a href="#trunkdportsgraphicsjbigkitfilespatchlibjbig_Makefile_darwin">trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsjbigkitfilespatchMakefile">trunk/dports/graphics/jbigkit/files/patch-Makefile</a></li>
<li><a href="#trunkdportsgraphicsjbigkitfilespatchpbmtools_Makefile">trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsjbigkitPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/jbigkit/Portfile (118744 => 118745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/jbigkit/Portfile 2014-04-10 11:50:51 UTC (rev 118744)
+++ trunk/dports/graphics/jbigkit/Portfile 2014-04-10 12:16:56 UTC (rev 118745)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name jbigkit
</span><del>-version 2.0
-revision 2
</del><ins>+version 2.1
</ins><span class="cx"> categories graphics
</span><span class="cx"> license GPL-2+
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -21,21 +20,17 @@
</span><span class="cx"> decompression programs with a simple command line \
</span><span class="cx"> interface (similar to the converters found in netpbm).
</span><span class="cx">
</span><del>-homepage http://www.cl.cam.ac.uk/~mgk25/${name}
-master_sites http://www.cl.cam.ac.uk/~mgk25/download/
</del><ins>+homepage http://www.cl.cam.ac.uk/~mgk25/${name}/
+master_sites ${homepage}download/
</ins><span class="cx">
</span><del>-checksums md5 3dd87f605abb1a97a22dc79d8b3e8f6c \
- sha1 cfb7d3121f02a74bfb229217858a0d149b6589ef \
- rmd160 4b1b8358203c2bd86e034703d666c1453c60e572
</del><ins>+checksums rmd160 71cc51fce3f65d8d9abf9ff52c29edf5469eb52f \
+ sha256 de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932
</ins><span class="cx">
</span><del>-worksrcdir ${name}
</del><ins>+use_configure no
</ins><span class="cx">
</span><del>-patchfiles patch-Makefile patch-pbmtools_Makefile
</del><ins>+variant universal {}
</ins><span class="cx">
</span><del>-configure {
- reinplace "s|__CC__|${configure.cc}|" ${worksrcpath}/Makefile
- reinplace "s|__CFLAGS__|${configure.cppflags} [get_canonical_archflags] ${configure.cflags}|" ${worksrcpath}/Makefile
-}
</del><ins>+build.args CC="${configure.cc} ${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]"
</ins><span class="cx">
</span><span class="cx"> test.run yes
</span><span class="cx"> test.target test
</span></span></pre></div>
<a id="trunkdportsgraphicsjbigkitfilespatchMakefile"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/jbigkit/files/patch-Makefile (118744 => 118745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/jbigkit/files/patch-Makefile 2014-04-10 11:50:51 UTC (rev 118744)
+++ trunk/dports/graphics/jbigkit/files/patch-Makefile 2014-04-10 12:16:56 UTC (rev 118745)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- Makefile.orig 2009-06-06 01:49:36.000000000 -0700
-+++ Makefile 2009-06-06 01:49:55.000000000 -0700
-@@ -2,10 +2,10 @@
- # $Id: Makefile 1303 2008-08-30 20:16:20Z mgk25 $
-
- # Select an ANSI/ISO C compiler here, GNU gcc is recommended
--CC = gcc
-+CC = __CC__
-
- # Options for the compiler: A high optimization level is suggested
--CCFLAGS = -O2 -W
-+CCFLAGS = -W __CFLAGS__
- #CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG # developer only
-
- CFLAGS = $(CCFLAGS) -I../libjbig
</del></span></pre></div>
<a id="trunkdportsgraphicsjbigkitfilespatchlibjbig_Makefile_darwin"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin (118744 => 118745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin 2014-04-10 11:50:51 UTC (rev 118744)
+++ trunk/dports/graphics/jbigkit/files/patch-libjbig_Makefile_darwin 2014-04-10 12:16:56 UTC (rev 118745)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><del>---- libjbig/Makefile.orig 2010-02-26 14:31:06.000000000 -0800
-+++ libjbig/Makefile 2010-02-26 14:31:31.000000000 -0800
-@@ -7,7 +7,7 @@ CC = gcc
</del><ins>+--- libjbig/Makefile.orig 2014-03-27 13:47:15.000000000 -0500
++++ libjbig/Makefile 2014-04-09 15:24:57.000000000 -0500
+@@ -6,7 +6,7 @@
</ins><span class="cx"> # Options for the compiler: A high optimization level is suggested
</span><del>- CFLAGS = -g -O -Wall -ansi -pedantic # --coverage
</del><ins>+ CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
</ins><span class="cx">
</span><del>--all: libjbig.a tstcodec tstcodec85
</del><ins>+-all: libjbig.a libjbig85.a tstcodec tstcodec85
</ins><span class="cx"> +all: libjbig.dylib
</span><span class="cx">
</span><span class="cx"> tstcodec: tstcodec.o jbig.o jbig_ar.o
</span><del>- $(CC) $(CFLAGS) -o tstcodec $+
-@@ -25,6 +25,13 @@ libjbig85.a: jbig85.o jbig_ar.o
</del><ins>+ $(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
+@@ -24,6 +24,13 @@
</ins><span class="cx"> ar rc libjbig85.a jbig85.o jbig_ar.o
</span><span class="cx"> -ranlib libjbig85.a
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgraphicsjbigkitfilespatchpbmtools_Makefile"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile (118744 => 118745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile 2014-04-10 11:50:51 UTC (rev 118744)
+++ trunk/dports/graphics/jbigkit/files/patch-pbmtools_Makefile 2014-04-10 12:16:56 UTC (rev 118745)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- pbmtools/Makefile.orig 2010-02-26 14:26:44.000000000 -0800
-+++ pbmtools/Makefile 2010-02-26 14:27:31.000000000 -0800
-@@ -9,13 +9,13 @@ CFLAGS = -g -Wall -ansi -pedantic -I../l
-
- .SUFFIXES: .1 .5 .txt $(SUFFIXES)
-
--all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \
-+all: pbmtojbg jbgtopbm \
- pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
-
--pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
-+pbmtojbg: pbmtojbg.o
- $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
-
--jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
-+jbgtopbm: jbgtopbm.o
- $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
-
- pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
</del></span></pre>
</div>
</div>
</body>
</html>