From owner-svn-ports-all@freebsd.org Sun Aug 6 17:32:19 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52A7BDC0223; Sun, 6 Aug 2017 17:32:19 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2D6CF67D09; Sun, 6 Aug 2017 17:32:19 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v76HWIrj024750; Sun, 6 Aug 2017 17:32:18 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v76HWI2Z024747; Sun, 6 Aug 2017 17:32:18 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201708061732.v76HWI2Z024747@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 6 Aug 2017 17:32:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447476 - in head/sysutils/py-pytsk: . files X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in head/sysutils/py-pytsk: . files X-SVN-Commit-Revision: 447476 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Aug 2017 17:32:19 -0000 Author: antoine Date: Sun Aug 6 17:32:17 2017 New Revision: 447476 URL: https://svnweb.freebsd.org/changeset/ports/447476 Log: Update to 20170802 Modified: head/sysutils/py-pytsk/Makefile head/sysutils/py-pytsk/distinfo head/sysutils/py-pytsk/files/patch-setup.py Modified: head/sysutils/py-pytsk/Makefile ============================================================================== --- head/sysutils/py-pytsk/Makefile Sun Aug 6 16:53:14 2017 (r447475) +++ head/sysutils/py-pytsk/Makefile Sun Aug 6 17:32:17 2017 (r447476) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pytsk -PORTVERSION= 20170508 -PORTREVISION= 1 +PORTVERSION= 20170802 CATEGORIES= sysutils security devel python MASTER_SITES= CHEESESHOP \ https://github.com/py4n6/pytsk/releases/download/${PORTVERSION}/ @@ -14,6 +13,7 @@ MAINTAINER= antoine@FreeBSD.org COMMENT= Python bindings for the Sleuthkit LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libtalloc.so:devel/talloc \ libtsk.so:sysutils/sleuthkit Modified: head/sysutils/py-pytsk/distinfo ============================================================================== --- head/sysutils/py-pytsk/distinfo Sun Aug 6 16:53:14 2017 (r447475) +++ head/sysutils/py-pytsk/distinfo Sun Aug 6 17:32:17 2017 (r447476) @@ -1,3 +1,3 @@ -TIMESTAMP = 1494336296 -SHA256 (pytsk3-20170508.tar.gz) = 23865b4830f2d2819089d7fb2e6eaa1d0a592481580b37faf0e164e5dd99ac51 -SIZE (pytsk3-20170508.tar.gz) = 3004540 +TIMESTAMP = 1501704664 +SHA256 (pytsk3-20170802.tar.gz) = 32259447c997104865ee5e09fb106fc1451019d57a6d4ffa82cbbce45a7b5495 +SIZE (pytsk3-20170802.tar.gz) = 2934331 Modified: head/sysutils/py-pytsk/files/patch-setup.py ============================================================================== --- head/sysutils/py-pytsk/files/patch-setup.py Sun Aug 6 16:53:14 2017 (r447475) +++ head/sysutils/py-pytsk/files/patch-setup.py Sun Aug 6 17:32:17 2017 (r447476) @@ -1,44 +1,43 @@ # Unbundle sleuthkit and talloc ---- setup.py.orig 2017-01-28 14:19:35 UTC +--- setup.py.orig 2017-08-01 06:49:05 UTC +++ setup.py -@@ -169,9 +169,9 @@ class BuildExtCommand(build_ext): +@@ -178,9 +178,9 @@ class BuildExtCommand(build_ext): + def run(self): + compiler = new_compiler(compiler=self.compiler) + # pylint: disable=attribute-defined-outside-init +- self.define = self.configure_source_tree(compiler) ++ self.define = [("HAVE_TSK_LIBTSK_H", "")] - def run(self): - compiler = new_compiler(compiler=self.compiler) -- self.define = self.configure_source_tree(compiler) -+ self.define = [("HAVE_TSK_LIBTSK_H", "")] +- libtsk_path = os.path.join("sleuthkit", "tsk") ++ libtsk_path = os.path.join("%%LOCALBASE%%", "include", "tsk") -- libtsk_path = "sleuthkit/tsk" -+ libtsk_path = "%%LOCALBASE%%/include/tsk" + if not os.access("pytsk3.c", os.R_OK): + # Generate the Python binding code (pytsk3.c). +@@ -390,7 +390,7 @@ class ProjectBuilder(object): + self._argv = argv - if not os.access("pytsk3.c", os.R_OK): - # Generate the Python binding code (pytsk3.c). -@@ -325,7 +325,7 @@ class ProjectBuilder(object): - self._argv = argv + # The path to the sleuthkit/tsk directory. +- self._libtsk_path = os.path.join("sleuthkit", "tsk") ++ self._libtsk_path = os.path.join("%%LOCALBASE%%", "include", "tsk") - # The path to the "tsk" directory. -- self._libtsk_path = "sleuthkit/tsk" -+ self._libtsk_path = "%%LOCALBASE%%/include/tsk" + # Paths under the sleuthkit/tsk directory which contain files we need + # to compile. +@@ -400,13 +400,13 @@ class ProjectBuilder(object): + # The args for the extension builder. + self.extension_args = { + "define_macros": [], +- "include_dirs": ["talloc", self._libtsk_path, "sleuthkit", "."], +- "library_dirs": [], +- "libraries": []} ++ "include_dirs": [".", os.path.join("%%LOCALBASE%%", "include")], ++ "library_dirs": [os.path.join("%%LOCALBASE%%","lib")], ++ "libraries": ["tsk", "talloc"]} - # paths under the tsk/ directory which contain files we need to compile. - self._sub_library_names = "auto base docs fs hashdb img vs".split() -@@ -333,14 +333,14 @@ class ProjectBuilder(object): - # The args for the extension builder. - self.extension_args = dict( - define_macros=[], -- include_dirs=["talloc", "sleuthkit/tsk", "sleuthkit", "."], -- library_dirs=[], -- libraries=[], -+ include_dirs=[".", "%%LOCALBASE%%/include"], -+ library_dirs=["%%LOCALBASE%%/lib"], -+ libraries=["tsk", "talloc"], - ) + # The sources to build. + self._source_files = [ +- "class.c", "error.c", "tsk3.c", "pytsk3.c", "talloc/talloc.c"] ++ "class.c", "error.c", "tsk3.c", "pytsk3.c"] - # The sources to build. - self._source_files = ["class.c", "error.c", "tsk3.c", -- "pytsk3.c", "talloc/talloc.c"] -+ "pytsk3.c"] - - # Path to the top of the unpacked sleuthkit sources. - self._sleuthkit_path = "sleuthkit" + # Path to the top of the unpacked sleuthkit sources. + self._sleuthkit_path = "sleuthkit"