svn commit: r511886 - in head/devel/android-tools-fastboot: . files

[Jan Beich]

Author: jbeich
Date: Thu Sep 12 14:57:02 2019
New Revision: 511886
URL: https://svnweb.freebsd.org/changeset/ports/511886

Log:
  devel/android-tools-fastboot: replace post-extract via GH_SUBDIR

Added:
  head/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp   (contents, props changed)
     - copied, changed from r511885, head/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp
Deleted:
  head/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp
Modified:
  head/devel/android-tools-fastboot/Makefile   (contents, props changed)
  head/devel/android-tools-fastboot/files/Makefile   (contents, props changed)

Modified: head/devel/android-tools-fastboot/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/Makefile	Thu Sep 12 14:45:56 2019	(r511885)
+++ head/devel/android-tools-fastboot/Makefile	Thu Sep 12 14:57:02 2019	(r511886)
@@ -51,9 +51,6 @@ DOCS_MAKE_ARGS_OFF=	FILES="" FILESDIR=""
 post-extract:
 	@${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \
 		${BUILD_WRKSRC}
-# Adjust paths relative to core
-	@(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC})
-	@(cd ${WRKSRC_mkbootimg} && ${COPYTREE_SHARE} . ${WRKSRC})
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H}

Modified: head/devel/android-tools-fastboot/files/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/files/Makefile	Thu Sep 12 14:45:56 2019	(r511885)
+++ head/devel/android-tools-fastboot/files/Makefile	Thu Sep 12 14:57:02 2019	(r511886)
@@ -35,7 +35,7 @@ SRCS+=	threads.cpp
 SRCS+=	diagnose_usb.cpp
 
 # required by fs_mgr/liblp
-.PATH: ${.CURDIR}/../ext4_utils
+.PATH: ${.CURDIR}/../extras/ext4_utils
 SRCS+=	ext4_sb.cpp
 SRCS+=	ext4_utils.cpp
 
@@ -91,10 +91,10 @@ CPPFLAGS+=	-Dpread64=pread
 CPPFLAGS+=	-DFAKE_LOG_DEVICE=1
 CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	-I${.CURDIR}/../include
-CPPFLAGS+=	-I${.CURDIR}/../include/bootimg
+CPPFLAGS+=	-I${.CURDIR}/../mkbootimg/include/bootimg
 CPPFLAGS+=	-I${.CURDIR}/../base/include
 CPPFLAGS+=	-I${.CURDIR}/../diagnose_usb/include
-CPPFLAGS+=	-I${.CURDIR}/../ext4_utils/include
+CPPFLAGS+=	-I${.CURDIR}/../extras/ext4_utils/include
 CPPFLAGS+=	-I${.CURDIR}/../fs_mgr/liblp/include
 CPPFLAGS+=	-I${.CURDIR}/../libsparse/include
 CPPFLAGS+=	-I${.CURDIR}/../libziparchive/include

Copied and modified: head/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp (from r511885, head/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp)
==============================================================================
--- head/devel/android-tools-fastboot/files/patch-ext4__utils_ext4__utils.cpp	Thu Sep 12 14:45:56 2019	(r511885, copy source)
+++ head/devel/android-tools-fastboot/files/patch-extras_ext4__utils_ext4__utils.cpp	Thu Sep 12 14:57:02 2019	(r511886)
@@ -1,5 +1,5 @@
---- ext4_utils/ext4_utils.cpp.orig	2019-08-13 02:10:50 UTC
-+++ ext4_utils/ext4_utils.cpp
+--- extras/ext4_utils/ext4_utils.cpp.orig	2019-08-13 02:10:50 UTC
++++ extras/ext4_utils/ext4_utils.cpp
 @@ -32,8 +32,16 @@
  
  #if defined(__linux__)