Received: by mail.netbsd.org (Postfix, from userid 605) id 48AC184E3C; Wed, 25 Jul 2018 00:26:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 649E484D60 for ; Wed, 25 Jul 2018 00:26:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id YD4jUpPxZzfb for ; Wed, 25 Jul 2018 00:26:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1163D84D2B for ; Wed, 25 Jul 2018 00:26:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0BB39FBEC; Wed, 25 Jul 2018 00:26:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_153247839158540" MIME-Version: 1.0 Date: Wed, 25 Jul 2018 00:26:31 +0000 From: "Min Sik Kim" Subject: CVS commit: pkgsrc/devel To: pkgsrc-changes@NetBSD.org Reply-To: minskim@netbsd.org X-Mailer: log_accum Message-Id: <20180725002631.0BB39FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_153247839158540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: minskim Date: Wed Jul 25 00:26:30 UTC 2018 Modified Files: pkgsrc/devel/hyperscan: Makefile PLIST buildlink3.mk distinfo pkgsrc/devel/hyperscan/patches: patch-CMakeLists.txt patch-tools_hscollider_CMakeLists.txt pkgsrc/devel/py-hyperscan: Makefile Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/hyperscan/Makefile \ pkgsrc/devel/hyperscan/PLIST pkgsrc/devel/hyperscan/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hyperscan/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-hyperscan/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_153247839158540 Content-Disposition: inline Content-Length: 9400 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/hyperscan/Makefile diff -u pkgsrc/devel/hyperscan/Makefile:1.2 pkgsrc/devel/hyperscan/Makefile:1.3 --- pkgsrc/devel/hyperscan/Makefile:1.2 Sat Jun 2 19:13:45 2018 +++ pkgsrc/devel/hyperscan/Makefile Wed Jul 25 00:26:30 2018 @@ -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} Index: pkgsrc/devel/hyperscan/PLIST diff -u pkgsrc/devel/hyperscan/PLIST:1.2 pkgsrc/devel/hyperscan/PLIST:1.3 --- pkgsrc/devel/hyperscan/PLIST:1.2 Sat Jun 2 19:13:45 2018 +++ pkgsrc/devel/hyperscan/PLIST Wed Jul 25 00:26:30 2018 @@ -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 Index: pkgsrc/devel/hyperscan/distinfo diff -u pkgsrc/devel/hyperscan/distinfo:1.2 pkgsrc/devel/hyperscan/distinfo:1.3 --- pkgsrc/devel/hyperscan/distinfo:1.2 Sat Jun 2 19:13:45 2018 +++ pkgsrc/devel/hyperscan/distinfo Wed Jul 25 00:26:30 2018 @@ -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 Index: pkgsrc/devel/hyperscan/buildlink3.mk diff -u pkgsrc/devel/hyperscan/buildlink3.mk:1.1 pkgsrc/devel/hyperscan/buildlink3.mk:1.2 --- pkgsrc/devel/hyperscan/buildlink3.mk:1.1 Mon May 7 22:18:53 2018 +++ pkgsrc/devel/hyperscan/buildlink3.mk Wed Jul 25 00:26:30 2018 @@ -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 Index: pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt diff -u pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt:1.2 pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt:1.3 --- pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt:1.2 Sat Jun 2 19:13:45 2018 +++ pkgsrc/devel/hyperscan/patches/patch-CMakeLists.txt Wed Jul 25 00:26:30 2018 @@ -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 s # 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 s 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 $) set_target_properties(hs_exec_core2 PROPERTIES COMPILE_FLAGS "-march=core2" @@ -102,7 +120,7 @@ Disable examples as they require Linux s ) 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 s ) 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 s ) 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 () Index: pkgsrc/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt diff -u pkgsrc/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt:1.1 pkgsrc/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt:1.2 --- pkgsrc/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt:1.1 Mon May 7 22:19:34 2018 +++ pkgsrc/devel/hyperscan/patches/patch-tools_hscollider_CMakeLists.txt Wed Jul 25 00:26:30 2018 @@ -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) Index: pkgsrc/devel/py-hyperscan/Makefile diff -u pkgsrc/devel/py-hyperscan/Makefile:1.1 pkgsrc/devel/py-hyperscan/Makefile:1.2 --- pkgsrc/devel/py-hyperscan/Makefile:1.1 Tue May 8 16:54:50 2018 +++ pkgsrc/devel/py-hyperscan/Makefile Wed Jul 25 00:26:30 2018 @@ -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/} --_----------=_153247839158540--