svn commit: r402846 - head/devel/fb-adb

[Jan Beich]

Author: jbeich
Date: Wed Dec  2 19:27:54 2015
New Revision: 402846
URL: https://svnweb.freebsd.org/changeset/ports/402846

Log:
  devel/fb-adb: update to 1.4.4.115
  
  - Enable Android x86 stub for NDK=off
  
  Changes:	https://github.com/facebook/fb-adb/compare/d447d38...a682c99

Modified:
  head/devel/fb-adb/Makefile   (contents, props changed)
  head/devel/fb-adb/distinfo   (contents, props changed)

Modified: head/devel/fb-adb/Makefile
==============================================================================
--- head/devel/fb-adb/Makefile	Wed Dec  2 19:16:49 2015	(r402845)
+++ head/devel/fb-adb/Makefile	Wed Dec  2 19:27:54 2015	(r402846)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	fb-adb
-DISTVERSION=	1.4.4-113
-DISTVERSIONSUFFIX=	-gd447d38
+DISTVERSION=	1.4.4-115
+DISTVERSIONSUFFIX=	-ga682c99
 CATEGORIES=	devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -68,8 +68,13 @@ NDK_SHELL=		${SETENV} UNAME_s=Linux UNAM
 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:${PORTSDIR}/lang/gnatdroid-armv7
-NDK_CONFIGURE_ENV_OFF=	PATH="${NDK_BUILD_DEPENDS_OFF:C/:.*//:H}:$$PATH"
+NDK_BUILD_DEPENDS_OFF=	${LOCALBASE}/android/ARMv7/bin/arm-aux-linux-androideabi-gcc:${PORTSDIR}/lang/gnatdroid-armv7 \
+			${LOCALBASE}/android-x86/x86_32/bin/i686-aux-linux-android-gcc:${PORTSDIR}/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:
@@ -83,10 +88,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '/CPPFLAGS.*-Werror/d' ${WRKSRC}/configure.ac
 
 post-patch-NDK-off:
-# XXX lang/gnatdroid-x86 doesn't exist yet
-	@${REINPLACE_CMD} -i '.x86-off.bak' -e 's/stub-x86[^,]*, //g' \
-		${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-androideabi/aux-&/' \
+	@${REINPLACE_CMD} -i '.aux.bak' -e 's/linux-android/aux-&/' \
 		${WRKSRC}/stub-*/configure
 
 # XXX D4157: Similar to USES=qmake:outsource, merge into Mk/Uses/autoreconf.mk

Modified: head/devel/fb-adb/distinfo
==============================================================================
--- head/devel/fb-adb/distinfo	Wed Dec  2 19:16:49 2015	(r402845)
+++ head/devel/fb-adb/distinfo	Wed Dec  2 19:27:54 2015	(r402846)
@@ -1,5 +1,5 @@
-SHA256 (facebook-fb-adb-1.4.4-113-gd447d38_GH0.tar.gz) = 0e9bad245061d64a5a5dbc2f18559324a3e04910b4b9ecdbd05266d6e1752e28
-SIZE (facebook-fb-adb-1.4.4-113-gd447d38_GH0.tar.gz) = 249116
+SHA256 (facebook-fb-adb-1.4.4-115-ga682c99_GH0.tar.gz) = a07fe3c44dc89df88fc3068ea6b55b14361cba4d4f0507df319242986a4b8d20
+SIZE (facebook-fb-adb-1.4.4-115-ga682c99_GH0.tar.gz) = 249759
 SHA256 (android-ndk-r10e-linux-x86.bin) = 92b07d25aaad9b341a7f2b2a62402d508e948bf2dea3ee7b65a6aeb18bca7df5
 SIZE (android-ndk-r10e-linux-x86.bin) = 394281908
 SHA256 (android-ndk-r10e-linux-x86_64.bin) = 102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a