From dd75e16ee283f775547d92b27cd8ec9f258d902b Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 15 Jun 2011 19:41:02 +0000 Subject: [PATCH] Use MODPY_VERSION instead of hardcoding 2.6 which is not the case anymore since we default to python 2.7 --- www/chromium/Makefile | 5 ++++- www/chromium/patches/patch-build_common_gypi | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 867eab98097..d78c5f6c6ba 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2011/06/15 10:59:55 robert Exp $ +# $OpenBSD: Makefile,v 1.58 2011/06/15 19:41:02 robert Exp $ ONLY_FOR_ARCHS= i386 amd64 @@ -7,6 +7,8 @@ COMMENT= Chromium browser V= 12.0.742.100 DISTNAME= chromium-${V} +REVISION= 0 + CATEGORIES= www HOMEPAGE= http://sightly.net/peter/openbsd/chromium/ @@ -97,6 +99,7 @@ GYP_DEFS= -Duse_system_bzip2=1 \ pre-configure: @ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python + ${SUBST_CMD} ${WRKSRC}/build/common.gypi # gyp_chromium generates all the Makefiles from gyp do-configure: diff --git a/www/chromium/patches/patch-build_common_gypi b/www/chromium/patches/patch-build_common_gypi index 8cfa34745b1..f472e0e847f 100644 --- a/www/chromium/patches/patch-build_common_gypi +++ b/www/chromium/patches/patch-build_common_gypi @@ -1,4 +1,4 @@ -$OpenBSD: patch-build_common_gypi,v 1.7 2011/06/08 20:36:56 robert Exp $ +$OpenBSD: patch-build_common_gypi,v 1.8 2011/06/15 19:41:02 robert Exp $ --- build/common.gypi.orig Mon Jun 6 11:11:46 2011 +++ build/common.gypi Wed Jun 8 09:58:35 2011 @@ -95,7 +95,7 @@ @@ -6,7 +6,7 @@ $OpenBSD: patch-build_common_gypi,v 1.7 2011/06/08 20:36:56 robert Exp $ # Python version. - 'python_ver%': '2.5', -+ 'python_ver%': '2.6', ++ 'python_ver%': '${MODPY_VERSION}', # Set ARM-v7 compilation flags 'armv7%': 0,