devel/hyperscan: Update to 5.0.0

New features:

- A hybrid library of Hyperscan and PCRE called Chimera
- Logical combination matching
- Experimental support for Windows

7 files changed, 46 insertions, 37 deletions

diff --git a/devel/hyperscan/Makefile b/devel/hyperscan/Makefile
index 6beafd5c603..45bbe3adda6 100644
--- a/devel/hyperscan/Makefile
+++ b/devel/hyperscan/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/06/02 19:13:45 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/25 00:26:30 minskim Exp $
 
-DISTNAME=	hyperscan-4.7.0
-PKGREVISION=	1
+DISTNAME=	hyperscan-5.0.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=01org/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/devel/hyperscan/PLIST b/devel/hyperscan/PLIST
index 4fed6215e26..5b0691d4d22 100644
--- a/devel/hyperscan/PLIST
+++ b/devel/hyperscan/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2018/06/02 19:13:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/07/25 00:26:30 minskim Exp $
 include/hs/hs.h
 include/hs/hs_common.h
 include/hs/hs_compile.h
 include/hs/hs_runtime.h
 lib/libhs.so
-lib/libhs.so.4
+lib/libhs.so.5
 lib/libhs.so.${PKGVERSION}
 lib/libhs_runtime.so
-lib/libhs_runtime.so.4
+lib/libhs_runtime.so.5
 lib/libhs_runtime.so.${PKGVERSION}
 lib/pkgconfig/libhs.pc
diff --git a/devel/hyperscan/buildlink3.mk b/devel/hyperscan/buildlink3.mk
index 13eeabb7b74..f18039de4f8 100644
--- a/devel/hyperscan/buildlink3.mk
+++ b/devel/hyperscan/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/05/07 22:18:53 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/07/25 00:26:30 minskim Exp $
 
 BUILDLINK_TREE+=	hyperscan
 
 .if !defined(HYPERSCAN_BUILDLINK3_MK)
 HYPERSCAN_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hyperscan+=	hyperscan>=4.5.1
+BUILDLINK_API_DEPENDS.hyperscan+=	hyperscan>=5.0.0
 BUILDLINK_PKGSRCDIR.hyperscan?=		../../devel/hyperscan
 
 .endif	# HYPERSCAN_BUILDLINK3_MK
diff --git a/devel/hyperscan/distinfo b/devel/hyperscan/distinfo
index 1a34dc77c88..ed885631130 100644
--- a/devel/hyperscan/distinfo
+++ b/devel/hyperscan/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2018/06/02 19:13:45 joerg Exp $
+$NetBSD: distinfo,v 1.3 2018/07/25 00:26:30 minskim Exp $
 
-SHA1 (hyperscan-4.7.0.tar.gz) = 459ee499e712061c2b8417080ee4029f38daccc2
-RMD160 (hyperscan-4.7.0.tar.gz) = bbfd448896d6d1953a65ab1182ee75bf8b47ed76
-SHA512 (hyperscan-4.7.0.tar.gz) = ec32cecc98165ab590cefe37c31aa9cbad813aedd6bec72760574a8ece2a8aefecc229b1d76a2e90c54a51302d1db70620278dbb96d47091ebf846e9f8c4ff08
-Size (hyperscan-4.7.0.tar.gz) = 1738159 bytes
-SHA1 (patch-CMakeLists.txt) = 2d274946ab6bb2b7c9ce56b9519404fbbe02b30e
+SHA1 (hyperscan-5.0.0.tar.gz) = 5cb3fc5726950c4025854da8ec05a15f929279db
+RMD160 (hyperscan-5.0.0.tar.gz) = e172831d368ad5565355ba5da93837c65183c7aa
+SHA512 (hyperscan-5.0.0.tar.gz) = 2a942832ab6908ea4b17342428188d635d1db0a57ac6452abbbcdadcf972be0174edeec67d03d925ce92d969c767e9933fdc636c4e3df0067aade659337692a5
+Size (hyperscan-5.0.0.tar.gz) = 1801219 bytes
+SHA1 (patch-CMakeLists.txt) = 1a51aee0bb7a807a293f5a16357b3536343915fa
 SHA1 (patch-src_util_popcount.h) = 3d30d412318c474c9d7a5b7fc45ea3148e6ed4b4
 SHA1 (patch-tools_hsbench_CMakeLists.txt) = 3b4cdd8a7ed17fedb1a090c3dc76fa307084b7a2
