[44641] trunk/dports/devel/inventor

[css at macports.org]

Revision: 44641
          http://trac.macports.org/changeset/44641
Author:   css at macports.org
Date:     2009-01-01 10:29:50 -0800 (Thu, 01 Jan 2009)
Log Message:
-----------
Updated the Inventor port to build on Mac OS X 10.5.6. see #17568

 * Bumped the revision.
 * Added a dependency on the glw port.
 * Removed the iconv const patches to SoText2.c++, SoText3.c++, and TextWrapper.c++. I'm leaving the patches in the repository until we can verify that they're not needed for Tiger.
 * Set universal_variant no.
 * Added variant descriptions.
 * Modified a couple patches:
   * patch-localrules.apple.diff: added libcharset to LLDLIBS to avoid a link error.
   * patch-SoCalcParse.y.diff: new patch required by Leopard's more strict bison parser

Modified Paths:
--------------
    trunk/dports/devel/inventor/Portfile
    trunk/dports/devel/inventor/files/patch-localrules.apple.diff

Added Paths:
-----------
    trunk/dports/devel/inventor/files/patch-SoCalcParse.y.diff

Modified: trunk/dports/devel/inventor/Portfile
===================================================================
--- trunk/dports/devel/inventor/Portfile	2009-01-01 18:15:57 UTC (rev 44640)
+++ trunk/dports/devel/inventor/Portfile	2009-01-01 18:29:50 UTC (rev 44641)
@@ -4,10 +4,10 @@
 
 name	   inventor
 version	   2.1.5-10
-revision	2
+revision	3
 categories	devel graphics x11
 platforms	darwin
-maintainers	css at macports.org
+maintainers	css
 
 description	SGI Open InventorTM graphics toolkit
 long_description    Open InventorTM is an object-oriented 3D toolkit offering a comprehensive \
@@ -28,16 +28,15 @@
 		    lib:libXm.4:openmotif \
 		    port:freetype \
 		    lib:libjpeg.62:jpeg \
-		    lib:libdl:dlcompat
+		    lib:libdl:dlcompat \
+		    port:glw
 
 patchfiles	    patch-BarChart-GNUmakefile.diff \
 		    patch-Decal-GNUmakefile.diff \
 		    patch-GeneralizedCylinder-GNUmakefile.diff \
 		    patch-SceneViewer-GNUmakefile.diff \
+		    patch-SoCalcParse.y.diff \
 		    patch-SoGLTextureImageElement.c++.diff \
-		    patch-SoText2.c++.diff \
-		    patch-SoText3.c++.diff \
-		    patch-TextWrapper.c++.diff \
 		    patch-drop-GNUmakefile.diff \
 		    patch-flfreetype.h.diff \
 		    patch-gview-GNUmakefile.diff \
@@ -62,8 +61,8 @@
 	   reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/make/ivcommondefs
 }
 
+universal_variant	no
 use_configure	no
-
 build.env	DYLD_LIBRARY_PATH=${worksrcpath}/lib IVROOT=${destroot}
 
 destroot.env	${build.env}
@@ -74,13 +73,13 @@
 	      ${destroot}${prefix}/share/${name}
 }
 
-variant debug {
+variant debug description {build with debug information} {
     build.env-append      LIBTYPE=debug
     patchfiles-append     patch-SoV1NkCatalog.c++.diff \
                           patch-SoText3V2.c++.diff
 }
 
-variant imagelib {
+variant imagelib description {include the image library} {
 	post-destroot {
 		xinstall -m 644 -W ${worksrcpath}/libimage libimage.a \
 			${destroot}${prefix}/lib

Added: trunk/dports/devel/inventor/files/patch-SoCalcParse.y.diff
===================================================================
--- trunk/dports/devel/inventor/files/patch-SoCalcParse.y.diff	                        (rev 0)
+++ trunk/dports/devel/inventor/files/patch-SoCalcParse.y.diff	2009-01-01 18:29:50 UTC (rev 44641)
@@ -0,0 +1,11 @@
+--- lib/database/src/so/engines/SoCalcParse.y.orig	2008-12-07 18:31:30.000000000 -0500
++++ lib/database/src/so/engines/SoCalcParse.y	2008-12-07 18:32:19.000000000 -0500
+@@ -119,7 +119,7 @@
+ %type <expr> asgn primary_expression postfix_expression
+ %type <expr> unary_expression
+ %type <expr> multiplicative_expression additive_expression
+-%type <expr> additive_expression relational_expression
++%type <expr> relational_expression
+ %type <expr> equality_expression logical_AND_expression
+ %type <expr> logical_OR_expression conditional_expression
+ %type <list> args

Modified: trunk/dports/devel/inventor/files/patch-localrules.apple.diff
===================================================================
--- trunk/dports/devel/inventor/files/patch-localrules.apple.diff	2009-01-01 18:15:57 UTC (rev 44640)
+++ trunk/dports/devel/inventor/files/patch-localrules.apple.diff	2009-01-01 18:29:50 UTC (rev 44641)
@@ -5,7 +5,7 @@
  
  LIBDSO := $(LIBDSO:.so=.dylib)
 -LLDLIBS += -lXm -lXt -lX11 -lGLU -lGL -liconv -ldl -lcc_dynamic -lstdc++
-+LLDLIBS += -lXm -lXt -lX11 -lGLU -lGL -liconv -ldl
++LLDLIBS += -lXm -lXt -lX11 -lGLU -lGL -liconv -lcharset -ldl
  
  BUNDLE := $(DSO:.so=.bundle)
  DSO :=
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090101/6105014b/attachment-0001.html>