CVS commit: pkgsrc/devel/hyperscan

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Jun  2 19:13:45 UTC 2018

Modified Files:
        pkgsrc/devel/hyperscan: Makefile PLIST distinfo
        pkgsrc/devel/hyperscan/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/devel/hyperscan/patches: patch-src_util_popcount.h

Log Message:
NetBSD has popcount, use it. Don't install non-portable examples.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hyperscan/Makefile \
    pkgsrc/devel/hyperscan/PLIST pkgsrc/devel/hyperscan/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/hyperscan/patches/patch-src_util_popcount.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/hyperscan/Makefile
diff -u pkgsrc/devel/hyperscan/Makefile:1.1 pkgsrc/devel/hyperscan/Makefile:1.2
--- pkgsrc/devel/hyperscan/Makefile:1.1 Mon May  7 22:18:53 2018
+++ pkgsrc/devel/hyperscan/Makefile     Sat Jun  2 19:13:45 2018
@@ -1,6 +1,7 @@
-# $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}
Index: pkgsrc/devel/hyperscan/PLIST
diff -u pkgsrc/devel/hyperscan/PLIST:1.1 pkgsrc/devel/hyperscan/PLIST:1.2
--- pkgsrc/devel/hyperscan/PLIST:1.1    Mon May  7 22:18:53 2018
+++ pkgsrc/devel/hyperscan/PLIST        Sat Jun  2 19:13:45 2018
@@ -1,4 +1,4 @@
-@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
@@ -10,7 +10,3 @@ 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
Index: pkgsrc/devel/hyperscan/distinfo
diff -u pkgsrc/devel/hyperscan/distinfo:1.1 pkgsrc/devel/hyperscan/distinfo:1.2
--- pkgsrc/devel/hyperscan/distinfo:1.1 Mon May  7 22:18:53 2018
+++ pkgsrc/devel/hyperscan/distinfo     Sat Jun  2 19:13:45 2018
@@ -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

Index: pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt:1.1 pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt:1.1     Mon May  7 22:19:34 2018
+++ pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt Sat Jun  2 19:13:45 2018
@@ -1,6 +1,7 @@
-$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
@@ -135,3 +136,12 @@ Avoid conflicts with pkgsrc's CMAKE_MODU
                  )
          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()

Added files:

Index: pkgsrc/devel/hyperscan/patches/patch-src_util_popcount.h
diff -u /dev/null pkgsrc/devel/hyperscan/patches/patch-src_util_popcount.h:1.1
--- /dev/null   Sat Jun  2 19:13:45 2018
+++ pkgsrc/devel/hyperscan/patches/patch-src_util_popcount.h    Sat Jun  2 19:13:45 2018
@@ -0,0 +1,22 @@
+$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_ */
+