 @@ -1,137 +1,147 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2018/05/07 22:19:34 minskim Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2018/06/02 19:13:45 joerg 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
 @@ -6,7 +6,6 @@ set (HS_MINOR_VERSION 7)
  set (HS_PATCH_VERSION 0)
  set (HS_VERSION ${HS_MAJOR_VERSION}.${HS_MINOR_VERSION}.${HS_PATCH_VERSION})
 -set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
  include(CheckCCompilerFlag)
  include(CheckCXXCompilerFlag)
  include(CheckCXXSymbolExists)
 @@ -17,8 +16,8 @@ INCLUDE (CheckLibraryExists)
  INCLUDE (CheckSymbolExists)
  include (CMakeDependentOption)
  include (GNUInstallDirs)
 -include (${CMAKE_MODULE_PATH}/platform.cmake)
 -include (${CMAKE_MODULE_PATH}/ragel.cmake)
 +include (${PROJECT_SOURCE_DIR}/cmake/platform.cmake)
 +include (${PROJECT_SOURCE_DIR}/cmake/ragel.cmake)
  find_package(PkgConfig QUIET)
 @@ -68,7 +67,7 @@ include_directories(${PROJECT_SOURCE_DIR
  include_directories(${PROJECT_BINARY_DIR})
  include_directories(SYSTEM include)
 -include (${CMAKE_MODULE_PATH}/boost.cmake)
 +include (${PROJECT_SOURCE_DIR}/cmake/boost.cmake)
  # -- make this work? set(python_ADDITIONAL_VERSIONS 2.7 2.6)
  find_package(PythonInterp)
 @@ -83,7 +82,7 @@ endif()
  # allow for reproducible builds - python for portability
  if (DEFINED ENV{SOURCE_DATE_EPOCH})
        execute_process(
 -          COMMAND "${PYTHON}" "${CMAKE_MODULE_PATH}/formatdate.py" "$ENV{SOURCE_DATE_EPOCH}"
 +          COMMAND "${PYTHON}" "${PROJECT_SOURCE_DIR}/cmake/formatdate.py" "$ENV{SOURCE_DATE_EPOCH}"
            OUTPUT_VARIABLE BUILD_DATE
            OUTPUT_STRIP_TRAILING_WHITESPACE)
  else ()
 @@ -320,7 +319,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
          message (STATUS "Building the fat runtime requires the Unix Makefiles generator, or Ninja with CMake v3.0 or higher")
          set (FAT_RUNTIME_REQUISITES FALSE)
      else()
 -        include (${CMAKE_MODULE_PATH}/attrib.cmake)
 +        include (${PROJECT_SOURCE_DIR}/cmake/attrib.cmake)
          if (NOT HAS_C_ATTR_IFUNC)
              message(STATUS "Compiler does not support ifunc attribute, cannot build fat runtime")
              set (FAT_RUNTIME_REQUISITES FALSE)
 @@ -331,7 +330,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
      CMAKE_DEPENDENT_OPTION(FAT_RUNTIME "Build a library that supports multiple microarchitecures" ${RELEASE_BUILD} "FAT_RUNTIME_REQUISITES" OFF)
  endif ()
 -include (${CMAKE_MODULE_PATH}/arch.cmake)
 +include (${PROJECT_SOURCE_DIR}/cmake/arch.cmake)
  # 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
  endif()
  # do substitutions
 -configure_file(${CMAKE_MODULE_PATH}/config.h.in ${PROJECT_BINARY_DIR}/config.h)
 +configure_file(${PROJECT_SOURCE_DIR}/cmake/config.h.in ${PROJECT_BINARY_DIR}/config.h)
  configure_file(src/hs_version.h.in ${PROJECT_BINARY_DIR}/hs_version.h)
  if (NOT WIN32)
 @@ -1147,28 +1146,28 @@ else (FAT_RUNTIME)
         list(APPEND RUNTIME_LIBS $<TARGET_OBJECTS:hs_exec_core2>)
         set_target_properties(hs_exec_core2 PROPERTIES
             COMPILE_FLAGS "-march=core2"
 -           RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} core2 ${CMAKE_MODULE_PATH}/keep.syms.in"
 +           RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} core2 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
+            )
         add_library(hs_exec_corei7 OBJECT ${hs_exec_SRCS})
         list(APPEND RUNTIME_LIBS $<TARGET_OBJECTS:hs_exec_corei7>)
         set_target_properties(hs_exec_corei7 PROPERTIES
             COMPILE_FLAGS "-march=corei7"
 -           RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} corei7 ${CMAKE_MODULE_PATH}/keep.syms.in"
 +           RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} corei7 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
