[144718] trunk/dports/devel/inventor

[css at macports.org]

Revision: 144718
          https://trac.macports.org/changeset/144718
Author:   css at macports.org
Date:     2016-01-15 19:39:31 -0800 (Fri, 15 Jan 2016)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/dports/devel/inventor/Portfile

Added Paths:
-----------
    trunk/dports/devel/inventor/files/patch-ivcommonrules.diff
    trunk/dports/devel/inventor/files/patch-libFL-fl.c.diff

Modified: trunk/dports/devel/inventor/Portfile
===================================================================
--- 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)
@@ -4,12 +4,13 @@
 
 name	   inventor
 version	   2.1.5-10
-revision	9
+revision	10
 categories	devel graphics x11
 platforms	darwin
 maintainers	css
 
 description	SGI Open InventorTM graphics toolkit
+license		GPL-2
 long_description    Open InventorTM is an object-oriented 3D toolkit offering a comprehensive \
 		    solution to interactive graphics programming problems. It presents a \
 		    programming model based on a 3D  scene database that dramatically simplifies \
@@ -26,6 +27,7 @@
 
 depends_lib	    port:xorg-libXi \
 		    port:xorg-libXt \
+		    port:libGLU \
 		    port:freetype \
 		    port:jpeg \
 		    port:glw
@@ -41,12 +43,14 @@
 		    patch-gview-GNUmakefile.diff \
 		    patch-ivcat-GNUmakefile.diff \
 		    patch-ivcommondefs.diff \
+		    patch-ivcommonrules.diff \
 		    patch-ivdowngrade-GNUmakefile.diff \
 		    patch-ivfix-GNUmakefile.diff \
 		    patch-ivinfo-GNUmakefile.diff \
 		    patch-ivman-GNUmakefile.diff \
 		    patch-ivview-GNUmakefile.diff \
 		    patch-lib-GNUmakefile.diff \
+		    patch-libFL-fl.c.diff \
 		    patch-libSoXt-GNUmakefile.diff \
 		    patch-localrules.apple.diff \
 		    patch-machine.h.diff \
@@ -62,8 +66,37 @@
 		    patch-LP64.diff
 
 post-patch {
+	# 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
 	reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/make/ivcommondefs
 	reinplace "s|/usr/X11R6|${prefix}|" ${worksrcpath}/make/ivcommondefs
+
+	# El Capitan security workaround
+	reinplace "s|__WORKSRCPATH__|${worksrcpath}/lib|" ${worksrcpath}/make/ivcommonrules
 }
 
 universal_variant	no

Added: trunk/dports/devel/inventor/files/patch-ivcommonrules.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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)
+ 

Added: trunk/dports/devel/inventor/files/patch-libFL-fl.c.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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 */);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160115/95f9a445/attachment.html>