misc/py-xgboost: Update 1.2.0 -> 1.2.1

PR:		247408
MFH:		2020Q4 (fixes py-xgboost failure, see bug#247408)

4 files changed, 27 insertions, 12 deletions

diff --git a/misc/py-xgboost/Makefile b/misc/py-xgboost/Makefile
index 0aeb0451e6c6..1075555d6404 100644
--- a/misc/py-xgboost/Makefile
+++ b/misc/py-xgboost/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xgboost
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.0
+DISTVERSION=	1.2.1
 CATEGORIES=	misc # machine-learning
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -24,12 +24,10 @@ GH_ACCOUNT=	dmlc
 USE_PYTHON=	distutils autoplist
 USE_LDCONFIG=	yes
 GH_TUPLE=	\
-		dmlc:rabit:4fb34a008db6437c84d1877635064e09a55c8553:dmlc_rabit/../rabit
+		dmlc:rabit:4acdd7c6f68debe1c39ae07ca75466d74d194dd1:dmlc_rabit/../rabit
 
 WRKSRC_SUBDIR=	python-package
 
-MAKE_ENV+=	FREEBSD_LIBRARY_PATH=${LOCALBASE}/lib
-
 LDFLAGS+=	-lexecinfo
 
 POST_PLIST=	fix-plist
diff --git a/misc/py-xgboost/distinfo b/misc/py-xgboost/distinfo
index 127117c42f2d..18880207d083 100644
--- a/misc/py-xgboost/distinfo
+++ b/misc/py-xgboost/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1600935150
-SHA256 (dmlc-xgboost-v1.2.0_GH0.tar.gz) = 074ef38f9fff675470c4b461e204cd1c778f984191ca89afdfcc55b46a1868d2
-SIZE (dmlc-xgboost-v1.2.0_GH0.tar.gz) = 1341770
-SHA256 (dmlc-rabit-4fb34a008db6437c84d1877635064e09a55c8553_GH0.tar.gz) = 7d9a18b1613dfd3a5244524ecdb164d6b2a1f150d297cc7b8527e221aabb6eb7
-SIZE (dmlc-rabit-4fb34a008db6437c84d1877635064e09a55c8553_GH0.tar.gz) = 93236
+TIMESTAMP = 1603744234
+SHA256 (dmlc-xgboost-v1.2.1_GH0.tar.gz) = 0190b902cdf4e0a05e735a382708e2025f1ff541a53251e43160beb3041bf35b
+SIZE (dmlc-xgboost-v1.2.1_GH0.tar.gz) = 1341653
+SHA256 (dmlc-rabit-4acdd7c6f68debe1c39ae07ca75466d74d194dd1_GH0.tar.gz) = 9e8bbdc04e504d7e7c98b9f683be5378cc5394405983d30737a14ca3dd43d449
+SIZE (dmlc-rabit-4acdd7c6f68debe1c39ae07ca75466d74d194dd1_GH0.tar.gz) = 94118
diff --git a/misc/py-xgboost/files/patch-CMakeLists.txt b/misc/py-xgboost/files/patch-CMakeLists.txt
index bffe795898ed..87c993afdabb 100644
--- a/misc/py-xgboost/files/patch-CMakeLists.txt
+++ b/misc/py-xgboost/files/patch-CMakeLists.txt
@@ -32,3 +32,12 @@
  
  # rabit
  set(RABIT_BUILD_DMLC OFF)
+@@ -202,7 +202,7 @@
+ 
+ #-- Hide all C++ symbols
+ if (HIDE_CXX_SYMBOLS)
+-  foreach(target objxgboost xgboost dmlc rabit rabit_mock_static)
++  foreach(target objxgboost xgboost rabit rabit_mock_static)
+     set_target_properties(${target} PROPERTIES CXX_VISIBILITY_PRESET hidden)
+   endforeach()
+ endif (HIDE_CXX_SYMBOLS)
diff --git a/misc/py-xgboost/files/patch-xgboost_libpath.py b/misc/py-xgboost/files/patch-xgboost_libpath.py
index d748c5a1ddbd..12916ce3222b 100644
--- a/misc/py-xgboost/files/patch-xgboost_libpath.py
+++ b/misc/py-xgboost/files/patch-xgboost_libpath.py
@@ -1,10 +1,18 @@
---- xgboost/libpath.py.orig	2020-05-25 18:09:22 UTC
+--- xgboost/libpath.py.orig	2020-10-12 22:10:16 UTC
 +++ xgboost/libpath.py
-@@ -20,6 +20,8 @@ def find_lib_path():
+@@ -4,6 +4,7 @@
+ import os
+ import platform
+ import sys
++import sysconfig # from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247408#c0
+ 
+ 
+ class XGBoostLibraryNotFound(Exception):
+@@ -20,6 +21,8 @@ def find_lib_path():
      """
      curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
      dll_path = [
-+        os.getenv('FREEBSD_LIBRARY_PATH'),
++	sysconfig.get_config_var('LIBDIR'), # from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247408#c0
 +	os.path.join(sys.prefix, 'xgboost'),
          # normal, after installation `lib` is copied into Python package tree.
          os.path.join(curr_path, 'lib'),