1: use compiler.mk

2: upgrade v8-devel to 3.24.30.

PR:		ports/186373 [1]
Submitted by:	mat@ [1]

4 files changed, 34 insertions, 15 deletions

diff --git a/lang/v8-devel/Makefile b/lang/v8-devel/Makefile
index 2a5f9e570790..0bd325fca2fc 100644
--- a/lang/v8-devel/Makefile
+++ b/lang/v8-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	v8
-PORTVERSION=	3.24.7
+PORTVERSION=	3.24.30
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/vanilla
 PKGNAMESUFFIX=	-devel
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 
 CONFLICTS=	v8-3.19.*
 
-USES=		gmake shebangfix
+USES=		gmake shebangfix compiler
 SHEBANG_LANG=	sh
 SHEBANG_FILES=	${WRKSRC}/build/gyp/gyp
 USE_XZ=		yes
@@ -30,12 +30,11 @@ sh_CMD=		${SH}
 
 .include <bsd.port.pre.mk>
 
-.if ${CC:T:Mclang} == "clang" || ${CXX:T:Mclang++} == "clang++" || ${OSVERSION} >= 1000024
-_CLANG!=	${CC} --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
+.if ${COMPILER_TYPE} == clang
 MAKE_ENV+=	LINK=clang++ AR=/usr/bin/ar
 MAKE_ARGS+=	clang=on
 CFLAGS+=	-Wno-unused-private-field -Wno-unused-variable
-.if ${_CLANG} >= 33
+.if ${COMPILER_VERSION} >= 33
 CFLAGS+=	-Wno-nested-anon-types -Wno-unused-function
 .endif
 .else
diff --git a/lang/v8-devel/distinfo b/lang/v8-devel/distinfo
index d9b80b64f2da..493cc156bc7c 100644
--- a/lang/v8-devel/distinfo
+++ b/lang/v8-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (v8-3.24.7.tar.xz) = 4007211042d1e34d88af30025aa9536d2556da0f3bb744e5290e33698939086b
-SIZE (v8-3.24.7.tar.xz) = 35186840
+SHA256 (v8-3.24.30.tar.xz) = 9178700254290e38eb7085e44d879ffbc7871dd1eeacebb7c08cb1c49924e22a
+SIZE (v8-3.24.30.tar.xz) = 34185612
diff --git a/lang/v8-devel/files/patch-Makefile b/lang/v8-devel/files/patch-Makefile
index 8b95d999c372..4f4feb63e8ce 100644
--- a/lang/v8-devel/files/patch-Makefile
+++ b/lang/v8-devel/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2013-10-24 23:26:16.000000000 +0800
-+++ Makefile	2013-10-25 10:19:26.000000000 +0800
+--- Makefile.orig	2014-02-04 10:07:31.000000000 +0800
++++ Makefile	2014-02-04 17:01:29.349287737 +0800
 @@ -52,6 +52,14 @@ endif
  ifdef console
    GYPFLAGS += -Dconsole=$(console)
@@ -15,7 +15,7 @@
  # disassembler=on
  ifeq ($(disassembler), on)
    GYPFLAGS += -Dv8_enable_disassembler=1
-@@ -223,7 +231,7 @@ NACL_ARCHES = nacl_ia32 nacl_x64
+@@ -233,7 +241,7 @@ NACL_ARCHES = nacl_ia32 nacl_x64
  # List of files that trigger Makefile regeneration:
  GYPFILES = build/all.gyp build/features.gypi build/standalone.gypi \
             build/toolchain.gypi samples/samples.gyp src/d8.gyp \
@@ -24,3 +24,23 @@
  
  # If vtunejit=on, the v8vtune.gyp will be appended.
  ifeq ($(vtunejit), on)
+@@ -386,8 +394,7 @@ clean: $(addsuffix .clean, $(ARCHES) $(A
+ # GYP file generation targets.
+ OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS))
+ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
+-	PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
+-	PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \
++	PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
+ 	GYP_GENERATORS=make \
+ 	build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
+ 	              -Ibuild/standalone.gypi --depth=. \
+@@ -396,8 +403,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
+ 	              -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS)
+ 
+ $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
+-	PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
+-	PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \
++	PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
+ 	GYP_GENERATORS=make \
+ 	build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
+ 	              -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)
diff --git a/lang/v8/Makefile b/lang/v8/Makefile
index fd129b19328d..44b93c097d9a 100644
--- a/lang/v8/Makefile
+++ b/lang/v8/Makefile
@@ -12,22 +12,22 @@ COMMENT=	Google\'s open source JavaScript engine
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 
-CONFLICTS=      v8-devel-*
+CONFLICTS=	v8-3.24.*
 
-USES=		gmake
+USES=		gmake compiler
 USE_XZ=		yes
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 ALL_TARGET=	native
 MAKE_ARGS=	library=shared
+MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 
 .include <bsd.port.pre.mk>
 
-.if ${CC:T:Mclang} == "clang" || ${CXX:T:Mclang++} == "clang++" || ${OSVERSION} >= 1000024
-_CLANG!=	clang --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/'
+.if ${COMPILER_TYPE} == clang
 MAKE_ENV+=	LINK=clang++
 CFLAGS+=	-Wno-unused-private-field
-.if ${_CLANG} >= 33
+.if ${COMPILER_VERSION} >= 33
 CFLAGS+=	-Wno-nested-anon-types -Wno-unused-function
 .endif
 .else