4 files changed, 25 insertions, 46 deletions

diff --git a/lang/v8/Makefile b/lang/v8/Makefile
index 6a739c93bc81..42cd7b018d5c 100644
--- a/lang/v8/Makefile
+++ b/lang/v8/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	v8
-PORTVERSION=	3.10.4
+PORTVERSION=	3.11.2
 PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/vanilla
@@ -16,64 +16,36 @@ COMMENT=	Google\'s open source JavaScript engine
 
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 
+USE_GMAKE=	yes
+USE_PYTHON=	2.7+
 USE_XZ=		yes
-USE_SCONS=	yes
 USE_LDCONFIG=	yes
-OPTIONS=	DEBUG "Build in debug mode" Off \
-		SNAPSHOT "Enable snapshots" Off
+ALL_TARGET=	native
+OPTIONS=	SNAPSHOT "Enable snapshots" Off
 
 .include <bsd.port.options.mk>
 
-SCONS_ARGS=	visibility=default
+MAKE_ARGS=	library=shared
 
-.if defined(WITHOUT_DEBUG)
-SCONS_ARGS+=	mode=release
+.if ${CC} == "clang" && ${CXX} == "clang++"
+MAKE_ENV+=	LINK=clang++
 .else
-SCONS_ARGS+=	mode=debug
+MAKE_ARGS+=	strictaliasing=off
 .endif
 
 .if defined(WITHOUT_SNAPSHOT)
-SCONS_ARGS+=	snapshot=off
+MAKE_ARGS+=	snapshot=off
 .else
-SCONS_ARGS+=	snapshot=on
+MAKE_ARGS+=	snapshot=on
 .endif
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == i386
-V8ARCH=ia32
-.elif ${ARCH} == amd64
-V8ARCH=x64
-.endif
-
-.if defined(CFLAGS)
-CFLAGS:=	${CFLAGS:C/-fstrict-aliasing//}
-.if empty(CFLAGS:M-fno-strict-aliasing)
-CFLAGS+=	-fno-strict-aliasing
-.endif
-.endif
-
-PLIST_SUB+=	ARCH=${V8ARCH}
-SCONS_ARGS+=	arch=${V8ARCH}
-SCONS_BUILDENV+= CC="${CC} ${CFLAGS}" CXX="${CXX} ${CXXFLAGS}"
-
-do-build:
-	@cd ${BUILD_WRKSRC} && \
-	${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} ${SCONS_ENV} ${_MAKE_JOBS} \
-	${SCONS_ARGS} library=static ${SCONS_TARGET}
-	@cd ${BUILD_WRKSRC} && \
-	${SETENV} ${SCONS_BUILDENV} ${SCONS_BIN} ${SCONS_ENV} ${_MAKE_JOBS} \
-	${SCONS_ARGS} library=shared ${SCONS_TARGET}
-
 do-install:
-	${INSTALL_LIB} -m 755 ${WRKSRC}/libv8.a ${PREFIX}/lib/libv8.a
-	${INSTALL_LIB} -m 755 ${WRKSRC}/libv8.so ${PREFIX}/lib/libv8.so.1
-	${INSTALL_LIB} -m 755 ${WRKSRC}/libv8preparser.a ${PREFIX}/lib/libv8preparser.a
-	${INSTALL_LIB} -m 755 ${WRKSRC}/libv8preparser.so ${PREFIX}/lib/libv8preparser.so.1
+	${INSTALL_LIB} -m 755 ${WRKSRC}/out/native/lib.target/libv8.so ${PREFIX}/lib/libv8.so.1
 	${LN} -sf ${PREFIX}/lib/libv8.so.1 ${PREFIX}/lib/libv8.so
-	${LN} -sf ${PREFIX}/lib/libv8preparser.so.1 ${PREFIX}/lib/libv8preparser.so
 	${INSTALL_DATA} ${WRKSRC}/include/v8.h ${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/include/v8-debug.h ${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/include/v8-preparser.h ${PREFIX}/include/
diff --git a/lang/v8/distinfo b/lang/v8/distinfo
index a3c100789bb4..72bcf7635721 100644
--- a/lang/v8/distinfo
+++ b/lang/v8/distinfo
@@ -1,2 +1,2 @@
-SHA256 (v8-3.10.4.tar.xz) = cfcdea500fbaaec7bf32fb80f9a438f200423d1f7de25263d2ef2fd9a9dd34c5
-SIZE (v8-3.10.4.tar.xz) = 8071208
+SHA256 (v8-3.11.2.tar.xz) = faf9af4addf84ed1af5600a92ccc241c3f3bb219468941ff1bb046633caa6a08
+SIZE (v8-3.11.2.tar.xz) = 8357448
diff --git a/lang/v8/files/patch-gyp_common.py b/lang/v8/files/patch-gyp_common.py
new file mode 100644
index 000000000000..9af68f4b6ef4
--- /dev/null
+++ b/lang/v8/files/patch-gyp_common.py
@@ -0,0 +1,11 @@
+--- build/gyp/pylib/gyp/common.py.orig	2012-05-14 16:25:53.000000000 +0800
++++ build/gyp/pylib/gyp/common.py	2012-05-14 16:26:03.000000000 +0800
+@@ -355,6 +355,8 @@ def GetFlavor(params):
+     'sunos5': 'solaris',
+     'freebsd7': 'freebsd',
+     'freebsd8': 'freebsd',
++    'freebsd9': 'freebsd',
++    'freebsd10': 'freebsd',
+   }
+   flavor = flavors.get(sys.platform, 'linux')
+   return params.get('flavor', flavor)
diff --git a/lang/v8/pkg-plist b/lang/v8/pkg-plist
index 02259f1443af..d2009bb39a9c 100644
--- a/lang/v8/pkg-plist
+++ b/lang/v8/pkg-plist
@@ -4,9 +4,5 @@ include/v8-preparser.h
 include/v8-profiler.h
 include/v8-testing.h
 include/v8stdint.h
-lib/libv8.a
 lib/libv8.so
 lib/libv8.so.1
-lib/libv8preparser.a
-lib/libv8preparser.so
-lib/libv8preparser.so.1