Index: head/sysutils/py-pytsk/Makefile =================================================================== --- head/sysutils/py-pytsk/Makefile (revision 524037) +++ head/sysutils/py-pytsk/Makefile (revision 524038) @@ -1,31 +1,30 @@ # Created by: Antoine Brodin # $FreeBSD$ PORTNAME= pytsk -PORTVERSION= 20190507 -PORTREVISION= 2 +PORTVERSION= 20200117 CATEGORIES= sysutils security devel python -MASTER_SITES= CHEESESHOP \ - https://github.com/py4n6/pytsk/releases/download/${PORTVERSION}/ +MASTER_SITES= CHEESESHOP +# https://github.com/py4n6/pytsk/releases/download/${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}3-${PORTVERSION} 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 -USES= python +USES= python:3.5+ USE_PYTHON= distutils autoplist post-extract: ${RM} ${WRKSRC}/pytsk3.c post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.py .include Index: head/sysutils/py-pytsk/distinfo =================================================================== --- head/sysutils/py-pytsk/distinfo (revision 524037) +++ head/sysutils/py-pytsk/distinfo (revision 524038) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557324063 -SHA256 (pytsk3-20190507.tar.gz) = f560b2269e1942884959ac60fcb9a55452f98693abc437fd806c403f64497ea5 -SIZE (pytsk3-20190507.tar.gz) = 3153833 +TIMESTAMP = 1579428967 +SHA256 (pytsk3-20200117.tar.gz) = 56177164a358e98baa258296aa2e9a509304dc8dab053abac347435a0978d962 +SIZE (pytsk3-20200117.tar.gz) = 3060827 Index: head/sysutils/py-pytsk/files/patch-setup.py =================================================================== --- head/sysutils/py-pytsk/files/patch-setup.py (revision 524037) +++ head/sysutils/py-pytsk/files/patch-setup.py (revision 524038) @@ -1,43 +1,43 @@ # Unbundle sleuthkit and talloc ---- setup.py.orig 2019-03-04 18:14:03 UTC +--- setup.py.orig 2020-01-17 19:49:31 UTC +++ setup.py -@@ -232,9 +232,9 @@ class BuildExtCommand(build_ext): +@@ -245,9 +245,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", "")] - 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). -@@ -404,7 +404,7 @@ class ProjectBuilder(object): +@@ -409,7 +409,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. -@@ -414,13 +414,13 @@ class ProjectBuilder(object): +@@ -418,13 +418,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"] # Path to the top of the unpacked sleuthkit sources. self._sleuthkit_path = "sleuthkit"