svn commit: r568227 - in head/devel/radare2: . files

[Steve Wills]

Author: swills
Date: Sat Mar 13 05:51:26 2021
New Revision: 568227
URL: https://svnweb.freebsd.org/changeset/ports/568227

Log:
  devel/radare2: keep KF_TYPE_CRYPTO where possible [1]
  
  While here, clean up a bit
  
  PR:		253923 [1]
  Submitted by:	Michael Zhilin <mizhka at gmail.com> [1]

Added:
  head/devel/radare2/files/extra-patch-Makefile   (contents, props changed)
Modified:
  head/devel/radare2/Makefile   (contents, props changed)
  head/devel/radare2/files/patch-libr_debug_p_native_bsd_bsd__debug.c   (contents, props changed)

Modified: head/devel/radare2/Makefile
==============================================================================
--- head/devel/radare2/Makefile	Sat Mar 13 04:00:55 2021	(r568226)
+++ head/devel/radare2/Makefile	Sat Mar 13 05:51:26 2021	(r568227)
@@ -3,6 +3,7 @@
 
 PORTNAME=	radare2
 DISTVERSION=	5.1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	swills at FreeBSD.org
@@ -11,29 +12,27 @@ COMMENT=	Tools to disasm, debug, analyze, and manipula
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-NOT_FOR_ARCHS=		armv6 armv7 mips mips64 powerpc powerpc64 powerpc64le powerpcspe riscv64 sparc64
+NOT_FOR_ARCHS=	armv6 armv7 mips mips64 powerpc powerpc64 powerpc64le \
+		powerpcspe riscv64 sparc64
 NOT_FOR_ARCHS_REASON=	does not build: Unsupported BSD architecture
 
 LIB_DEPENDS=	libcapstone.so:devel/capstone4
 
 USES=		gmake localbase pathfix pkgconfig
-USE_GITHUB=		yes
-USE_LDCONFIG=		yes
+USE_GITHUB=	yes
 
 CONFIGURE_ARGS=	--with-syscapstone
-CFLAGS+=		-I${PREFIX}/include/capstone
-GH_ACCOUNT=		radare
+CFLAGS+=	-I${PREFIX}/include/capstone
+GH_ACCOUNT=	radare
 PATHFIX_MAKEFILEIN=	Makefile
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
 
 MAKE_ENV+=	HOST_CC=${CC}
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch-DOCS-off:
-	@${REINPLACE_CMD} -e 's| install-doc ||g' \
-		${WRKSRC}/Makefile
+DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-Makefile
 
 # libr/flag/d/Makefile generates an r2 script from all files in
 # current directory, including .bak file left by ${REINPLACE_CMD}

Added: head/devel/radare2/files/extra-patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/radare2/files/extra-patch-Makefile	Sat Mar 13 05:51:26 2021	(r568227)
@@ -0,0 +1,11 @@
+--- Makefile.orig	2021-03-13 00:32:05.881126000 -0500
++++ Makefile	2021-03-13 00:32:11.591943000 -0500
+@@ -212,7 +212,7 @@
+ 	for FILE in $(shell cd doc ; ls) ; do \
+ 		ln -fs "$(PWD)/doc/$$FILE" "${DESTDIR}${DOCDIR}" ; done
+ 
+-install: install-doc install-man install-www install-pkgconfig
++install: install-man install-www install-pkgconfig
+ 	$(MAKE) -C libr install
+ 	$(MAKE) -C binr install
+ 	$(MAKE) -C shlr install

Modified: head/devel/radare2/files/patch-libr_debug_p_native_bsd_bsd__debug.c
==============================================================================
--- head/devel/radare2/files/patch-libr_debug_p_native_bsd_bsd__debug.c	Sat Mar 13 04:00:55 2021	(r568226)
+++ head/devel/radare2/files/patch-libr_debug_p_native_bsd_bsd__debug.c	Sat Mar 13 05:51:26 2021	(r568227)
@@ -1,10 +1,12 @@
---- libr/debug/p/native/bsd/bsd_debug.c.orig	2021-02-13 20:27:22 UTC
+--- libr/debug/p/native/bsd/bsd_debug.c.orig	2021-02-11 00:59:05 UTC
 +++ libr/debug/p/native/bsd/bsd_debug.c
-@@ -488,7 +488,6 @@ RList *bsd_desc_list(int pid) {
+@@ -488,7 +488,9 @@ RList *bsd_desc_list(int pid) {
  		case KF_TYPE_PIPE: type = 'p'; break;
  		case KF_TYPE_FIFO: type = 'f'; break;
  		case KF_TYPE_KQUEUE: type = 'k'; break;
--		case KF_TYPE_CRYPTO: type = 'c'; break;
++#if __FreeBSD_version < 1300130
+ 		case KF_TYPE_CRYPTO: type = 'c'; break;
++#endif
  		case KF_TYPE_MQUEUE: type = 'm'; break;
  		case KF_TYPE_SHM: type = 'h'; break;
  		case KF_TYPE_PTS: type = 't'; break;