<!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>[144718] trunk/dports/devel/inventor</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/144718">144718</a></dd>
<dt>Author</dt> <dd>css@macports.org</dd>
<dt>Date</dt> <dd>2016-01-15 19:39:31 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>inventor: fix building on El Capitan. refs #48558
* add libGLU dependency
* patch for explicitly using `$DYLD_LIBRARY_PATH`
* fix main functions not declaring return types</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelinventorPortfile">trunk/dports/devel/inventor/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelinventorfilespatchivcommonrulesdiff">trunk/dports/devel/inventor/files/patch-ivcommonrules.diff</a></li>
<li><a href="#trunkdportsdevelinventorfilespatchlibFLflcdiff">trunk/dports/devel/inventor/files/patch-libFL-fl.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelinventorPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/inventor/Portfile (144717 => 144718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/inventor/Portfile 2016-01-16 02:58:04 UTC (rev 144717)
+++ trunk/dports/devel/inventor/Portfile 2016-01-16 03:39:31 UTC (rev 144718)
</span><span class="lines">@@ -4,12 +4,13 @@
</span><span class="cx">
</span><span class="cx"> name inventor
</span><span class="cx"> version 2.1.5-10
</span><del>-revision 9
</del><ins>+revision 10
</ins><span class="cx"> categories devel graphics x11
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers css
</span><span class="cx">
</span><span class="cx"> description SGI Open InventorTM graphics toolkit
</span><ins>+license GPL-2
</ins><span class="cx"> long_description Open InventorTM is an object-oriented 3D toolkit offering a comprehensive \
</span><span class="cx"> solution to interactive graphics programming problems. It presents a \
</span><span class="cx"> programming model based on a 3D scene database that dramatically simplifies \
</span><span class="lines">@@ -26,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> depends_lib port:xorg-libXi \
</span><span class="cx"> port:xorg-libXt \
</span><ins>+ port:libGLU \
</ins><span class="cx"> port:freetype \
</span><span class="cx"> port:jpeg \
</span><span class="cx"> port:glw
</span><span class="lines">@@ -41,12 +43,14 @@
</span><span class="cx"> patch-gview-GNUmakefile.diff \
</span><span class="cx"> patch-ivcat-GNUmakefile.diff \
</span><span class="cx"> patch-ivcommondefs.diff \
</span><ins>+ patch-ivcommonrules.diff \
</ins><span class="cx"> patch-ivdowngrade-GNUmakefile.diff \
</span><span class="cx"> patch-ivfix-GNUmakefile.diff \
</span><span class="cx"> patch-ivinfo-GNUmakefile.diff \
</span><span class="cx"> patch-ivman-GNUmakefile.diff \
</span><span class="cx"> patch-ivview-GNUmakefile.diff \
</span><span class="cx"> patch-lib-GNUmakefile.diff \
</span><ins>+ patch-libFL-fl.c.diff \
</ins><span class="cx"> patch-libSoXt-GNUmakefile.diff \
</span><span class="cx"> patch-localrules.apple.diff \
</span><span class="cx"> patch-machine.h.diff \
</span><span class="lines">@@ -62,8 +66,37 @@
</span><span class="cx"> patch-LP64.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><ins>+ # gcc allows for declaring main without a return type, clang does not.
+ reinplace "s|^main|int main|" \
+${worksrcpath}/apps/demos/qmorf/quadCube.c++ \
+${worksrcpath}/apps/demos/qmorf/quadSheet.c++ \
+${worksrcpath}/apps/demos/qmorf/quadSphere.c++ \
+${worksrcpath}/apps/examples/Mentor/CXX/09.3.Search.c++ \
+${worksrcpath}/apps/examples/Mentor/CXX/09.5.GenSph.c++ \
+${worksrcpath}/apps/examples/Mentor/CXX/17.3.GLFloor.c++ \
+${worksrcpath}/apps/examples/Toolmaker/02.Nodes/newNodes.c++ \
+${worksrcpath}/apps/examples/Toolmaker/04.Actions/printVolume.c++ \
+${worksrcpath}/apps/examples/Toolmaker/07.Nodekits/jumpingJackKitTest.c++ \
+${worksrcpath}/apps/examples/Toolmaker/07.Nodekits/pyramidKitTest.c++ \
+${worksrcpath}/apps/examples/Toolmaker/08.Manips/newManips.c++ \
+${worksrcpath}/apps/samples/4view/4view.c++ \
+${worksrcpath}/apps/samples/ivNodeKitStructure/ivNodeKitStructure.c++ \
+${worksrcpath}/apps/samples/ivToInclude/ivToIncludeFile.c++ \
+${worksrcpath}/apps/samples/ivToInclude/testResults.c++ \
+${worksrcpath}/apps/tools/ivcat/ivcat.c++ \
+${worksrcpath}/apps/tools/ivfix/ivfix.c++ \
+${worksrcpath}/apps/tools/ivinfo/ivinfo.c++ \
+${worksrcpath}/apps/tools/ivperf/ivperf.c++ \
+${worksrcpath}/doc/man/ivman/Main.c++ \
+${worksrcpath}/tools/ppp/ppp.c++
+ reinplace "s|unsigned int argc| int argc |" ${worksrcpath}/apps/samples/widgets/componentTest.c++
+
+ # path substitutions
</ins><span class="cx"> reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/make/ivcommondefs
</span><span class="cx"> reinplace "s|/usr/X11R6|${prefix}|" ${worksrcpath}/make/ivcommondefs
</span><ins>+
+ # El Capitan security workaround
+ reinplace "s|__WORKSRCPATH__|${worksrcpath}/lib|" ${worksrcpath}/make/ivcommonrules
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> universal_variant no
</span></span></pre></div>
<a id="trunkdportsdevelinventorfilespatchivcommonrulesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/inventor/files/patch-ivcommonrules.diff (0 => 144718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/inventor/files/patch-ivcommonrules.diff (rev 0)
+++ trunk/dports/devel/inventor/files/patch-ivcommonrules.diff 2016-01-16 03:39:31 UTC (rev 144718)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- make/ivcommonrules.orig 2016-01-15 21:22:06.000000000 -0500
++++ make/ivcommonrules 2016-01-15 21:23:54.000000000 -0500
+@@ -53,7 +53,7 @@
+ .SUFFIXES: .ivm .3iv
+
+ .ivm.3iv:
+- (cd .. && $(IVMAN) `$(MAKEMANDIRS) $(*F)`) > $@
++ (cd .. && DYLD_LIBRARY_PATH=__WORKSRCPATH__ $(IVMAN) `$(MAKEMANDIRS) $(*F)`) > $@
+
+ MAN3PAGES = $(IVMFILES:.ivm=.3iv)
+
</ins></span></pre></div>
<a id="trunkdportsdevelinventorfilespatchlibFLflcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/inventor/files/patch-libFL-fl.c.diff (0 => 144718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/inventor/files/patch-libFL-fl.c.diff (rev 0)
+++ trunk/dports/devel/inventor/files/patch-libFL-fl.c.diff 2016-01-16 03:39:31 UTC (rev 144718)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- libFL/ang/fl.c.orig 2003-07-11 18:40:53.000000000 -0400
++++ libFL/ang/fl.c 2016-01-14 23:33:03.000000000 -0500
+@@ -245,7 +245,7 @@
+ _flDestroyFont(FLfontStruct *fs)
+ {
+ FLfontImpl *impl = _flGetFontImpl();
+-#if defined(WIN32) || defined(__APPLE__)
++#if defined(WIN32)
+ CHECK(fs, impl, destroyFont, NULL);
+ #else
+ CHECK(fs, impl, destroyFont, /* nothing to return */);
</ins></span></pre>
</div>
</div>
</body>
</html>