brlcad: pkglint

[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 22:00:56 2016 +0200
Changeset:	40e2ded3fbb90652811f3a011502e97f452ddce1

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

Log Message:
brlcad: pkglint

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

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

diffstat:
 brlcad/Makefile                                              | 9 +++++----
 brlcad/distinfo                                              | 6 +++---
 brlcad/patches/patch-CMakeLists.txt                          | 2 ++
 brlcad/patches/patch-misc_CMake_CompilerFlags.cmake          | 2 ++
 brlcad/patches/patch-src_other_openscenegraph_CMakeLists.txt | 2 ++
 5 files changed, 14 insertions(+), 7 deletions(-)

diffs:
diff --git a/brlcad/Makefile b/brlcad/Makefile
index 5691321..9e5d3bb 100644
--- a/brlcad/Makefile
+++ b/brlcad/Makefile
@@ -91,15 +91,16 @@ REPLACE_PYTHON+=	src/other/stepcode/misc/flawfinder
 REPLACE_PYTHON+=	src/other/stepcode/misc/wiki-scripts/update-matrix.py
 REPLACE_PYTHON+=	src/other/stepcode/src/exp2python/python/setup.py
 
+# Private copy of TCL
 REPLACE_INTERPRETER+=	tclsh
 REPLACE.tclsh.old=	.*tclsh
-REPLACE.tclsh.new=	${TCLSH}
+REPLACE.tclsh.new=	${BRLCAD_PREFIX}/bin/tclsh
 REPLACE_FILES.tclsh=	src/other/tkhtml/doc/tkhtml_requirements.tcl
 
 REPLACE_INTERPRETER+=	awk
-REPLACE.tclsh.awk=	.*tclsh
-REPLACE.tclsh.awk=	${AWK}
-REPLACE_FILES.awk=	src/other/tkhtml/doc/tkhtml_requirements.tcl
+REPLACE.awk.old=	.*awk
+REPLACE.awk.new=	${AWK}
+REPLACE_FILES.awk=	src/other/freetype/builds/atari/deflinejoiner.awk
 
 REPLACE_PERL+=		src/proc-db/metaballs.pl
 REPLACE_PERL+=		src/proc-db/spiral.pl
diff --git a/brlcad/distinfo b/brlcad/distinfo
index 122eafe..ea73036 100644
--- a/brlcad/distinfo
+++ b/brlcad/distinfo
@@ -4,8 +4,8 @@ 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_CompilerFlags.cmake) = 172dc28290fee3d6ae6023becfd6908376204685
+SHA1 (patch-CMakeLists.txt) = ec1955dc1543fd2b6ba5a56ebf350980ac42f7df
+SHA1 (patch-misc_CMake_CompilerFlags.cmake) = 0831bd3376e2838fbd4a08be2121db73fba3db56
 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
+SHA1 (patch-src_other_openscenegraph_CMakeLists.txt) = df54a0a75d44bcab5d30b3a5f4b85bffc8fae8b1
diff --git a/brlcad/patches/patch-CMakeLists.txt b/brlcad/patches/patch-CMakeLists.txt
index d5cf376..497319f 100644
--- a/brlcad/patches/patch-CMakeLists.txt
+++ b/brlcad/patches/patch-CMakeLists.txt
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Don't abuse RPATH.
+
 --- CMakeLists.txt.orig	2016-08-09 06:49:57.000000000 +0000
 +++ CMakeLists.txt
 @@ -725,7 +725,7 @@ endif("${CMAKE_BUILD_TYPE}" MATCHES "Deb
diff --git a/brlcad/patches/patch-misc_CMake_CompilerFlags.cmake b/brlcad/patches/patch-misc_CMake_CompilerFlags.cmake
index b2ebced..5a83736 100644
--- a/brlcad/patches/patch-misc_CMake_CompilerFlags.cmake
+++ b/brlcad/patches/patch-misc_CMake_CompilerFlags.cmake
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Nullify CLEAR_BUILD_FLAGS macro, it abuses pkgsrc settings.
+
 --- misc/CMake/CompilerFlags.cmake.orig	2016-08-09 06:52:30.000000000 +0000
 +++ misc/CMake/CompilerFlags.cmake
 @@ -101,26 +101,26 @@ endmacro(RESTORE_CACHED_BUILD_FLAGS)
diff --git a/brlcad/patches/patch-src_other_openscenegraph_CMakeLists.txt b/brlcad/patches/patch-src_other_openscenegraph_CMakeLists.txt
index 5a10b65..cfdad54 100644
--- a/brlcad/patches/patch-src_other_openscenegraph_CMakeLists.txt
+++ b/brlcad/patches/patch-src_other_openscenegraph_CMakeLists.txt
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Stop abusing RPATH.
+
 --- 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)