Hi ports@,
Here is a diff to update keystone to latest version (0.9.1).
The patch for kstool is no longer necessary and has been removed.
Bumping SHARED_LIBS major as 'ks_free' function signature was altered:
-void ks_free(void *p);
+void ks_free(unsigned char *p);
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/keystone/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 15 Jun 2016 19:22:31 -0000 1.1.1.1
+++ Makefile 3 Aug 2016 10:48:57 -0000
@@ -4,9 +4,9 @@ COMMENT = multi-platform, multi-architec
GH_ACCOUNT = keystone-engine
GH_PROJECT = keystone
-GH_TAGNAME = 0.9
+GH_TAGNAME = 0.9.1
-SHARED_LIBS = keystone 0.0
+SHARED_LIBS = keystone 1.0
CATEGORIES = devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/keystone/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 15 Jun 2016 19:22:31 -0000 1.1.1.1
+++ distinfo 3 Aug 2016 10:48:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (keystone-0.9.tar.gz) = lMWCQ9rh7GWpfSugKrsjI7TlyCUB63+M/YW0YKAZQVc=
-SIZE (keystone-0.9.tar.gz) = 2878845
+SHA256 (keystone-0.9.1.tar.gz) = 6dcGzQwZxJplJLd9uBWESbnENLQV+/lKBzlotoz4qfA=
+SIZE (keystone-0.9.1.tar.gz) = 4326151
Index: patches/patch-kstool_kstool_cpp
===================================================================
RCS file: patches/patch-kstool_kstool_cpp
diff -N patches/patch-kstool_kstool_cpp
--- patches/patch-kstool_kstool_cpp 15 Jun 2016 19:22:31 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-$OpenBSD: patch-kstool_kstool_cpp,v 1.1.1.1 2016/06/15 19:22:31 rpointel Exp $
---- kstool/kstool.cpp.orig Sun Jun 5 23:49:29 2016
-+++ kstool/kstool.cpp Sun Jun 5 23:49:45 2016
-@@ -68,6 +68,8 @@ static void usage(char *prog)
- if (ks_arch_supported(KS_ARCH_SYSTEMZ)) {
- printf(" systemz: SystemZ (S390x)\n");
- }
-+
-+ printf("\n");
- }
-
- int main(int argc, char **argv)
-@@ -85,7 +87,7 @@ int main(int argc, char **argv)
- mode = argv[1];
-
- int flags;
-- if (-1 == (flags = fcntl(STDIN_FILENO, F_GETFL, 0)))
-+ if ((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) == -1)
- flags = 0;
-
- fcntl(STDIN_FILENO, F_SETFL, flags | O_NONBLOCK);
-@@ -93,7 +95,7 @@ int main(int argc, char **argv)
- size_t index = 0;
-
- char buf[1024];
-- while( fgets(buf, sizeof(buf), stdin) ) {
-+ while(fgets(buf, sizeof(buf), stdin)) {
- input = (char*)realloc(assembly, index + strlen(buf));
- if (!input) {
- printf("Failed to allocate memory.");
-@@ -104,7 +106,13 @@ int main(int argc, char **argv)
- index += strlen(buf);
- }
-
-+ fcntl(STDIN_FILENO, F_SETFL, flags);
-+
- assembly = input;
-+ if (!assembly) {
-+ usage(argv[0]);
-+ return -1;
-+ }
- } else if (argc == 3) {
- #else
- if (argc == 3) {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/keystone/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 15 Jun 2016 19:22:31 -0000 1.1.1.1
+++ pkg/PLIST 3 Aug 2016 10:48:57 -0000
@@ -11,3 +11,4 @@ include/keystone/sparc.h
include/keystone/systemz.h
include/keystone/x86.h
@lib lib/libkeystone.so.${LIBkeystone_VERSION}
+lib/pkgconfig/keystone.pc
