Hi,
this is the diff to update py-tsk to latest release.
Ok?
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/py-tsk/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile 18 Jul 2017 09:43:40 -0000 1.3
+++ Makefile 31 Oct 2017 15:47:48 -0000
@@ -2,7 +2,7 @@
COMMENT = Python bindings for The Sleuth Kit (libtsk)
-MODPY_EGG_VERSION = 20170508
+MODPY_EGG_VERSION = 20170802
DISTNAME = pytsk3-${MODPY_EGG_VERSION}
PKGNAME = py-tsk-${MODPY_EGG_VERSION}
@@ -18,6 +18,9 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
+
+FLAVORS = python3
+FLAVOR ?=
WANTLIB += pthread talloc tsk ${MODPY_WANTLIB}
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/py-tsk/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 18 Jul 2017 09:43:40 -0000 1.3
+++ distinfo 31 Oct 2017 15:47:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (pytsk3-20170508.tar.gz) = I4ZbSDDy0oGQidf7Lm6qHQpZJIFYCzf68OFk5d2ZrFE=
-SIZE (pytsk3-20170508.tar.gz) = 3004540
+SHA256 (pytsk3-20170802.tar.gz) = MiWUR8mXEEhl7l4J+xBvwUUQGdV6bU/6gsu85Fp7VJU=
+SIZE (pytsk3-20170802.tar.gz) = 2934331
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/sysutils/py-tsk/patches/patch-setup_py,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-setup_py
--- patches/patch-setup_py 22 Jan 2017 08:18:04 -0000 1.1.1.1
+++ patches/patch-setup_py 31 Oct 2017 15:47:48 -0000
@@ -1,43 +1,40 @@
$OpenBSD: patch-setup_py,v 1.1.1.1 2017/01/22 08:18:04 rpointel Exp $
---- setup.py.orig Thu Jul 21 21:02:40 2016
-+++ setup.py Thu Oct 13 22:33:14 2016
-@@ -171,7 +171,7 @@ class BuildExtCommand(build_ext):
- compiler = new_compiler(compiler=self.compiler)
- self.define = self.configure_source_tree(compiler)
-
-- 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).
-@@ -286,7 +286,7 @@ class UpdateCommand(Command):
- with open("version.txt", "w") as fd:
- fd.write(self.version)
-
-- libtsk_path = "sleuthkit/tsk"
-+ libtsk_path = "${LOCALBASE}/include/tsk"
-
- # Generate the Python binding code (pytsk3.c).
- libtsk_header_files = [
-@@ -325,7 +325,7 @@ class ProjectBuilder(object):
- self._argv = argv
-
- # The path to the "tsk" directory.
-- self._libtsk_path = "sleuthkit/tsk"
-+ self._libtsk_path = "${LOCALBASE}/include/tsk"
-
- # 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,9 +333,9 @@ 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"],
- )
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -180,7 +180,7 @@ class BuildExtCommand(build_ext):
+ # pylint: disable=attribute-defined-outside-init
+ self.define = self.configure_source_tree(compiler)
+
+- libtsk_path = os.path.join("sleuthkit", "tsk")
++ libtsk_path = os.path.join("${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
+
+ # The path to the sleuthkit/tsk directory.
+- self._libtsk_path = os.path.join("sleuthkit", "tsk")
++ self._libtsk_path = os.path.join("${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"]}
+
+ # 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.
+ # Path to the top of the unpacked sleuthkit sources.
+ self._sleuthkit_path = "sleuthkit"