-SHA1 (patch-tools_hscollider_CMakeLists.txt) = 261e6d0164927db90155376536add51d0d327d58
+SHA1 (patch-tools_hscollider_CMakeLists.txt) = ee22d83890ca7bf010dd751469d90dcb4930dd08
diff --git a/devel/hyperscan/patches/patch-CMakeLists.txt b/devel/hyperscan/patches/patch-CMakeLists.txt
index c453493bd6c..9d5b60a9594 100644
--- a/devel/hyperscan/patches/patch-CMakeLists.txt
+++ b/devel/hyperscan/patches/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2018/06/02 19:13:45 joerg Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2018/07/25 00:26:30 minskim Exp $
 
 Avoid conflicts with pkgsrc's CMAKE_MODULE_PATH override.
 Disable examples as they require Linux specific headers.
 
---- CMakeLists.txt.orig	2018-01-24 06:58:01.000000000 +0000
+--- CMakeLists.txt.orig	2018-07-09 16:45:44.000000000 +0000
 +++ CMakeLists.txt
-@@ -6,7 +6,6 @@ set (HS_MINOR_VERSION 7)
+@@ -6,7 +6,6 @@ set (HS_MINOR_VERSION 0)
  set (HS_PATCH_VERSION 0)
  set (HS_VERSION ${HS_MAJOR_VERSION}.${HS_MINOR_VERSION}.${HS_PATCH_VERSION})
  
@@ -60,7 +60,16 @@ Disable examples as they require Linux specific headers.
  
  # testing a builtin takes a little more work
  CHECK_C_SOURCE_COMPILES("void *aa_test(void *x) { return __builtin_assume_aligned(x, 16);}\nint main(void) { return 0; }" HAVE_CC_BUILTIN_ASSUME_ALIGNED)
-@@ -453,7 +452,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/tools/CMa
+@@ -454,7 +453,7 @@ if (NOT WIN32)
+ set(PCRE_REQUIRED_MAJOR_VERSION 8)
+ set(PCRE_REQUIRED_MINOR_VERSION 41)
+ set(PCRE_REQUIRED_VERSION ${PCRE_REQUIRED_MAJOR_VERSION}.${PCRE_REQUIRED_MINOR_VERSION})
+-include (${CMAKE_MODULE_PATH}/pcre.cmake)
++include (${PROJECT_SOURCE_DIR}/cmake/pcre.cmake)
+ if (NOT CORRECT_PCRE_VERSION)
+     message(STATUS "PCRE ${PCRE_REQUIRED_VERSION} not found")
+ endif()
+@@ -474,7 +473,7 @@ endif()
  endif()
  
  # do substitutions
@@ -69,7 +78,16 @@ Disable examples as they require Linux specific headers.
  configure_file(src/hs_version.h.in ${PROJECT_BINARY_DIR}/hs_version.h)
  
  if (NOT WIN32)
-@@ -1147,28 +1146,28 @@ else (FAT_RUNTIME)
+@@ -506,7 +505,7 @@ if (WIN32)
+ set(PCRE_REQUIRED_MAJOR_VERSION 8)
+ set(PCRE_REQUIRED_MINOR_VERSION 41)
+ set(PCRE_REQUIRED_VERSION ${PCRE_REQUIRED_MAJOR_VERSION}.${PCRE_REQUIRED_MINOR_VERSION})
+-include (${CMAKE_MODULE_PATH}/pcre.cmake)
++include (${PROJECT_SOURCE_DIR}/cmake/pcre.cmake)
+ if (NOT CORRECT_PCRE_VERSION)
+     message(STATUS "PCRE ${PCRE_REQUIRED_VERSION} not found")
+ endif()
+@@ -1195,28 +1194,28 @@ else (FAT_RUNTIME)
         list(APPEND RUNTIME_LIBS $<TARGET_OBJECTS:hs_exec_core2>)
         set_target_properties(hs_exec_core2 PROPERTIES
             COMPILE_FLAGS "-march=core2"
@@ -102,7 +120,7 @@ Disable examples as they require Linux specific headers.
                 )
         endif (BUILD_AVX512)
  
