- Remove lang/python from BUILD_DEPENDS

- Use USES=shebangfix
- Use REINPLACE_CMD instead of patch files
- Move ONLY_FOR_ARCHS upward

4 files changed, 12 insertions, 58 deletions

diff --git a/lang/v8/Makefile b/lang/v8/Makefile
index ec268373ac38..80d365184c8f 100644
--- a/lang/v8/Makefile
+++ b/lang/v8/Makefile
@@ -11,20 +11,24 @@ COMMENT=	Open source JavaScript engine by Google
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python
-
 CONFLICTS_INSTALL=	v8-devel-[0-9]*
 
+ONLY_FOR_ARCHS=	i386 amd64
+
 PORTSCOUT=	limit:^3.18.*
 
 ALL_TARGET=	native
 MAKE_ARGS=	library=shared
 MAKE_ENV=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 USE_LDCONFIG=	yes
-USES=		alias compiler cpe execinfo gmake python:2 tar:xz
+USES=		alias compiler cpe execinfo gmake python:2 shebangfix tar:xz
 
 CPE_VENDOR=	google
 
+SHEBANG_FILES=	build/gyp/gyp
+python_OLD_CMD=	${SETENV} python
+python_CMD=	${PYTHON_CMD}
+
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
@@ -41,12 +45,12 @@ MAKE_ARGS+=	strictaliasing=off
 USE_GCC=	any
 .endif
 
-ONLY_FOR_ARCHS=	i386 amd64
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
-		${WRKSRC}/build/common.gypi ${WRKSRC}/tools/gyp/v8.gyp
-	@${REINPLACE_CMD} -e '1 s|${SETENV} python|&2|' ${WRKSRC}/build/gyp/gyp
+	@${REINPLACE_CMD} -e 's|test/cctest/cctest.gyp||' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/test\/cctest\/cctest.gyp/d' ${WRKSRC}/build/all.gyp
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/build/common.gypi ${WRKSRC}/tools/gyp/v8.gyp
+	@${REINPLACE_CMD} -e 's, | MAP_NORESERVE,,' ${WRKSRC}/src/platform-freebsd.cc
+	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/tools/gyp/v8.gyp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/native/d8 ${STAGEDIR}${PREFIX}/bin/d8
diff --git a/lang/v8/files/patch-Makefile b/lang/v8/files/patch-Makefile
deleted file mode 100644
index dbc6951af0d0..000000000000
--- a/lang/v8/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2013-02-28 18:57:04.000000000 +0800
-+++ Makefile	2013-02-28 18:57:12.000000000 +0800
-@@ -153,7 +153,7 @@ ANDROID_ARCHES = android_ia32 android_ar
- # List of files that trigger Makefile regeneration:
- GYPFILES = build/all.gyp build/common.gypi build/standalone.gypi \
-            preparser/preparser.gyp samples/samples.gyp src/d8.gyp \
--           test/cctest/cctest.gyp tools/gyp/v8.gyp
-+           tools/gyp/v8.gyp
- 
- # Generates all combinations of ARCHES and MODES, e.g. "ia32.release".
- BUILDS = $(foreach mode,$(MODES),$(addsuffix .$(mode),$(ARCHES)))
diff --git a/lang/v8/files/patch-build__all.gyp b/lang/v8/files/patch-build__all.gyp
deleted file mode 100644
index 765d5dc4287b..000000000000
--- a/lang/v8/files/patch-build__all.gyp
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/all.gyp.orig	2013-02-28 19:01:51.000000000 +0800
-+++ build/all.gyp	2013-02-28 19:02:00.000000000 +0800
-@@ -11,7 +11,6 @@
-         '../preparser/preparser.gyp:*',
-         '../samples/samples.gyp:*',
-         '../src/d8.gyp:d8',
--        '../test/cctest/cctest.gyp:*',
-       ],
-     }
-   ]
diff --git a/lang/v8/files/patch-src_platform-freebsd.cc b/lang/v8/files/patch-src_platform-freebsd.cc
deleted file mode 100644
index dd272e3b8e3d..000000000000
--- a/lang/v8/files/patch-src_platform-freebsd.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/platform-freebsd.cc.orig	2014-10-08 11:14:11.000000000 -0400
-+++ src/platform-freebsd.cc	2014-10-08 11:14:30.000000000 -0400
-@@ -371,7 +371,7 @@ VirtualMemory::VirtualMemory(size_t size
-   void* reservation = mmap(OS::GetRandomMmapAddr(),
-                            request_size,
-                            PROT_NONE,
--                           MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
-+                           MAP_PRIVATE | MAP_ANON,
-                            kMmapFd,
-                            kMmapFdOffset);
-   if (reservation == MAP_FAILED) return;
-@@ -443,7 +443,7 @@ void* VirtualMemory::ReserveRegion(size_
-   void* result = mmap(OS::GetRandomMmapAddr(),
-                       size,
-                       PROT_NONE,
--                      MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
-+                      MAP_PRIVATE | MAP_ANON,
-                       kMmapFd,
-                       kMmapFdOffset);
- 
-@@ -473,7 +473,7 @@ bool VirtualMemory::UncommitRegion(void*
-   return mmap(base,
-               size,
-               PROT_NONE,
--              MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
-+              MAP_PRIVATE | MAP_ANON | MAP_FIXED,
-               kMmapFd,
-               kMmapFdOffset) != MAP_FAILED;
- }