Index: branches/2017Q1/devel/fb-adb/Makefile
===================================================================
--- branches/2017Q1/devel/fb-adb/Makefile	(revision 436332)
+++ branches/2017Q1/devel/fb-adb/Makefile	(revision 436333)
@@ -1,97 +1,104 @@
 # $FreeBSD$
 
 PORTNAME=	fb-adb
 DISTVERSION=	1.4.4-126
 DISTVERSIONSUFFIX=	-g6fd78ae
+PORTREVISION=	1
 CATEGORIES=	devel comms
+
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	1b5524282981.patch:-p1 \
+		8f532a9ee3a3.patch:-p1 \
+		a25602788c1b.patch:-p1 \
+		${NULL}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Better shell for Android devices
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	xxd:editors/vim-lite \
 		${BASH_CMD}:shells/${BASH_CMD:T}
 RUN_DEPENDS=	adb:devel/android-tools-adb
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 USES=		autoreconf gmake ncurses perl5 python:3,build
 USE_PERL5=	build # pod2man
 BASH_CMD?=	bash # can be zsh
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ENV=	PYTHON3="${PYTHON_CMD}"
 INSTALL_TARGET=	install-strip
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 
 # Cross-build sanitization
 CONFIG_SITE=	/dev/null # XXX Only for AC_CONFIG_SUBDIRS
 CONFIGURE_ENV+=	HOST_CFLAGS="${CPPFLAGS} ${CFLAGS:N-[Og]*:N-pipe}" \
 		STUB_CFLAGS="${STUB_CFLAGS}" \
 		CPPFLAGS="" CFLAGS="${CFLAGS:M-[Og]*} ${CFLAGS:M-pipe}" \
 		HOST_LDFLAGS="${LDFLAGS} ${LIBS}" \
 		STUB_LDFLAGS="${STUB_LDFLAGS}" \
 		LDFLAGS="" LIBS=""
 
 OPTIONS_DEFINE=	ASSERT BASH DEBUG NDK
 OPTIONS_DEFAULT=NDK
 OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/NDK/}
 OPTIONS_EXCLUDE_DragonFly=NDK
 
 ASSERT_CONFIGURE_ENABLE=checking
 BASH_DESC=		Install JSON parser used by bash-completion
 BASH_RUN_DEPENDS=	jq:textproc/jq
 DEBUG_CONFIGURE_ENABLE=	debuggable-stubs
 
 # XXX Convert into USES=android once more things depend on it
 NDK_DESC=		Build target stubs using Android NDK
 NDK_MASTER_SITES=	https://dl.google.com/android/ndk/:7z \
 			https://dl.google.com/android/repository/:zip
 .if defined(ANDROID_NDK)
 # Prefer NDK from environment
 WRKSRC_ndk=		${ANDROID_NDK}
 .else
 NDK_DISTFILES=		${NDK_DISTFILES_${LINUX_ARCH}}
 NDK_DISTFILES_i386=	android-ndk-r10e-linux-x86.bin:7z
 NDK_DISTFILES_x86_64=	android-ndk-r12b-linux-x86_64.zip:zip
 WRKSRC_ndk=		${WRKDIR}/${NDK_DISTFILES:R:C/(-[^-]+){2}$//}
 .endif
 NDK_USES=		7z:partial linux
 NDK_USE=		LINUX=base:build
 NDK_SHELL=		${LINUXBASE}/bin/sh
 NDK_CONFIGURE_ENV=	ANDROID_NDK="${WRKSRC_ndk}" \
 			ANDROID_NDK_SHELL="${NDK_SHELL}" \
 			NDK_TMPDIR="${WRKDIR}"
 NDK_BUILD_DEPENDS_OFF=	${LOCALBASE}/android/ARMv7/bin/arm-aux-linux-androideabi-gcc:lang/gnatdroid-armv7 \
 			${LOCALBASE}/android-x86/x86_32/bin/i686-aux-linux-android-gcc:lang/gnatdroid-x86
 .if defined(.PARSEDIR)
 NDK_CONFIGURE_ENV_OFF=	PATH="${NDK_BUILD_DEPENDS_OFF:C/:.*//:H:ts:}:$$PATH"
 .else
 NDK_CONFIGURE_ENV_OFF=	PATH="${LOCALBASE}/android/ARMv7/bin:${LOCALBASE}/android-x86/x86_32/bin:$$PATH"
 .endif
 NDK_CONFIGURE_OFF=	--with-android-ndk=system
 
 post-extract:
 # XXX gold: fatal error: a.out: Invalid argument
 	@for f in $$(${FIND} ${WRKSRC_ndk} -type l -name '*-ld'); do \
 		(cd $${f%/*} && ${LN} -sf $${f##*/}.bfd $${f##*/}); \
 	done
 
 post-patch:
 # XXX Decouple -Werror from --enable-checking (ASSERT=on)
 	@${REINPLACE_CMD} -e '/CPPFLAGS.*-Werror/d' ${WRKSRC}/configure.ac
 
 post-patch-NDK-on:
 	@${REINPLACE_CMD} 's,mkdir,/compat/linux/../../bin/mkdir,' \
 		${WRKSRC_ndk}/build/tools/make-standalone-toolchain.sh \
 		${WRKSRC_ndk}/build/tools/ndk-common.sh
 
 post-patch-NDK-off:
 	@${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \
 		${WRKSRC}/stub-*/configure
 
 .include <bsd.port.mk>
Index: branches/2017Q1/devel/fb-adb/distinfo
===================================================================
--- branches/2017Q1/devel/fb-adb/distinfo	(revision 436332)
+++ branches/2017Q1/devel/fb-adb/distinfo	(revision 436333)
@@ -1,7 +1,13 @@
 TIMESTAMP = 1475810942
 SHA256 (android-ndk-r10e-linux-x86.bin) = 92b07d25aaad9b341a7f2b2a62402d508e948bf2dea3ee7b65a6aeb18bca7df5
 SIZE (android-ndk-r10e-linux-x86.bin) = 394281908
 SHA256 (android-ndk-r12b-linux-x86_64.zip) = eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e
 SIZE (android-ndk-r12b-linux-x86_64.zip) = 755551010
 SHA256 (facebook-fb-adb-1.4.4-126-g6fd78ae_GH0.tar.gz) = 8816a6e2d331d8bd486ec181935471c702c3da262bd61bb9dc78369ab9563ded
 SIZE (facebook-fb-adb-1.4.4-126-g6fd78ae_GH0.tar.gz) = 250589
+SHA256 (1b5524282981.patch) = 88a666017031bb5b089589d537ba137926a7183a2eea3ebfea09f6eae4e514ea
+SIZE (1b5524282981.patch) = 924
+SHA256 (8f532a9ee3a3.patch) = 517d8c8f23ae5e3bdb63445c42ab5a7b7100b30d9fd60e047b45e3433d1977c9
+SIZE (8f532a9ee3a3.patch) = 1235
+SHA256 (a25602788c1b.patch) = 0548d555636cbee711a5d7f3d2e8d119e8016ad5f71dd74a5a898450d127fc3d
+SIZE (a25602788c1b.patch) = 9741
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 436332)
+++ branches/2017Q1	(revision 436333)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r436291