+            )
         add_library(hs_exec_avx2 OBJECT ${hs_exec_SRCS} ${hs_exec_avx2_SRCS})
         list(APPEND RUNTIME_LIBS $<TARGET_OBJECTS:hs_exec_avx2>)
         set_target_properties(hs_exec_avx2 PROPERTIES
             COMPILE_FLAGS "-march=core-avx2"
 -           RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx2 ${CMAKE_MODULE_PATH}/keep.syms.in"
 +           RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx2 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
+            )
         if (BUILD_AVX512)
             add_library(hs_exec_avx512 OBJECT ${hs_exec_SRCS} ${hs_exec_avx2_SRCS})
             list(APPEND RUNTIME_LIBS $<TARGET_OBJECTS:hs_exec_avx512>)
             set_target_properties(hs_exec_avx512 PROPERTIES
                 COMPILE_FLAGS "${SKYLAKE_FLAG}"
 -               RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx512 ${CMAKE_MODULE_PATH}/keep.syms.in"
 +               RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx512 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
+                )
         endif (BUILD_AVX512)
 @@ -1203,21 +1202,21 @@ else (FAT_RUNTIME)
          set_target_properties(hs_exec_shared_core2 PROPERTIES
              COMPILE_FLAGS "-march=core2"
              POSITION_INDEPENDENT_CODE TRUE
 -            RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} core2 ${CMAKE_MODULE_PATH}/keep.syms.in"
 +            RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} core2 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
+             )
          add_library(hs_exec_shared_corei7 OBJECT ${hs_exec_SRCS})
          list(APPEND RUNTIME_SHLIBS $<TARGET_OBJECTS:hs_exec_shared_corei7>)
          set_target_properties(hs_exec_shared_corei7 PROPERTIES
              COMPILE_FLAGS "-march=corei7"
              POSITION_INDEPENDENT_CODE TRUE
 -            RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} corei7 ${CMAKE_MODULE_PATH}/keep.syms.in"
 +            RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} corei7 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
+             )
          add_library(hs_exec_shared_avx2 OBJECT ${hs_exec_SRCS} ${hs_exec_avx2_SRCS})
          list(APPEND RUNTIME_SHLIBS $<TARGET_OBJECTS:hs_exec_shared_avx2>)
          set_target_properties(hs_exec_shared_avx2 PROPERTIES
              COMPILE_FLAGS "-march=core-avx2"
              POSITION_INDEPENDENT_CODE TRUE
 -            RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx2 ${CMAKE_MODULE_PATH}/keep.syms.in"
 +            RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx2 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
+             )
          if (BUILD_AVX512)
 @@ -1226,7 +1225,7 @@ else (FAT_RUNTIME)
              set_target_properties(hs_exec_shared_avx512 PROPERTIES
                  COMPILE_FLAGS "${SKYLAKE_FLAG}"
                  POSITION_INDEPENDENT_CODE TRUE
 -                RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx512 ${CMAKE_MODULE_PATH}/keep.syms.in"
 +                RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx512 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
+                 )
          endif (BUILD_AVX512)
          add_library(hs_exec_common_shared OBJECT
@@ -1319,8 +1318,3 @@ if (NOT BUILD_STATIC_LIBS)
      # use shared lib without having to change all the targets
      add_library(hs ALIAS hs_shared)
  endif ()
+-
+-
 -if(NOT WIN32)
 -    add_subdirectory(examples)
 -endif()

 @@ -1,34 +1,35 @@
-# $NetBSD: Makefile,v 1.1 2018/05/07 22:18:53 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2018/06/02 19:13:45 joerg Exp $
 DISTNAME=	hyperscan-4.7.0
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=01org/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	https://01.org/hyperscan
 COMMENT=	High-performance regular expression matching library
 LICENSE=	modified-bsd
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-x86_64
 BUILD_DEPENDS+=	ragel-[0-9]*:../../devel/ragel
 GCC_REQD=		4.8.1
 PYTHON_FOR_BUILD_ONLY=	yes
 USE_CMAKE=		yes
 USE_LANGUAGES=		c99 c++11
 USE_TOOLS+=		pkg-config
 CMAKE_ARGS+=		-DBUILD_SHARED_LIBS=ON
 PKGCONFIG_OVERRIDE+=	libhs.pc.in
 .include "../../mk/bsd.prefs.mk"
 .if empty(CFLAGS:M-march*)
 CFLAGS+=	-march=core2
 .endif
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,16 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2018/05/07 22:18:53 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/06/02 19:13:45 joerg 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.${PKGVERSION}
 lib/libhs_runtime.so
 lib/libhs_runtime.so.4
 lib/libhs_runtime.so.${PKGVERSION}
 lib/pkgconfig/libhs.pc
 share/doc/hyperscan/examples/README.md
 share/doc/hyperscan/examples/patbench.cc
 share/doc/hyperscan/examples/pcapscan.cc
 share/doc/hyperscan/examples/simplegrep.c

 @@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1 2018/05/07 22:18:53 minskim Exp $
+$NetBSD: distinfo,v 1.2 2018/06/02 19:13:45 joerg 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) = b5fee4471c33cd78d86ab712b0b7b994873935dc
+SHA1 (patch-CMakeLists.txt) = 2d274946ab6bb2b7c9ce56b9519404fbbe02b30e
 SHA1 (patch-src_util_popcount.h) = 3d30d412318c474c9d7a5b7fc45ea3148e6ed4b4
 SHA1 (patch-tools_hsbench_CMakeLists.txt) = 3b4cdd8a7ed17fedb1a090c3dc76fa307084b7a2
 SHA1 (patch-tools_hscollider_CMakeLists.txt) = 261e6d0164927db90155376536add51d0d327d58