Sat Jun 2 19:13:45 2018 UTC ()
NetBSD has popcount, use it. Don't install non-portable examples.
Bump revision.


(joerg)
diff -r1.1 -r1.2 pkgsrc/devel/hyperscan/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/hyperscan/PLIST
diff -r1.1 -r1.2 pkgsrc/devel/hyperscan/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt
diff -r0 -r1.1 pkgsrc/devel/hyperscan/patches/patch-src_util_popcount.h
cvs diff -r1.1 -r1.2 pkgsrc/devel/hyperscan/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/hyperscan/Makefile 2018/05/07 22:18:53 1.1
+++ pkgsrc/devel/hyperscan/Makefile 2018/06/02 19:13:45 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2018/05/07 22:18:53 minskim Exp $ 1# $NetBSD: Makefile,v 1.2 2018/06/02 19:13:45 joerg Exp $
2 2
3DISTNAME= hyperscan-4.7.0 3DISTNAME= hyperscan-4.7.0
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=01org/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=01org/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
7 8
8MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
9HOMEPAGE= https://01.org/hyperscan 10HOMEPAGE= https://01.org/hyperscan
10COMMENT= High-performance regular expression matching library 11COMMENT= High-performance regular expression matching library
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 14ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64
14 15
15BUILD_DEPENDS+= ragel-[0-9]*:../../devel/ragel 16BUILD_DEPENDS+= ragel-[0-9]*:../../devel/ragel
16 17
cvs diff -r1.1 -r1.2 pkgsrc/devel/hyperscan/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/hyperscan/PLIST 2018/05/07 22:18:53 1.1
+++ pkgsrc/devel/hyperscan/PLIST 2018/06/02 19:13:45 1.2
@@ -1,16 +1,12 @@ @@ -1,16 +1,12 @@
1@comment $NetBSD: PLIST,v 1.1 2018/05/07 22:18:53 minskim Exp $ 1@comment $NetBSD: PLIST,v 1.2 2018/06/02 19:13:45 joerg Exp $
2include/hs/hs.h 2include/hs/hs.h
3include/hs/hs_common.h 3include/hs/hs_common.h
4include/hs/hs_compile.h 4include/hs/hs_compile.h
5include/hs/hs_runtime.h 5include/hs/hs_runtime.h
6lib/libhs.so 6lib/libhs.so
7lib/libhs.so.4 7lib/libhs.so.4
8lib/libhs.so.${PKGVERSION} 8lib/libhs.so.${PKGVERSION}
9lib/libhs_runtime.so 9lib/libhs_runtime.so
10lib/libhs_runtime.so.4 10lib/libhs_runtime.so.4
11lib/libhs_runtime.so.${PKGVERSION} 11lib/libhs_runtime.so.${PKGVERSION}
12lib/pkgconfig/libhs.pc 12lib/pkgconfig/libhs.pc
13share/doc/hyperscan/examples/README.md 
14share/doc/hyperscan/examples/patbench.cc 
15share/doc/hyperscan/examples/pcapscan.cc 
16share/doc/hyperscan/examples/simplegrep.c 
cvs diff -r1.1 -r1.2 pkgsrc/devel/hyperscan/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/hyperscan/distinfo 2018/05/07 22:18:53 1.1
+++ pkgsrc/devel/hyperscan/distinfo 2018/06/02 19:13:45 1.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.1 2018/05/07 22:18:53 minskim Exp $ 1$NetBSD: distinfo,v 1.2 2018/06/02 19:13:45 joerg Exp $
2 2
3SHA1 (hyperscan-4.7.0.tar.gz) = 459ee499e712061c2b8417080ee4029f38daccc2 3SHA1 (hyperscan-4.7.0.tar.gz) = 459ee499e712061c2b8417080ee4029f38daccc2
4RMD160 (hyperscan-4.7.0.tar.gz) = bbfd448896d6d1953a65ab1182ee75bf8b47ed76 4RMD160 (hyperscan-4.7.0.tar.gz) = bbfd448896d6d1953a65ab1182ee75bf8b47ed76
5SHA512 (hyperscan-4.7.0.tar.gz) = ec32cecc98165ab590cefe37c31aa9cbad813aedd6bec72760574a8ece2a8aefecc229b1d76a2e90c54a51302d1db70620278dbb96d47091ebf846e9f8c4ff08 5SHA512 (hyperscan-4.7.0.tar.gz) = ec32cecc98165ab590cefe37c31aa9cbad813aedd6bec72760574a8ece2a8aefecc229b1d76a2e90c54a51302d1db70620278dbb96d47091ebf846e9f8c4ff08
6Size (hyperscan-4.7.0.tar.gz) = 1738159 bytes 6Size (hyperscan-4.7.0.tar.gz) = 1738159 bytes
7SHA1 (patch-CMakeLists.txt) = b5fee4471c33cd78d86ab712b0b7b994873935dc 7SHA1 (patch-CMakeLists.txt) = 2d274946ab6bb2b7c9ce56b9519404fbbe02b30e
 8SHA1 (patch-src_util_popcount.h) = 3d30d412318c474c9d7a5b7fc45ea3148e6ed4b4
