<!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>[115962] trunk/dports/tex/pgf</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/115962">115962</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-01-15 07:22:01 -0800 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>pgf: upgrade to 3.0.0, add some preliminary patches (see #42088)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstexpgfPortfile">trunk/dports/tex/pgf/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/tex/pgf/files/</li>
<li><a href="#trunkdportstexpgffilespatchMakefilediff">trunk/dports/tex/pgf/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportstexpgffilespatchMakefileConfigmkdiff">trunk/dports/tex/pgf/files/patch-MakefileConfig.mk.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstexpgfPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/tex/pgf/Portfile (115961 => 115962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/tex/pgf/Portfile 2014-01-15 15:06:14 UTC (rev 115961)
+++ trunk/dports/tex/pgf/Portfile 2014-01-15 15:22:01 UTC (rev 115962)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup texlive 1.0
</span><span class="cx">
</span><span class="cx"> name pgf
</span><del>-version 2.10
</del><ins>+version 3.0.0
</ins><span class="cx"> categories tex textproc
</span><span class="cx"> platforms darwin
</span><span class="cx"> license {GPL-2 LPPL-1.3}
</span><span class="lines">@@ -23,23 +23,39 @@
</span><span class="cx">
</span><span class="cx"> depends_lib bin:texhash:texlive-basic
</span><span class="cx">
</span><del>-master_sites sourceforge:pgf
</del><ins>+master_sites sourceforge:project/pgf/pgf/version%20${version}
</ins><span class="cx"> use_zip yes
</span><span class="cx"> distname ${name}_${version}.tds
</span><del>-checksums rmd160 85eea50acad282a3f13d11a87368c6f16e35ff49 \
- sha256 6d197e2a6a7bdadc81d180ef58ad2ef3e446fb07e05ac52821047d8c31b90b95
</del><ins>+checksums rmd160 572204fedbaf9034dc56d9049e40c919b08d4b9e \
+ sha256 672b15d0a73fcaee1efefdaf396db1d8313e08d91db9b15bfde293eb6132474e
</ins><span class="cx">
</span><span class="cx"> extract.mkdir yes
</span><span class="cx">
</span><ins>+# the patchfiles are only relevant if building the C code gets enabled one day,
+# but the patches are not complete yet (building the module is not working)
+patchfiles patch-MakefileConfig.mk.diff \
+ patch-Makefile.diff
+post-patch {
+ # instead of patching all this one could also create LocalMakefileConfig.mk
+ set mymakefileconfig ${worksrcpath}/source/generic/pgf/c/config/MakefileConfig.mk
+ reinplace s|@@PREFIX@@|${prefix}| ${mymakefileconfig}
+ reinplace s|@@CC@@|${configure.cc}| ${mymakefileconfig}
+ reinplace s|@@ARCHFLAGS@@|-arch\ ${build_arch}| ${mymakefileconfig}
+ reinplace s|@@CFLAGS@@|${configure.cflags}| ${mymakefileconfig}
+ reinplace s|@@LDFLAGS@@|${configure.ldflags}\ -llua| ${mymakefileconfig}
+}
+
</ins><span class="cx"> use_configure no
</span><span class="cx">
</span><ins>+# we won't build anything for now, but if anyone wants to finish the work,
+# see https://trac.macports.org/ticket/42088
</ins><span class="cx"> build { }
</span><ins>+# build.dir ${worksrcpath}/source/generic/pgf/c
</ins><span class="cx">
</span><span class="cx"> destroot {
</span><span class="cx"> set r ${workpath}/${name}_${version}.tds
</span><span class="cx"> file mkdir ${destroot}${texlive_texmfports}/
</span><span class="cx"> file copy ${r}/doc ${destroot}${texlive_texmfports}/
</span><del>- file copy ${r}/scripts ${destroot}${texlive_texmfports}/
</del><span class="cx"> file copy ${r}/source ${destroot}${texlive_texmfports}/
</span><span class="cx"> file copy ${r}/tex ${destroot}${texlive_texmfports}/
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportstexpgffilespatchMakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/tex/pgf/files/patch-Makefile.diff (0 => 115962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/tex/pgf/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/tex/pgf/files/patch-Makefile.diff 2014-01-15 15:22:01 UTC (rev 115962)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- source/generic/pgf/c/graphdrawing/pgf/gd/interface/c/Makefile.orig
++++ source/generic/pgf/c/graphdrawing/pgf/gd/interface/c/Makefile
+@@ -1,7 +1,7 @@
+ CONFIGDIR=../../../../../config
+ include $(CONFIGDIR)/MakefileConfig.mk
+
+-FLAGS=$(MYCFLAGS) $(ARCHFLAGS) -O2 -Wall -I$(LUAINCLUDES) -I$(PGFINCLUDES)
++FLAGS=$(MYCFLAGS) $(ARCHFLAGS) -Wall -I$(LUAINCLUDES) -I$(PGFINCLUDES)
+
+ all: InterfaceFromC.o InterfaceFromC++.o
+
+--- source/generic/pgf/c/graphdrawing/pgf/gd/examples/c/Makefile.orig
++++ source/generic/pgf/c/graphdrawing/pgf/gd/examples/c/Makefile
+@@ -31,5 +31,5 @@ SimpleDemoCPlusPlus.so: SimpleDemoCPlusPlus.o ../../interface/c/InterfaceFromC++
+ SimpleDemoCPlusPlus.o ../../interface/c/InterfaceFromC++.o ../../interface/c/InterfaceFromC.o
+
+ SimpleDemoCPlusPlus.o: SimpleDemoCPlusPlus.c++ ../../interface/c/InterfaceFromC++.h ../../interface/c/InterfaceFromC.h
+- g++ $(FLAGS) -c -o SimpleDemoCPlusPlus.o SimpleDemoCPlusPlus.c++
++ $(CC) $(FLAGS) -c -o SimpleDemoCPlusPlus.o SimpleDemoCPlusPlus.c++
+
</ins></span></pre></div>
<a id="trunkdportstexpgffilespatchMakefileConfigmkdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/tex/pgf/files/patch-MakefileConfig.mk.diff (0 => 115962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/tex/pgf/files/patch-MakefileConfig.mk.diff (rev 0)
+++ trunk/dports/tex/pgf/files/patch-MakefileConfig.mk.diff 2014-01-15 15:22:01 UTC (rev 115962)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+--- source/generic/pgf/c/config/MakefileConfig.mk.orig
++++ source/generic/pgf/c/config/MakefileConfig.mk
+@@ -1,6 +1,6 @@
+
+ # Where Lua is installed
+-LUAPATH=/usr/local/lua52
++LUAPATH=@@PREFIX@@
+
+ LUAINCLUDES = $(LUAPATH)/include
+ LUALIBPATH = $(LUAPATH)/lib
+@@ -22,20 +22,20 @@ INSTALLDIR=/usr/texbin/lib/luatex/lua
+
+
+ # If you need special flags:
+-MYCFLAGS=
+-MYLDFLAGS=
++MYCFLAGS=@@CFLAGS@@
++MYLDFLAGS=@@LDFLAGS@@
+
+ # Link flags for building a shared library
+-SHAREDFLAGS=
++SHAREDFLAGS=-shared
+
+ # Link flags for linking against the shared Lua lib
+ LINKSHAREDLUA=
+
+ # Architecture flags:
+-ARCHFLAGS=
++ARCHFLAGS=@@ARCHFLAGS@@
+
+ # The to-be-used compiler
+-CC=gcc
++CC=@@CC@@
+
+
+ # Now read local definition, which may overwrite the above
</ins></span></pre>
</div>
</div>
</body>
</html>