Index: head/devel/android-tools-adb/files/Makefile
===================================================================
--- head/devel/android-tools-adb/files/Makefile	(revision 398010)
+++ head/devel/android-tools-adb/files/Makefile	(revision 398011)
@@ -1,48 +1,52 @@
 # $FreeBSD$
 
 PROG=	adb
 NO_MAN=
 BINDIR?=/usr/bin
 
 SRCS+= adb.c
 SRCS+= adb_client.c
 SRCS+= adb_auth_host.c
 SRCS+= commandline.c
 SRCS+= console.c
 SRCS+= file_sync_client.c
 SRCS+= fdevent.c
 SRCS+= get_my_path_freebsd.c
 SRCS+= services.c
 SRCS+= sockets.c
 SRCS+= transport.c
 SRCS+= transport_local.c
 SRCS+= transport_usb.c
 SRCS+= usb_libusb.c
 SRCS+= usb_vendors.c
 
 .PATH: ${.CURDIR}/../libcutils
 SRCS+= socket_inaddr_any_server.c
 SRCS+= socket_local_client.c
 SRCS+= socket_local_server.c
 SRCS+= socket_loopback_client.c
 SRCS+= socket_loopback_server.c
 SRCS+= socket_network_client.c
 SRCS+= load_file.c
 
 .PATH: ${.CURDIR}/../libzipfile
 SRCS+= centraldir.c
 SRCS+= zipfile.c
 
-CFLAGS+= -DADB_HOST=1
-CFLAGS+= -DHAVE_FORKEXEC=1
-CFLAGS+= -DHAVE_SYMLINKS
-CFLAGS+= -DHAVE_TERMIO_H
-CFLAGS+= -DHAVE_SYS_SOCKET_H
-CFLAGS+= -D_FILE_OFFSET_BITS=64
-CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../include
+CPPFLAGS+= -DADB_HOST=1
+CPPFLAGS+= -DHAVE_FORKEXEC=1
+CPPFLAGS+= -DHAVE_SYMLINKS
+CPPFLAGS+= -DHAVE_TERMIO_H
+CPPFLAGS+= -DHAVE_SYS_SOCKET_H
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}/../include
+
+.ifndef COMPILE.c
+CFLAGS+= ${CPPFLAGS}
+.endif
 
 LDADD+= -lcrypto -lpthread -lusb -lz
 DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
 
 .include <bsd.prog.mk>
