brlcad: Disable customized RPATH

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Oct 22 11:33:18 2016 +0200
Changeset:	0957f5a48a8bf78f8997d4e1fde1b365009efd0d

Modified Files:
	brlcad/Makefile
	brlcad/distinfo
Added Files:
	brlcad/patches/patch-CMakeLists.txt
	brlcad/patches/patch-src_other_openscenegraph_CMakeLists.txt

Log Message:
brlcad: Disable customized RPATH

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0957f5a48a8bf78f8997d4e1fde1b365009efd0d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 brlcad/Makefile                                             |  2 ++
 brlcad/distinfo                                             |  2 ++
 brlcad/patches/patch-CMakeLists.txt                         | 13 +++++++++++++
 .../patches/patch-src_other_openscenegraph_CMakeLists.txt   | 13 +++++++++++++
 4 files changed, 30 insertions(+)

diffs:
diff --git a/brlcad/Makefile b/brlcad/Makefile
index 505b17c..f3d5603 100644
--- a/brlcad/Makefile
+++ b/brlcad/Makefile
@@ -56,6 +56,8 @@ BUILD_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 BUILD_DEPENDS+=	swig-[0-9]*:../../devel/swig
 BUILD_DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
 
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/lib
+
 .include "../../wip/tk-itk3/buildlink3.mk"
 .include "../../wip/tkpng/buildlink3.mk"
 .include "../../wip/tcl-iwidgets/buildlink3.mk"
diff --git a/brlcad/distinfo b/brlcad/distinfo
index 5c9d309..090f7a1 100644
--- a/brlcad/distinfo
+++ b/brlcad/distinfo
@@ -4,5 +4,7 @@ SHA1 (brlcad-7.26.0.tar.bz2) = b0e307016317bff87c3b49ea395b4829a6305156
 RMD160 (brlcad-7.26.0.tar.bz2) = bf391f887463ece786c5e1e4f3382c168bfc99b3
 SHA512 (brlcad-7.26.0.tar.bz2) = e4819da6e94ff7e5f777cb3c59a911f8818a10ddef42f02f3c3b95be9057a7a83427fdbc29bc3f610f16100b65bb14919438598bd5d59af16fcdbe9f6351006a
 Size (brlcad-7.26.0.tar.bz2) = 113073230 bytes
+SHA1 (patch-CMakeLists.txt) = 230ac7ce5c1b98c08651e4d74d92658836a8dfbc
 SHA1 (patch-misc_CMake_ThirdParty.cmake) = 03cb989aa4de0a07e146bc80facd649946a9688b
 SHA1 (patch-src_librt_primitives_bot_gct__decimation_meshdecimation.c) = c76104ad99c8714379ad7e01b806a2f30cda4f05
+SHA1 (patch-src_other_openscenegraph_CMakeLists.txt) = 1508f2fc2da4cc2c303ad11b49ab40fca379eaec
diff --git a/brlcad/patches/patch-CMakeLists.txt b/brlcad/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000..d5cf376
--- /dev/null
+++ b/brlcad/patches/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2016-08-09 06:49:57.000000000 +0000
++++ CMakeLists.txt
+@@ -725,7 +725,7 @@ endif("${CMAKE_BUILD_TYPE}" MATCHES "Deb
+ # Documentation of these options is available at
+ # http://www.cmake.org/Wiki/CMake_RPATH_handling
+ 
+-include("${BRLCAD_CMAKE_DIR}/RPath_Setup.cmake")
++# include("${BRLCAD_CMAKE_DIR}/RPath_Setup.cmake")
+ 
+ #---------------------------------------------------------------------
+ # We will need a brlcad_config.h.in file to hold all the #cmakedefine
diff --git a/brlcad/patches/patch-src_other_openscenegraph_CMakeLists.txt b/brlcad/patches/patch-src_other_openscenegraph_CMakeLists.txt
new file mode 100644
index 0000000..5a10b65
--- /dev/null
+++ b/brlcad/patches/patch-src_other_openscenegraph_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/other/openscenegraph/CMakeLists.txt.orig	2016-08-09 06:51:40.000000000 +0000
++++ src/other/openscenegraph/CMakeLists.txt
+@@ -381,7 +381,7 @@ endif(NOT CMAKE_CONFIGURATION_TYPES)
+ 
+ ################################################################################
+ # Installation stuff
+-include(${OpenSceneGraph_SOURCE_DIR}/CMakeModules/RPath_Setup.cmake)
++#include(${OpenSceneGraph_SOURCE_DIR}/CMakeModules/RPath_Setup.cmake)
+ include(${OpenSceneGraph_SOURCE_DIR}/CMakeModules/Path_Setup.cmake)
+ 
+ ################################################################################