8SHA1 (patch-tools_hsbench_CMakeLists.txt) = 3b4cdd8a7ed17fedb1a090c3dc76fa307084b7a2 9SHA1 (patch-tools_hsbench_CMakeLists.txt) = 3b4cdd8a7ed17fedb1a090c3dc76fa307084b7a2
9SHA1 (patch-tools_hscollider_CMakeLists.txt) = 261e6d0164927db90155376536add51d0d327d58 10SHA1 (patch-tools_hscollider_CMakeLists.txt) = 261e6d0164927db90155376536add51d0d327d58
cvs diff -r1.1 -r1.2 pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt 2018/05/07 22:19:34 1.1
+++ pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt 2018/06/02 19:13:45 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2018/05/07 22:19:34 minskim Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2018/06/02 19:13:45 joerg Exp $
2 2
3Avoid conflicts with pkgsrc's CMAKE_MODULE_PATH override. 3Avoid conflicts with pkgsrc's CMAKE_MODULE_PATH override.
 4Disable examples as they require Linux specific headers.
4 5
5--- CMakeLists.txt.orig 2018-01-24 06:58:01.000000000 +0000 6--- CMakeLists.txt.orig 2018-01-24 06:58:01.000000000 +0000
6+++ CMakeLists.txt 7+++ CMakeLists.txt
7@@ -6,7 +6,6 @@ set (HS_MINOR_VERSION 7) 8@@ -6,7 +6,6 @@ set (HS_MINOR_VERSION 7)
8 set (HS_PATCH_VERSION 0) 9 set (HS_PATCH_VERSION 0)
9 set (HS_VERSION ${HS_MAJOR_VERSION}.${HS_MINOR_VERSION}.${HS_PATCH_VERSION}) 10 set (HS_VERSION ${HS_MAJOR_VERSION}.${HS_MINOR_VERSION}.${HS_PATCH_VERSION})
10  11
11-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) 12-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
12 include(CheckCCompilerFlag) 13 include(CheckCCompilerFlag)
13 include(CheckCXXCompilerFlag) 14 include(CheckCXXCompilerFlag)
14 include(CheckCXXSymbolExists) 15 include(CheckCXXSymbolExists)
15@@ -17,8 +16,8 @@ INCLUDE (CheckLibraryExists) 16@@ -17,8 +16,8 @@ INCLUDE (CheckLibraryExists)
16 INCLUDE (CheckSymbolExists) 17 INCLUDE (CheckSymbolExists)
@@ -125,13 +126,22 @@ Avoid conflicts with pkgsrc's CMAKE_MODU @@ -125,13 +126,22 @@ Avoid conflicts with pkgsrc's CMAKE_MODU
125+ RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx2 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in" 126+ RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx2 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
126 ) 127 )
127  128
128 if (BUILD_AVX512) 129 if (BUILD_AVX512)
129@@ -1226,7 +1225,7 @@ else (FAT_RUNTIME) 130@@ -1226,7 +1225,7 @@ else (FAT_RUNTIME)
130 set_target_properties(hs_exec_shared_avx512 PROPERTIES 131 set_target_properties(hs_exec_shared_avx512 PROPERTIES
131 COMPILE_FLAGS "${SKYLAKE_FLAG}" 132 COMPILE_FLAGS "${SKYLAKE_FLAG}"
132 POSITION_INDEPENDENT_CODE TRUE 133 POSITION_INDEPENDENT_CODE TRUE
133- RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx512 ${CMAKE_MODULE_PATH}/keep.syms.in" 134- RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx512 ${CMAKE_MODULE_PATH}/keep.syms.in"
134+ RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx512 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in" 135+ RULE_LAUNCH_COMPILE "${BUILD_WRAPPER} avx512 ${PROJECT_SOURCE_DIR}/cmake/keep.syms.in"
135 ) 136 )
136 endif (BUILD_AVX512) 137 endif (BUILD_AVX512)
137 add_library(hs_exec_common_shared OBJECT 138 add_library(hs_exec_common_shared OBJECT
 139@@ -1319,8 +1318,3 @@ if (NOT BUILD_STATIC_LIBS)
 140 # use shared lib without having to change all the targets
 141 add_library(hs ALIAS hs_shared)
 142 endif ()
 143-
 144-
 145-if(NOT WIN32)
 146- add_subdirectory(examples)
 147-endif()
File Added: pkgsrc/devel/hyperscan/patches/patch-src_util_popcount.h
$NetBSD: patch-src_util_popcount.h,v 1.1 2018/06/02 19:13:45 joerg Exp $

--- src/util/popcount.h.orig	2018-06-02 15:16:11.582620623 +0000
+++ src/util/popcount.h
@@ -36,6 +36,7 @@
 #include "ue2common.h"
 #include "util/arch.h"
 
+#ifndef __NetBSD__
 static really_inline
 u32 popcount32(u32 x) {
 #if defined(HAVE_POPCOUNT_INSTR)
@@ -69,6 +70,9 @@ u32 popcount64(u64a x) {
     return popcount32(x >> 32) + popcount32(x);
 #endif
 }
+#else
+#include <strings.h>
+#endif
 
 #endif /* UTIL_POPCOUNT_H_ */