Index: head/sysutils/py-pytsk/Makefile =================================================================== --- head/sysutils/py-pytsk/Makefile (revision 492039) +++ head/sysutils/py-pytsk/Makefile (revision 492040) @@ -1,30 +1,30 @@ # Created by: Antoine Brodin # $FreeBSD$ PORTNAME= pytsk -PORTVERSION= 20190103 +PORTVERSION= 20190121 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 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 492039) +++ head/sysutils/py-pytsk/distinfo (revision 492040) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546525493 -SHA256 (pytsk3-20190103.tar.gz) = c306d441d693da6cd26ce0f0cd96cec8094392a92d61cd474db28b9c19f46d8f -SIZE (pytsk3-20190103.tar.gz) = 2993563 +TIMESTAMP = 1548138834 +SHA256 (pytsk3-20190121.tar.gz) = ca7bb133d34f504d09b67c34be1e8d0965e1141a7fc8a2763cb4d046a870a629 +SIZE (pytsk3-20190121.tar.gz) = 3180752 Index: head/sysutils/py-pytsk/files/patch-setup.py =================================================================== --- head/sysutils/py-pytsk/files/patch-setup.py (revision 492039) +++ head/sysutils/py-pytsk/files/patch-setup.py (revision 492040) @@ -1,43 +1,43 @@ # Unbundle sleuthkit and talloc ---- setup.py.orig 2019-01-03 11:50:09 UTC +--- setup.py.orig 2019-01-21 19:31:43 UTC +++ setup.py -@@ -179,9 +179,9 @@ class BuildExtCommand(build_ext): +@@ -230,9 +230,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). -@@ -351,7 +351,7 @@ class ProjectBuilder(object): +@@ -402,7 +402,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. -@@ -361,13 +361,13 @@ class ProjectBuilder(object): +@@ -412,13 +412,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"