Index: head/devel/android-tools-fastboot/Makefile
===================================================================
--- head/devel/android-tools-fastboot/Makefile	(revision 399205)
+++ head/devel/android-tools-fastboot/Makefile	(revision 399206)
@@ -1,86 +1,86 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	android-
 DISTVERSION?=	6.0.0_r1
-PORTREVISION?=	0
+PORTREVISION?=	1
 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
 
 # Emulate GH_COMMIT without causing desync
 .ifdef DISTVERSIONSUFFIX
 GH_REVISION=	${DISTVERSIONSUFFIX:S/-g//} # snapshot
 .else
 GH_REVISION=	bb0c180e6270 # generated by: make update-revision
 .endif
 
 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
 MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
 		FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" \
 		MANDIR="${PREFIX}/man/man" \
 		LIBPCRE="${LOCALBASE}/lib/libpcre.a"
 PLIST_FILES=	bin/fastboot \
 		%%BASH%%etc/bash_completion.d/fastboot \
 		man/man1/fastboot.1.gz
 PORTDOCS=	*
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	BASH DOCS
 OPTIONS_SUB=	yes
 
 BASH_VARS=	LICENSE+=MIT # debian/copyright
 
 DOCS_MAKE_ARGS_OFF=	FILES="" FILESDIR=""
 
 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/%%.*%%//}
 
 update-revision:
 # https://developer.github.com/v3/repos/commits/#get-a-single-commit
 # Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1)
 	@${REINPLACE_CMD} -i '' -e "/^GH_REVISION.*$@/s/=.*/=	$$(\
 		${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \
 			https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \
 			${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{12\}\).*/\1/p; q; }' \
 		) # generated by: make $@/" \
 		${.CURDIR}/Makefile
 
 .include <bsd.port.mk>
 
 # XXX Work around !target(makesum)
 .ifndef DISTVERSIONSUFFIX
 makesum:	update-revision
 .endif
Index: head/devel/android-tools-fastboot/files/Makefile
===================================================================
--- head/devel/android-tools-fastboot/files/Makefile	(revision 399205)
+++ head/devel/android-tools-fastboot/files/Makefile	(revision 399206)
@@ -1,110 +1,109 @@
 # $FreeBSD$
 
 PROG_CXX=fastboot
 BINDIR?=/usr/bin
 FILESDIR?=${DOCDIR}/${PROG}
 
 FILES=	*.[Tt][Xx][Tt]
 
 SRCS+=	bootimg_utils.cpp
 SRCS+=	engine.c
 SRCS+=	fastboot.cpp
 SRCS+=	fs.c
 SRCS+=	protocol.c
 SRCS+=	util.c
 
 .PATH: ${EXTRADIR}
 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
 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
-CPPFLAGS.init.c+=	-DDARWIN # statfs
 
 # 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
 
 REVISION?=	$$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
 CPPFLAGS+=	-DFASTBOOT_REVISION="\"${REVISION}-android\""
 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}}
 CPPFLAGS+=	$$(${PKG_CONFIG} libpcre --cflags 2>/dev/null)
 CPPFLAGS+=	$$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null)
 CXXFLAGS+=	-D__STDC_LIMIT_MACROS # DragonFly
 CXXFLAGS+=	-std=gnu++11
 
 .ifndef COMPILE.c
 CFLAGS+=	${CPPFLAGS}
 CXXFLAGS+=	${CPPFLAGS}
 .endif
 
 LDADD+=	$$(${PKG_CONFIG} libpcre --libs 2>/dev/null || echo -lpcre)
 LDADD+=	$$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
 LDADD+=	-lz
 DPADD+=	${LIBPCRE} ${LIBUSB} ${LIBZ}
 
 GIT?=		git
 PKG_CONFIG?=	pkg-config
 
 beforeinstall:
 	${INSTALL} -d ${DESTDIR}${FILESDIR}
 
 .include <bsd.prog.mk>
Index: head/devel/android-tools-fastboot/files/patch-libselinux_src_init.c
===================================================================
--- head/devel/android-tools-fastboot/files/patch-libselinux_src_init.c	(nonexistent)
+++ head/devel/android-tools-fastboot/files/patch-libselinux_src_init.c	(revision 399206)
@@ -0,0 +1,30 @@
+--- libselinux/src/init.c.orig	2015-06-15 21:40:06 UTC
++++ libselinux/src/init.c
+@@ -7,10 +7,7 @@
+ #include <stdio.h>
+ #include <dlfcn.h>
+ 
+-#ifdef DARWIN
+-#include <sys/param.h>
+-#include <sys/mount.h>
+-#else
++#if defined(__linux__)
+ #include <sys/vfs.h>
+ #endif
+ 
+@@ -26,6 +23,7 @@ int selinux_page_size = 0;
+ 
+ static void init_selinuxmnt(void)
+ {
++#if defined(__linux__)
+ 	char buf[BUFSIZ], *p;
+ 	FILE *fp=NULL;
+ 	struct statfs sfbuf;
+@@ -94,6 +92,7 @@ static void init_selinuxmnt(void)
+ 	if (fp)
+ 		fclose(fp);
+ 	return;
++#endif
+ }
+ 
+ void fini_selinuxmnt(void)

Property changes on: head/devel/android-tools-fastboot/files/patch-libselinux_src_init.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/android-tools-fastboot-devel/Makefile
===================================================================
--- head/devel/android-tools-fastboot-devel/Makefile	(revision 399205)
+++ head/devel/android-tools-fastboot-devel/Makefile	(revision 399206)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-m-preview
 DISTVERSION=	m-preview-1212
 DISTVERSIONSUFFIX=	-g94c617ccbba4
-PORTREVISION=	0
+PORTREVISION=	1
 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
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-fastboot-devel/files/Makefile
===================================================================
--- head/devel/android-tools-fastboot-devel/files/Makefile	(revision 399205)
+++ head/devel/android-tools-fastboot-devel/files/Makefile	(revision 399206)
@@ -1,112 +1,111 @@
 # $FreeBSD$
 
 PROG_CXX=fastboot
 BINDIR?=/usr/bin
 FILESDIR?=${DOCDIR}/${PROG}
 
 FILES=	*.[Tt][Xx][Tt]
 
 SRCS+=	bootimg_utils.cpp
 SRCS+=	engine.cpp
 SRCS+=	fastboot.cpp
 SRCS+=	fs.cpp
 SRCS+=	protocol.cpp
 SRCS+=	util.cpp
 
 .PATH: ${EXTRADIR}
 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
 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
-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
 
 REVISION?=	$$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
 CPPFLAGS+=	-DFASTBOOT_REVISION="\"${REVISION}-android\""
 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}}
 CPPFLAGS+=	$$(${PKG_CONFIG} libpcre --cflags 2>/dev/null)
 CPPFLAGS+=	$$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null)
 CXXFLAGS+=	-D__STDC_LIMIT_MACROS # DragonFly
 CXXFLAGS+=	-std=gnu++11
 
 .ifndef COMPILE.c
 CFLAGS+=	${CPPFLAGS}
 CXXFLAGS+=	${CPPFLAGS}
 .endif
 
 LDADD+=	$$(${PKG_CONFIG} libpcre --libs 2>/dev/null || echo -lpcre)
 LDADD+=	$$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
 LDADD+=	-lz
 DPADD+=	${LIBPCRE} ${LIBUSB} ${LIBZ}
 
 GIT?=		git
 PKG_CONFIG?=	pkg-config
 
 beforeinstall:
 	${INSTALL} -d ${DESTDIR}${FILESDIR}
 
 .include <bsd.prog.mk>