On 3/13/21 11:38 AM, Stuart Henderson wrote:
On 2021/03/13 08:55, Aisha Tammy wrote:
+pre-build:
+ cd ${WRKSRC} && env -i ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
+ -f LIB_MAKEFILE
..
new file mode 100644
index 00000000000..0e491ddbf54
--- /dev/null
+++ b/devel/py-llvmlite/patches/patch-LIB_MAKEFILE
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+upstream libllvmlite.so doesn't build nicely
+
+Index: config_makefile
+--- LIB_MAKEFILE.orig
++++ LIB_MAKEFILE
+@@ -0,0 +1,5 @@
++SRC=ffi/*.cpp
++
++ffi/libllvmlite.so:
++ $(CXX) -shared $(CXXFLAGS) $(LDFLAGS) -o $@ $(SRC) $(LDLIBS)
++
can the C compiler line just be included directly in pre-build? that would
seem easier than adding to both pre-build and adding a new file in a patch.
+++ b/security/py-miasm/Makefile
@@ -4,13 +4,15 @@ BROKEN-i386 = uint128_t
COMMENT = reverse engineering framework in Python
-MODPY_EGG_VERSION = 2.0.1.1
+MODPY_EGG_VERSION = 0.1.3_pl20210304
DISTNAME = miasm-${MODPY_EGG_VERSION}
MODPY_EGG_VERSION is for the version number in .egg-info filenames,
which is 2.0 in the old version and, err, "git_archive.dev_Format_h" in
the new one. Maybe just drop MODPY_EGG_VERSION for now..?
(upstreams don't always have the version number in .egg-info set to
anything resembling the release version numbers..)
For the version that makes it into PKGNAME (via DISTNAME) please put
the pl next to the main version (i.e. drop the _)
PKGNAME = py-${DISTNAME}
+EPOCH = 0
epoch makes sense, the old package version number didn't match upstream's
versioning at all so it makes sense to fix that
+RUN_DEPENDS = devel/angr/py-z3-solver \
oh another one of those py3-* ports without FLAVOR, I thought I had got
them all already :/
+SIZE (miasm-0.1.3_pl20210304-43fef27b.tar.gz) = 1220722
diff --git a/security/py-miasm/pkg/PLIST b/security/py-miasm/pkg/PLIST
index 749e822720e..c7790dadf25 100644
--- a/security/py-miasm/pkg/PLIST
+++ b/security/py-miasm/pkg/PLIST
@@ -1,420 +1,484 @@
-@comment $OpenBSD: PLIST,v 1.2 2019/01/26 06:45:20 rpointel Exp $
-lib/python${MODPY_VERSION}/site-packages/Miasm-2.0-py${MODPY_VERSION}.egg-info
-lib/python${MODPY_VERSION}/site-packages/miasm2/
...
-lib/python${MODPY_VERSION}/site-packages/miasm2/os_dep/win_api_x86_32_seh.py
-lib/python${MODPY_VERSION}/site-packages/miasm2/os_dep/win_api_x86_32_seh.pyc
+@comment $OpenBSD: PLIST,v$
+lib/python${MODPY_VERSION}/site-packages/miasm/
+lib/python${MODPY_VERSION}/site-packages/miasm-git_archive.dev_Format_h-py${MODPY_VERSION}.egg-info
needs "@pkgpath security/py-miasm" to handle the unflavoured-to-flavoured
move, plus a quirks entry to rename py-miasm to py3-miasm.
Thanks a lot for all the insightful comments :-)
I'm going to have to learn this quirks stuff, this is my first time
looking at this.
Will need another few days.
Cheers,
Aisha
