Upgrade science/dlib-cpp and science/py-dlib to 19.13.

Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D15588

4 files changed, 8 insertions, 73 deletions

diff --git a/science/py-dlib/Makefile b/science/py-dlib/Makefile
index 6d253d20d0eb..3e2ee49cb3b7 100644
--- a/science/py-dlib/Makefile
+++ b/science/py-dlib/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	dlib
-DISTVERSION=	19.6
+DISTVERSION=	19.13
 CATEGORIES=	science devel math python
 MASTER_SITES=	http://dlib.net/files/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -41,17 +41,17 @@ GIF_VARS=		gifargs="--yes DLIB_GIF_SUPPORT"
 GIF_VARS_OFF=		gifargs="--no DLIB_GIF_SUPPORT"
 
 SQLITE_USES=		sqlite
-SQLITE_VARS=		sqliteargs="--yes DLIB_LINK_WITH_SQLITE"
-SQLITE_VARS_OFF=	sqliteargs="--no DLIB_LINK_WITH_SQLITE"
+SQLITE_VARS=		sqliteargs="--yes DLIB_LINK_WITH_SQLITE3"
+SQLITE_VARS_OFF=	sqliteargs="--no DLIB_LINK_WITH_SQLITE3"
 
 BLASLAPACK_USES=	blaslapack
 BLASLAPACK_VARS_OFF=	avxargs="--no DLIB_USE_BLAS --no DLIB_USE_LAPACK --no DLIB_USE_MKL_FFT"
 
 AVX_VARS=		avxargs="--yes USE_AVX_INSTRUCTIONS"
 
-PYDISTUTILS_BUILDARGS=	--cmake-extra BOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX} ${X11ARGS} ${JPEGARGS} ${PNGARGS} ${GIFARGS} ${SQLITEARGS} ${BLASLAPACKARGS} ${AVXARGS}
+PYDISTUTILS_BUILDARGS=	--set BOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX} ${X11ARGS} ${JPEGARGS} ${PNGARGS} ${GIFARGS} ${SQLITEARGS} ${BLASLAPACKARGS} ${AVXARGS}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/dlib/dlib.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/dlib.so
 
 .include <bsd.port.mk>
diff --git a/science/py-dlib/distinfo b/science/py-dlib/distinfo
index cca768807511..5e6a5ffdc6e2 100644
--- a/science/py-dlib/distinfo
+++ b/science/py-dlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505047685
-SHA256 (dlib-19.6.tar.bz2) = 40292a4343499b18b881f69b26a56c1ecfe95cb9b9f964f37c1064c6fc415e2c
-SIZE (dlib-19.6.tar.bz2) = 9016497
+TIMESTAMP = 1527424227
+SHA256 (dlib-19.13.tar.bz2) = fe90b94677f837c8f0bcb0bb450b313a422a9171ac682583a75052c58f80ba54
+SIZE (dlib-19.13.tar.bz2) = 11032425
diff --git a/science/py-dlib/files/patch-dlib_cmake__utils_add__python__module b/science/py-dlib/files/patch-dlib_cmake__utils_add__python__module
deleted file mode 100644
index abb2de62cedd..000000000000
--- a/science/py-dlib/files/patch-dlib_cmake__utils_add__python__module
+++ /dev/null
@@ -1,30 +0,0 @@
---- dlib/cmake_utils/add_python_module.orig	2017-08-28 22:18:45 UTC
-+++ dlib/cmake_utils/add_python_module
-@@ -118,12 +118,6 @@ endif()
- 
- 
- 
--INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}")
--if (PYTHON_INCLUDE_PATH)
--   INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_PATH}" )
--else()
--   INCLUDE_DIRECTORIES("${PYTHON_INCLUDE_DIRS}" )
--endif()
- 
- message(STATUS "USING BOOST_LIBS: ${Boost_LIBRARIES}")
- if (WIN32)
-@@ -152,6 +146,14 @@ macro(add_python_module module_name modu
-    ADD_LIBRARY(${module_name}_ SHARED ${module_sources} ${ARGN} )
-    TARGET_LINK_LIBRARIES(${module_name}_ ${Boost_LIBRARIES} dlib::dlib)
- 
-+    target_include_directories(${module_name}_ SYSTEM PUBLIC "${Boost_INCLUDE_DIRS}")
-+    if (PYTHON_INCLUDE_PATH)
-+        target_include_directories(${module_name}_ SYSTEM PUBLIC "${PYTHON_INCLUDE_PATH}" )
-+    else()
-+        target_include_directories(${module_name}_ SYSTEM PUBLIC "${PYTHON_INCLUDE_DIRS}" )
-+    endif()
-+
-+
-    if(WIN32 AND NOT CYGWIN)
-       TARGET_LINK_LIBRARIES(${module_name}_ ${PYTHON_LIBRARIES})
-       SET_TARGET_PROPERTIES( ${module_name}_
diff --git a/science/py-dlib/files/patch-setup.py b/science/py-dlib/files/patch-setup.py
deleted file mode 100644
index ed415869544e..000000000000
--- a/science/py-dlib/files/patch-setup.py
+++ /dev/null
@@ -1,35 +0,0 @@
-Add extra machinery to pass arguments to CMake; this is FreeBSD-specific
-until CMake's FindBoost understands FreeBSD-suffixed Boost::Python versions.
-
-Also leave the build directory intact.
-
---- setup.py.orig	2017-08-28 22:18:45 UTC
-+++ setup.py
-@@ -91,6 +91,8 @@ def _get_options():
-         elif opt_key == 'G':
-             _cmake_extra += ['-G', arg.strip()]
-             _generator_set = True
-+        elif opt_key == 'cmake-extra':
-+            _cmake_extra.append('-D{arg}'.format(arg=arg.strip()))
- 
-         if opt_key:
-             sys.argv.remove(arg)
-@@ -112,7 +114,7 @@ def _get_options():
-             opt_key = opt
-             sys.argv.remove(arg)
-             continue
--        elif opt in ['yes', 'no', 'compiler-flags']:
-+        elif opt in ['yes', 'no', 'compiler-flags', 'cmake-extra']:
-             opt_key = opt
-             sys.argv.remove(arg)
-             continue
-@@ -548,9 +550,6 @@ class build(_build):
-                     break
- 
-         build_dir = os.path.join(script_dir, "./tools/python/build")
--        if os.path.exists(build_dir):
--            log.info('Removing build directory %s' % build_dir)
--            rmtree(build_dir)
- 
-         try:
-             os.makedirs(build_dir)