-@@ -1203,21 +1202,21 @@ else (FAT_RUNTIME)
+@@ -1251,21 +1250,21 @@ else (FAT_RUNTIME)
          set_target_properties(hs_exec_shared_core2 PROPERTIES
              COMPILE_FLAGS "-march=core2"
              POSITION_INDEPENDENT_CODE TRUE
@@ -127,7 +145,7 @@ Disable examples as they require Linux specific headers.
              )
  
          if (BUILD_AVX512)
-@@ -1226,7 +1225,7 @@ else (FAT_RUNTIME)
+@@ -1274,7 +1273,7 @@ else (FAT_RUNTIME)
              set_target_properties(hs_exec_shared_avx512 PROPERTIES
                  COMPILE_FLAGS "${SKYLAKE_FLAG}"
                  POSITION_INDEPENDENT_CODE TRUE
@@ -136,7 +154,7 @@ Disable examples as they require Linux specific headers.
                  )
          endif (BUILD_AVX512)
          add_library(hs_exec_common_shared OBJECT
-@@ -1319,8 +1318,3 @@ if (NOT BUILD_STATIC_LIBS)
+@@ -1367,8 +1366,3 @@ if (NOT BUILD_STATIC_LIBS)
      # use shared lib without having to change all the targets
      add_library(hs ALIAS hs_shared)
  endif ()
diff --git a/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt b/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt
index 56c28c217f8..643faf6ec8c 100644
--- a/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt
+++ b/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt
@@ -1,24 +1,15 @@
-$NetBSD: patch-tools_hscollider_CMakeLists.txt,v 1.1 2018/05/07 22:19:34 minskim Exp $
+$NetBSD: patch-tools_hscollider_CMakeLists.txt,v 1.2 2018/07/25 00:26:30 minskim Exp $
 
 Avoid conflicts with pkgsrc's CMAKE_MODULE_PATH override.
 
---- tools/hscollider/CMakeLists.txt.orig	2018-01-24 06:58:01.000000000 +0000
+--- tools/hscollider/CMakeLists.txt.orig	2018-07-09 16:45:44.000000000 +0000
 +++ tools/hscollider/CMakeLists.txt
-@@ -3,7 +3,7 @@ set(PCRE_REQUIRED_MAJOR_VERSION 8)
- set(PCRE_REQUIRED_MINOR_VERSION 41)
- set(PCRE_REQUIRED_VERSION ${PCRE_REQUIRED_MAJOR_VERSION}.${PCRE_REQUIRED_MINOR_VERSION})
- 
--include (${CMAKE_MODULE_PATH}/pcre.cmake)
-+include (${PROJECT_SOURCE_DIR}/cmake/pcre.cmake)
- if (NOT CORRECT_PCRE_VERSION)
-     message(STATUS "PCRE ${PCRE_REQUIRED_VERSION} not found, not building hscollider")
-     return()
-@@ -11,7 +11,7 @@ endif()
+@@ -5,7 +5,7 @@ endif()
  
  include_directories(${PCRE_INCLUDE_DIRS})
  
 -include(${CMAKE_MODULE_PATH}/backtrace.cmake)
-+include(${PROJECT_SOURC_DIR}/cmake/backtrace.cmake)
++include(${PROJECT_SOURCE_DIR}/cmake/backtrace.cmake)
  
  # we need static libs - too much deep magic for shared libs
  if (NOT BUILD_STATIC_LIBS)
diff --git a/devel/py-hyperscan/Makefile b/devel/py-hyperscan/Makefile
index a7c12cc4d06..2e5e2724f58 100644
--- a/devel/py-hyperscan/Makefile
+++ b/devel/py-hyperscan/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2018/05/08 16:54:50 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/25 00:26:30 minskim Exp $
 
 DISTNAME=	hyperscan-0.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=h/hyperscan/}