Index: databases/arangodb32/Makefile
===================================================================
--- databases/arangodb32/Makefile
+++ databases/arangodb32/Makefile
@@ -4,25 +4,41 @@
 PORTNAME=	arangodb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.8
+PORTREVISION=	1
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	32
 
-MAINTAINER=	galu@packetdam.com	
+MAINTAINER=	galu@packetdam.com
 COMMENT=	ArangoDB is a distributed NoSQL database with multiple data models
 
 LICENSE=	APACHE20
 
-USES=		gmake ssl cmake:outsource,noninja python:2.7
+USES=		gmake ssl cmake:outsource,noninja python:2.7 compiler
 USE_GITHUB=	yes
 
 CMAKE_ARGS=	-DUSE_JEMALLOC:BOOL=off \
 		-DUSE_BACKTRACE:BOOL=on \
-		-DBASE_LD_FLAGS:STRING="-L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/x64.release/obj.target/src -L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/x64.release/obj.target/third_party/icu -L${LOCALBASE}/lib -L/usr/lib"
+		-DBASE_LD_FLAGS:STRING="-L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/${GYPTGT}/obj.target/src -L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/${GYPTGT}/obj.target/third_party/icu -L${LOCALBASE}/lib -L/usr/lib"
 
 USERS=		arangodb
 GROUPS=		arangodb
 USE_RC_SUBR=	arangod
 
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang40:devel/llvm40
+CPP=    ${LOCALBASE}/bin/clang-cpp40
+CC= ${LOCALBASE}/bin/clang40
+CXX=    ${LOCALBASE}/bin/clang++40
+.endif
+
+.if ${ARCH} == amd64
+GYPTGT=	x64.release
+.elif ${ARCH} == i386
+GYPTGT=	ia32.release
+.endif
+
 post-install:
 .for section in 1 8
 	${MV} ${STAGEDIR}${PREFIX}/share/man/man${section}/* ${STAGEDIR}${PREFIX}/man/man${section}/
@@ -38,4 +54,5 @@
 	${RMDIR} ${STAGEDIR}${PREFIX}/var/log/arangodb
 	${RMDIR} ${STAGEDIR}${PREFIX}/var/log
 	${RMDIR} ${STAGEDIR}${PREFIX}/var
-.include <bsd.port.mk>
+
+.include <bsd.port.post.mk>