From owner-svn-ports-all@freebsd.org Wed Mar 21 14:26:53 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70BA8F6BECE; Wed, 21 Mar 2018 14:26:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 23B3171D4B; Wed, 21 Mar 2018 14:26:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E93B2BD9C; Wed, 21 Mar 2018 14:26:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2LEQrQr081601; Wed, 21 Mar 2018 14:26:53 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2LEQqxu081600; Wed, 21 Mar 2018 14:26:52 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201803211426.w2LEQqxu081600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 21 Mar 2018 14:26:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465180 - head/graphics/osg/files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/graphics/osg/files X-SVN-Commit-Revision: 465180 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Mar 2018 14:26:53 -0000 Author: amdmi3 Date: Wed Mar 21 14:26:52 2018 New Revision: 465180 URL: https://svnweb.freebsd.org/changeset/ports/465180 Log: - Fix build in presence of older version of osg PR: 226681 Reported by: pkubaj@anongoth.pl Modified: head/graphics/osg/files/patch-CMakeLists.txt Modified: head/graphics/osg/files/patch-CMakeLists.txt ============================================================================== --- head/graphics/osg/files/patch-CMakeLists.txt Wed Mar 21 14:11:31 2018 (r465179) +++ head/graphics/osg/files/patch-CMakeLists.txt Wed Mar 21 14:26:52 2018 (r465180) @@ -1,7 +1,17 @@ ---- CMakeLists.txt.orig 2011-07-31 11:50:34.000000000 +0400 -+++ CMakeLists.txt 2012-03-05 05:54:52.485029323 +0400 -@@ -588,7 +588,7 @@ +--- CMakeLists.txt.orig 2017-08-28 16:50:49 UTC ++++ CMakeLists.txt +@@ -252,6 +252,9 @@ ENDIF() + INCLUDE_DIRECTORIES( + ${OpenSceneGraph_SOURCE_DIR}/include ++) ++ ++INCLUDE_DIRECTORIES(SYSTEM + ${OPENGL_INCLUDE_DIR} + ) + +@@ -846,7 +849,7 @@ ENDIF() + IF(UNIX AND NOT WIN32 AND NOT APPLE) IF(CMAKE_SIZEOF_VOID_P MATCHES "8") - SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") @@ -9,7 +19,7 @@ MARK_AS_ADVANCED(LIB_POSTFIX) ENDIF() ENDIF() -@@ -972,7 +972,7 @@ +@@ -1275,7 +1278,7 @@ FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc @ONLY )