svn commit: r448531 - in head/devel: android-tools-adb android-tools-adb-devel android-tools-fastboot

[Jan Beich]

Author: jbeich
Date: Tue Aug 22 13:30:04 2017
New Revision: 448531
URL: https://svnweb.freebsd.org/changeset/ports/448531

Log:
  devel/android-tools-adb-devel: switch to master FILESDIR

Modified:
  head/devel/android-tools-adb-devel/Makefile   (contents, props changed)
  head/devel/android-tools-adb/Makefile   (contents, props changed)
  head/devel/android-tools-fastboot/Makefile   (contents, props changed)

Modified: head/devel/android-tools-adb-devel/Makefile
==============================================================================
--- head/devel/android-tools-adb-devel/Makefile	Tue Aug 22 13:25:03 2017	(r448530)
+++ head/devel/android-tools-adb-devel/Makefile	Tue Aug 22 13:30:04 2017	(r448531)
@@ -10,7 +10,6 @@ CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-adb
 DISTINFO_FILE=	${.CURDIR}/distinfo
-FILESDIR=	${.CURDIR}/files
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}

Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile	Tue Aug 22 13:25:03 2017	(r448530)
+++ head/devel/android-tools-adb/Makefile	Tue Aug 22 13:30:04 2017	(r448531)
@@ -39,7 +39,7 @@ BUILD_WRKSRC=	${WRKSRC}/adb
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 TEST_WRKSRC=	${BUILD_WRKSRC}
 CPPFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
-MAKEFILE=	${FILESDIR}/Makefile
+MAKEFILE?=	${.CURDIR}/files/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
 		FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}"
 ALL_TARGET=	all

Modified: head/devel/android-tools-fastboot/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/Makefile	Tue Aug 22 13:25:03 2017	(r448530)
+++ head/devel/android-tools-fastboot/Makefile	Tue Aug 22 13:30:04 2017	(r448531)
@@ -37,7 +37,7 @@ CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
 USES=		compiler:c++11-lib pkgconfig uidfix
 BUILD_WRKSRC=	${WRKSRC}/fastboot
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
-MAKEFILE=	${.CURDIR}/files/Makefile # XXX ?= when bmake-only
+MAKEFILE?=	${.CURDIR}/files/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
 		FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" \
 		MANDIR="${PREFIX}/man/man" \