Index: head/devel/android-tools-adb-devel/Makefile
===================================================================
--- head/devel/android-tools-adb-devel/Makefile	(revision 398010)
+++ head/devel/android-tools-adb-devel/Makefile	(revision 398011)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 DISTVERSION=	m-preview-1212
 DISTVERSIONSUFFIX=	-g94c617ccbba4
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-adb
 DISTINFO_FILE=	${.CURDIR}/distinfo
 MAKEFILE=	${.CURDIR}/files/Makefile
 FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${.CURDIR}/files
 
 USES=		compiler:c++11-lib
 BUILD_WRKSRC=	${WRKSRC}/adb
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKE_ENV=	FILESDIR="${FILESDIR}"
-CFLAGS+=	-DADB_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
+CPPFLAGS+=	-DADB_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
 ALL_TARGET=	all
 
 OPTIONS_DEFINE=	TEST
 
 TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest \
 		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 TEST_USES=	python:2.7,build
 TEST_ALL_TARGET=adb_test
 
 pre-install-TEST-on:
 	${BUILD_WRKSRC}/adb_test
 	PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \
 		${PYTHON_CMD} ${BUILD_WRKSRC}/test_adb.py
 	PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \
 		${PYTHON_CMD} ${BUILD_WRKSRC}/test_device.py
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-adb-devel/files/Makefile
===================================================================
--- head/devel/android-tools-adb-devel/files/Makefile	(revision 398010)
+++ head/devel/android-tools-adb-devel/files/Makefile	(revision 398011)
@@ -1,95 +1,98 @@
 # $FreeBSD$
 
 PROG_CXX=adb
 NO_MAN=
 BINDIR?=/usr/bin
 
 SRCS+= adb.cpp
 SRCS+= adb_auth.cpp
 SRCS+= adb_auth_host.cpp
 SRCS+= adb_client.cpp
 SRCS+= adb_io.cpp
 SRCS+= adb_listeners.cpp
 SRCS+= adb_utils.cpp
 SRCS+= commandline.cpp
 SRCS+= console.cpp
 SRCS+= fdevent.cpp
 SRCS+= file_sync_client.cpp
 SRCS+= services.cpp
 SRCS+= shell_service_protocol.cpp
 SRCS+= sockets.cpp
 SRCS+= transport.cpp
 SRCS+= transport_local.cpp
 SRCS+= transport_usb.cpp
 
 TEST_SRCS+= adb_io_test.cpp
 TEST_SRCS+= adb_utils_test.cpp
 TEST_SRCS+= fdevent_test.cpp
 TEST_SRCS+= shell_service_protocol_test.cpp
 TEST_SRCS+= socket_test.cpp
 TEST_SRCS+= transport_test.cpp
 
 .PATH: ${.CURDIR}/client
 SRCS+= main.cpp
 
 .PATH: ${FILESDIR}
 SRCS+= get_my_path_freebsd.cpp
 SRCS+= usb_libusb.cpp
 
 .PATH: ${.CURDIR}/../base
 SRCS+= file.cpp
 SRCS+= logging.cpp
 SRCS+= strings.cpp
 SRCS+= stringprintf.cpp
 TEST_SRCS+= file_test.cpp
 TEST_SRCS+= logging_test.cpp
 TEST_SRCS+= stringprintf_test.cpp
 TEST_SRCS+= strings_test.cpp
 TEST_SRCS+= test_main.cpp
 TEST_SRCS+= test_utils.cpp
 
 .PATH: ${.CURDIR}/../libcutils
 SRCS+= socket_inaddr_any_server.c
 SRCS+= socket_local_client.c
 SRCS+= socket_local_server.c
 SRCS+= socket_loopback_client.c
 SRCS+= socket_loopback_server.c
 SRCS+= socket_network_client.c
 SRCS+= load_file.c
 SRCS+= threads.c
 
 # required by base/file.cpp
 .PATH: ${.CURDIR}/../liblog
 SRCS+= fake_log_device.c
 SRCS+= logd_write.c
-CFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
+CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
 
-CFLAGS+= -DADB_HOST=1
-CFLAGS+= -DHAVE_FORKEXEC=1
-CFLAGS+= -DHAVE_SYMLINKS
-CFLAGS+= -DHAVE_TERMIO_H
-CFLAGS+= -DHAVE_SYS_SOCKET_H
-CFLAGS+= -D_FILE_OFFSET_BITS=64
-CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../include
-CFLAGS+= -I${.CURDIR}/../base/include
-CFLAGS+=${CFLAGS.${.IMPSRC:T}}
-
+CPPFLAGS+= -DADB_HOST=1
+CPPFLAGS+= -DHAVE_FORKEXEC=1
+CPPFLAGS+= -DHAVE_SYMLINKS
+CPPFLAGS+= -DHAVE_TERMIO_H
+CPPFLAGS+= -DHAVE_SYS_SOCKET_H
+CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}/../include
+CPPFLAGS+= -I${.CURDIR}/../base/include
+CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
 CXXFLAGS+= -std=gnu++11
-CXXFLAGS+= ${CFLAGS:N-std*}
 
-TEST_CFLAGS+= $$(${GTEST_CONFIG} --cppflags)
+.ifndef COMPILE.c
+CFLAGS+= ${CPPFLAGS}
+CXXFLAGS+= ${CPPFLAGS}
+.endif
+
+TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
 .for f in ${TEST_SRCS}
-CFLAGS.${f}+= ${TEST_CFLAGS}
+CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
 .endfor
 
 LDADD+= -lcrypto -lpthread -lusb -lz
 DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
 TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags)
 
 GTEST_CONFIG?= gtest-config
 
 adb_test: ${SRCS:R:S/$/.o/:Nmain.o:Ncommandline.o} ${TEST_SRCS:R:S/$/.o/}
