[106610] trunk/dports/graphics/OpenSceneGraph-devel

[devans at macports.org]

Revision: 106610
          https://trac.macports.org/changeset/106610
Author:   devans at macports.org
Date:     2013-05-31 18:09:27 -0700 (Fri, 31 May 2013)
Log Message:
-----------
OpenSceneGraph-devel: conditionally disable LibVNCServer support to avoid opportunitistic linking.

Modified Paths:
--------------
    trunk/dports/graphics/OpenSceneGraph-devel/Portfile
    trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/graphics/OpenSceneGraph-devel/Portfile
===================================================================
--- trunk/dports/graphics/OpenSceneGraph-devel/Portfile	2013-06-01 00:59:41 UTC (rev 106609)
+++ trunk/dports/graphics/OpenSceneGraph-devel/Portfile	2013-06-01 01:09:27 UTC (rev 106610)
@@ -8,6 +8,7 @@
 conflicts               OpenSceneGraph
 set my_name             OpenSceneGraph
 version                 3.1.7
+revision                1
 platforms               darwin
 categories              graphics
 maintainers             nomaintainer

Modified: trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff	2013-06-01 00:59:41 UTC (rev 106609)
+++ trunk/dports/graphics/OpenSceneGraph-devel/files/patch-CMakeLists.txt.diff	2013-06-01 01:09:27 UTC (rev 106610)
@@ -1,5 +1,5 @@
 --- CMakeLists.txt.orig	2013-05-23 07:14:51.000000000 -0700
-+++ CMakeLists.txt	2013-05-30 01:12:28.000000000 -0700
++++ CMakeLists.txt	2013-05-31 17:30:14.000000000 -0700
 @@ -220,10 +220,10 @@
  IF(NOT ANDROID)
  IF(APPLE)
@@ -15,7 +15,7 @@
      # Trying to get CMake to generate an XCode IPhone project, current efforts are to get iphoneos sdk 3.1 working
      # Added option which needs manually setting to select the IPhone SDK for building. We can only have one of the below
      # set to true. Should realy have an OSG_BUILD_PLATFORM variable that we set to our desired platform
-@@ -493,27 +493,70 @@
+@@ -493,27 +493,75 @@
  ELSE()
  # Common to all platforms except android:
      FIND_PACKAGE(FreeType)
@@ -67,7 +67,13 @@
 +        SET(GTA_FOUND NO)
 +    ENDIF()
      FIND_PACKAGE(CURL)
-     FIND_PACKAGE(LibVNCServer)
+-    FIND_PACKAGE(LibVNCServer)
++    OPTION(OSG_ENABLE_LIBVNCSERVER "Enable LibVNCServer support" OFF)
++    IF(OSG_ENABLE_LIBVNCSERVER)
++        FIND_PACKAGE(LibVNCServer)
++    ELSE()
++        SET(LIBVNCSERVER_FOUND NO)
++    ENDIF()
      FIND_PACKAGE(OurDCMTK)
      FIND_PACKAGE(OpenAL)
 -    FIND_PACKAGE(FFmpeg)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130531/3ca70819/attachment.html>