From owner-svn-ports-head@freebsd.org Thu Sep 12 14:57:03 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2EE24D0923; Thu, 12 Sep 2019 14:57:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Thgg0R17z4MGD; Thu, 12 Sep 2019 14:57:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5EFB205DE; Thu, 12 Sep 2019 14:57:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8CEv2CM076139; Thu, 12 Sep 2019 14:57:02 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8CEv2Du076136; Thu, 12 Sep 2019 14:57:02 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201909121457.x8CEv2Du076136@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 12 Sep 2019 14:57:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511886 - in head/devel/android-tools-fastboot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/devel/android-tools-fastboot: . files X-SVN-Commit-Revision: 511886 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2019 14:57:03 -0000 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__)