-	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
+	${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
 
 .include <bsd.prog.mk>
Index: head/devel/android-tools-fastboot/Makefile
===================================================================
--- head/devel/android-tools-fastboot/Makefile	(revision 398010)
+++ head/devel/android-tools-fastboot/Makefile	(revision 398011)
@@ -1,65 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	android-
 DISTVERSION?=	5.1.1_r4
 PORTREVISION?=	5
 CATEGORIES=	devel
 MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp,manpage
 DISTFILES=	bash_completion.d/fastboot?id=2b8cfec:bashcomp \
 		fastboot.1?id=706e754:manpage
 EXTRACT_ONLY=	${DISTFILES:N*\:bashcomp:N*\:manpage:C/:.*//}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Android Fastboot protocol CLI tool
 
 LICENSE=	APACHE20 BSD2CLAUSE PUBLIC_DOMAIN
 LICENSE_COMB=	multi
 LICENSE_NAME_PUBLIC_DOMAIN=	Public Domain
 LICENSE_FILE_PUBLIC_DOMAIN=	${WRKSRC}/libselinux/NOTICE
 LICENSE_PERMS_PUBLIC_DOMAIN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	android jbeich:extras,libselinux
 GH_PROJECT=	platform_system_core platform_system_extras:extras \
 		platform_external_libselinux:libselinux
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
 
 USES+=		uidfix
 BUILD_WRKSRC=	${WRKSRC}/fastboot
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV=	FILESDIR="${FILESDIR}" BINDIR="${PREFIX}/bin" \
 		MANDIR="${PREFIX}/man/man" \
 		LIBPCRE="${LOCALBASE}/lib/libpcre.a"
-CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	bin/fastboot \
 		%%BASH%%etc/bash_completion.d/fastboot \
 		man/man1/fastboot.1.gz
 PORTDOCS=	fastboot_protocol.txt
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	BASH DOCS
 OPTIONS_SUB=	yes
 
 BASH_VARS=	LICENSE+=MIT # debian/copyright
 
 post-extract:
 	@${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \
 		${BUILD_WRKSRC}/${DISTFILES:M*\:manpage:C/\?.*//}
 # Adjust paths relative to core
 	@(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC})
 	@${MV} ${WRKSRC_libselinux} ${WRKSRC}/libselinux
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//:H}
 	${INSTALL_DATA} ${_DISTDIR}/${DISTFILES:M*\:bashcomp:C/:.*//} \
 		${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//}
 	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/devel/android-tools-fastboot/files/Makefile
===================================================================
--- head/devel/android-tools-fastboot/files/Makefile	(revision 398010)
+++ head/devel/android-tools-fastboot/files/Makefile	(revision 398011)
@@ -1,71 +1,75 @@
 # $FreeBSD$
 
 PROG=	fastboot
 BINDIR?=/usr/bin
 
 SRCS+=	bootimg.c
 SRCS+=	engine.c
 SRCS+=	fastboot.c
 SRCS+=	fs.c
 SRCS+=	protocol.c
 SRCS+=	util.c
 
 .PATH:	${FILESDIR}
 SRCS+=	usb_freebsd.c
 SRCS+=	util_freebsd.c
 
 .PATH: ${.CURDIR}/../ext4_utils
 SRCS+=	allocate.c
 SRCS+=	contents.c
 SRCS+=	crc16.c
 SRCS+=	ext4_sb.c
 SRCS+=	ext4_utils.c
 SRCS+=	ext4fixup.c
 SRCS+=	extent.c
 SRCS+=	indirect.c
 SRCS+=	make_ext4fs.c
 SRCS+=	sha1.c
 SRCS+=	uuid.c
 SRCS+=	wipe.c
 
 .PATH:	${.CURDIR}/../libselinux/src
 SRCS+=	callbacks.c
 SRCS+=	check_context.c
 SRCS+=	freecon.c
 SRCS+=	init.c
 SRCS+=	label.c
 SRCS+=	label_android_property.c
 SRCS+=	label_file.c
-CFLAGS.init.c+=		-DDARWIN # statfs
+CPPFLAGS.init.c+=	-DDARWIN # statfs
 
 .PATH:	${.CURDIR}/../libsparse
 SRCS+=	backed_block.c
 SRCS+=	output_file.c
 SRCS+=	sparse.c
 SRCS+=	sparse_crc32.c
 SRCS+=	sparse_err.c
 SRCS+=	sparse_read.c
 
 .PATH:	${.CURDIR}/../libzipfile
 SRCS+=	centraldir.c
 SRCS+=	zipfile.c
-CFLAGS.centraldir.c+=	-Ulseek64 # utils/Compat.h
+CPPFLAGS.centraldir.c+=	-Ulseek64 # utils/Compat.h
 
-CFLAGS+=-D_FILE_OFFSET_BITS=64 # utils/Compat.h
-CFLAGS+=-Doff64_t=off_t
-CFLAGS+=-Dftruncate64=ftruncate
-CFLAGS+=-Dlseek64=lseek
-CFLAGS+=-Dmmap64=mmap
-CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../include
-CFLAGS+=-I${.CURDIR}/../mkbootimg
-CFLAGS+=-I${.CURDIR}/../ext4_utils
-CFLAGS+=-I${.CURDIR}/../f2fs_utils
-CFLAGS+=-I${.CURDIR}/../libselinux/include
-CFLAGS+=-I${.CURDIR}/../libsparse/include
-CFLAGS+=${CFLAGS.${.IMPSRC:T}}
+CPPFLAGS+=	-D_FILE_OFFSET_BITS=64 # utils/Compat.h
+CPPFLAGS+=	-Doff64_t=off_t
+CPPFLAGS+=	-Dftruncate64=ftruncate
+CPPFLAGS+=	-Dlseek64=lseek
+CPPFLAGS+=	-Dmmap64=mmap
+CPPFLAGS+=	-I${.CURDIR}
+CPPFLAGS+=	-I${.CURDIR}/../include
+CPPFLAGS+=	-I${.CURDIR}/../mkbootimg
+CPPFLAGS+=	-I${.CURDIR}/../ext4_utils
+CPPFLAGS+=	-I${.CURDIR}/../f2fs_utils
+CPPFLAGS+=	-I${.CURDIR}/../libselinux/include
+CPPFLAGS+=	-I${.CURDIR}/../libsparse/include
+CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
+
+.ifndef COMPILE.c
+CFLAGS+=	${CPPFLAGS}
+.endif
 
 LDADD+=	-lpcre -lusb -lz
 DPADD+=	${LIBPCRE} ${LIBUSB} ${LIBZ}
 
 .include <bsd.prog.mk>
Index: head/devel/android-tools-fastboot-devel/Makefile
===================================================================
--- head/devel/android-tools-fastboot-devel/Makefile	(revision 398010)
+++ head/devel/android-tools-fastboot-devel/Makefile	(revision 398011)
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
 DISTVERSION=	m-preview-1212
 DISTVERSIONSUFFIX=	-g94c617ccbba4
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-195-g7434d1f:extras \
 		${DISTVERSIONFULL:C/-[0-9].*//}-19-g249094f:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-fastboot
 DISTINFO_FILE=	${.CURDIR}/distinfo
 FILESDIR=	${.CURDIR}/files
 EXTRA_PATCHES+=	${.CURDIR}/files/patch-*
 
 USES=		compiler:c++11-lib
-CFLAGS+=	-DFASTBOOT_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
+CPPFLAGS+=	-DFASTBOOT_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-fastboot-devel/files/Makefile
===================================================================
--- head/devel/android-tools-fastboot-devel/files/Makefile	(revision 398010)
+++ head/devel/android-tools-fastboot-devel/files/Makefile	(revision 398011)
@@ -1,93 +1,96 @@
 # $FreeBSD$
 
 PROG_CXX=fastboot
 BINDIR?=/usr/bin
 
 SRCS+=	bootimg_utils.cpp
 SRCS+=	engine.cpp
 SRCS+=	fastboot.cpp
 SRCS+=	fs.cpp
 SRCS+=	protocol.cpp
 SRCS+=	util.cpp
 
 .PATH:	${FILESDIR}
 SRCS+=	usb_freebsd.cpp
 SRCS+=	util_freebsd.cpp
 
 # required by libziparchive
 .PATH: ${.CURDIR}/../base
 SRCS+=	file.cpp
 
 # required by fastboot
 .PATH: ${.CURDIR}/../ext4_utils
 SRCS+=	allocate.c
 SRCS+=	contents.c
 SRCS+=	crc16.c
 SRCS+=	ext4_sb.c
 SRCS+=	ext4_utils.c
 SRCS+=	ext4fixup.c
 SRCS+=	extent.c
 SRCS+=	indirect.c
 SRCS+=	make_ext4fs.c
 SRCS+=	sha1.c
 SRCS+=	wipe.c
 
 # required by base and libutils
 .PATH:	${.CURDIR}/../liblog
 SRCS+=	fake_log_device.c
 SRCS+=	logd_write.c
-CFLAGS.logd_write.c+=	-DFAKE_LOG_DEVICE=1
+CPPFLAGS.logd_write.c+=	-DFAKE_LOG_DEVICE=1
 
 # required by ext4_utils
 .PATH:	${.CURDIR}/../libselinux/src
 SRCS+=	callbacks.c
 SRCS+=	check_context.c
 SRCS+=	freecon.c
 SRCS+=	init.c
 SRCS+=	label.c
 SRCS+=	label_android_property.c
 SRCS+=	label_file.c
 SRCS+=	label_support.c
-CFLAGS.init.c+=		-DDARWIN # statfs
-CFLAGS.label_file.c+=	-D_WITH_GETLINE
+CPPFLAGS.init.c+=	-DDARWIN # statfs
+CPPFLAGS.label_file.c+=	-D_WITH_GETLINE
 
 # required by fastboot and ext4_utils
 .PATH:	${.CURDIR}/../libsparse
 SRCS+=	backed_block.c
 SRCS+=	output_file.c
 SRCS+=	sparse.c
 SRCS+=	sparse_crc32.c
 SRCS+=	sparse_err.c
 SRCS+=	sparse_read.c
 
 # required by libziparchive
 .PATH: ${.CURDIR}/../libutils
 SRCS+=	FileMap.cpp
 
 # required by fastboot
 .PATH:	${.CURDIR}/../libziparchive
 SRCS+=	zip_archive.cc
 
-CFLAGS+=-Doff64_t=off_t
-CFLAGS+=-Dftruncate64=ftruncate
-CFLAGS+=-Dlseek64=lseek
-CFLAGS+=-Dmmap64=mmap
-CFLAGS+=-Dpread64=pread
-CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../include
-CFLAGS+=-I${.CURDIR}/../mkbootimg
-CFLAGS+=-I${.CURDIR}/../base/include
-CFLAGS+=-I${.CURDIR}/../ext4_utils
-CFLAGS+=-I${.CURDIR}/../f2fs_utils
-CFLAGS+=-I${.CURDIR}/../libselinux/include
-CFLAGS+=-I${.CURDIR}/../libsparse/include
-CFLAGS+=${CFLAGS.${.IMPSRC:T}}
+CPPFLAGS+=	-Doff64_t=off_t
+CPPFLAGS+=	-Dftruncate64=ftruncate
+CPPFLAGS+=	-Dlseek64=lseek
+CPPFLAGS+=	-Dmmap64=mmap
+CPPFLAGS+=	-Dpread64=pread
+CPPFLAGS+=	-I${.CURDIR}
+CPPFLAGS+=	-I${.CURDIR}/../include
+CPPFLAGS+=	-I${.CURDIR}/../mkbootimg
+CPPFLAGS+=	-I${.CURDIR}/../base/include
+CPPFLAGS+=	-I${.CURDIR}/../ext4_utils
+CPPFLAGS+=	-I${.CURDIR}/../f2fs_utils
+CPPFLAGS+=	-I${.CURDIR}/../libselinux/include
+CPPFLAGS+=	-I${.CURDIR}/../libsparse/include
+CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
+CXXFLAGS+=	-D__STDC_LIMIT_MACROS # DragonFly
+CXXFLAGS+=	-std=gnu++11
 
-CXXFLAGS+=-D__STDC_LIMIT_MACROS # DragonFly
-CXXFLAGS+=-std=gnu++11
-CXXFLAGS+=${CFLAGS:N-std*}
+.ifndef COMPILE.c
+CFLAGS+=	${CPPFLAGS}
+CXXFLAGS+=	${CPPFLAGS}
+.endif
 
 LDADD+=	-lpcre -lusb -lz
 DPADD+=	${LIBPCRE} ${LIBUSB} ${LIBZ}
 
 .include <bsd.prog.mk>
Index: head/devel/android-tools-simpleperf/files/Makefile
===================================================================
--- head/devel/android-tools-simpleperf/files/Makefile	(revision 398010)
+++ head/devel/android-tools-simpleperf/files/Makefile	(revision 398011)
@@ -1,81 +1,84 @@
 # $FreeBSD$
 
 PROG_CXX=simpleperf
 NO_MAN=
 BINDIR?=/usr/bin
 
 SRCS+=	callchain.cpp
 SRCS+=	cmd_dumprecord.cpp
 SRCS+=	cmd_help.cpp
 SRCS+=	cmd_report.cpp
 SRCS+=	command.cpp
 SRCS+=	dso.cpp
 SRCS+=	event_attr.cpp
 SRCS+=	event_type.cpp
 SRCS+=	main.cpp
 SRCS+=	perf_regs.cpp
 SRCS+=	read_elf.cpp
 SRCS+=	record.cpp
 SRCS+=	record_file_reader.cpp
 SRCS+=	sample_tree.cpp
 SRCS+=	thread_tree.cpp
 SRCS+=	utils.cpp
 
 TEST_SRCS+=	command_test.cpp
 TEST_SRCS+=	record_test.cpp
 TEST_SRCS+=	sample_tree_test.cpp
 
 .PATH: ${.CURDIR}/darwin_support
 SRCS+=	darwin_support.cpp
 
 # required by simpleperf
 .PATH: ${.CURDIR}/../base
 SRCS+=	file.cpp
 SRCS+=	logging.cpp
 SRCS+=	stringprintf.cpp
 SRCS+=	strings.cpp
 TEST_SRCS+= file_test.cpp
 TEST_SRCS+= logging_test.cpp
 TEST_SRCS+= stringprintf_test.cpp
 TEST_SRCS+= strings_test.cpp
 TEST_SRCS+= test_main.cpp
 TEST_SRCS+= test_utils.cpp
 
 # required by base
 .PATH:	${.CURDIR}/../liblog
 SRCS+=	fake_log_device.c
 SRCS+=	logd_write.c
-CFLAGS.logd_write.c+=	-DFAKE_LOG_DEVICE=1
+CPPFLAGS.logd_write.c+=	-DFAKE_LOG_DEVICE=1
 
 # required by base
 .PATH: ${.CURDIR}/../libcutils
 SRCS+= threads.c
 
-CFLAGS+=-D_WITH_GETLINE
-CFLAGS+=-DUSE_BIONIC_UAPI_HEADERS
-CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/darwin_support/include
-CFLAGS+=-I${.CURDIR}/../include
-CFLAGS+=-I${.CURDIR}/../base/include
-CFLAGS+=-I${.CURDIR}/../bionic/libc/kernel
-CFLAGS+=$$(${LLVM_CONFIG} --cppflags)
-CFLAGS+=${CFLAGS.${.IMPSRC:T}}
+CPPFLAGS+=	-D_WITH_GETLINE
+CPPFLAGS+=	-DUSE_BIONIC_UAPI_HEADERS
+CPPFLAGS+=	-I${.CURDIR}
+CPPFLAGS+=	-I${.CURDIR}/darwin_support/include
+CPPFLAGS+=	-I${.CURDIR}/../include
+CPPFLAGS+=	-I${.CURDIR}/../base/include
+CPPFLAGS+=	-I${.CURDIR}/../bionic/libc/kernel
+CPPFLAGS+=	$$(${LLVM_CONFIG} --cppflags)
+CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
+CXXFLAGS+=	-std=gnu++11
 
-CXXFLAGS+=-std=gnu++11
-CXXFLAGS+=${CFLAGS:N-std*}
+.ifndef COMPILE.c
+CFLAGS+=	${CPPFLAGS}
+CXXFLAGS+=	${CPPFLAGS}
+.endif
 
-TEST_CFLAGS+=	$$(${GTEST_CONFIG} --cppflags)
+TEST_CPPFLAGS+=	$$(${GTEST_CONFIG} --cppflags)
 .for f in ${TEST_SRCS}
-CFLAGS.${f}+=	${TEST_CFLAGS}
+CPPFLAGS.${f}+=	${TEST_CPPFLAGS}
 .endfor
 
 LDADD+=		$$(${LLVM_CONFIG} --system-libs --libs --ldflags)
 TEST_LDADD+=	$$(${GTEST_CONFIG} --libs --ldflags)
 
 LLVM_CONFIG?=	llvm-config
 GTEST_CONFIG?=	gtest-config
 
 simpleperf_unit_test: ${SRCS:R:S/$/.o/:Nmain.o} ${TEST_SRCS:R:S/$/.o/}
-	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
+	${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
 
 .include <bsd.prog.mk>