svn commit: r335160 - in head/www/chromium: . files

[Rene Ladan]

Author: rene
Date: Fri Nov 29 10:23:57 2013
New Revision: 335160
URL: http://svnweb.freebsd.org/changeset/ports/335160

Log:
  - Replace pkg-message by a wrapper checking the value of
    kern.ipc.shm_allow_removed [1]
  - Better respect LOCALBASE and PREFIX in the build files [2]
  - Respect SUB_LIST
  - Bump PORTREVISION
  
  Submitted by:	eadler on freebsd-chromium [1]
  Submitted by:	Omar S <omars1234 at gmail.com> on freebsd-chromium [2]

Added:
  head/www/chromium/files/chrome.in
     - copied, changed from r335158, head/www/chromium/pkg-message
Deleted:
  head/www/chromium/pkg-message
Modified:
  head/www/chromium/Makefile

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Fri Nov 29 10:16:51 2013	(r335159)
+++ head/www/chromium/Makefile	Fri Nov 29 10:23:57 2013	(r335160)
@@ -6,6 +6,7 @@
 PORTNAME=	chromium
 DISTVERSIONPREFIX=	courgette-redacted-
 DISTVERSION=	31.0.1650.57
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/:testdata \
 		http://download.goodking.org/downloads/:browser \
@@ -88,9 +89,8 @@ GYP_DEFINES+=	google_api_key=AIzaSyBsp9n
 		google_default_client_id=996322985003.apps.googleusercontent.com \
 		google_default_client_secret=IR1za9-1VK0zZ0f_O8MVFicn
 
-SUB_FILES=	chromium-browser.desktop
-SUB_LIST=	COMMENT="${COMMENT}" \
-		DATADIR=${DATADIR}
+SUB_FILES=	chromium-browser.desktop chrome
+SUB_LIST+=	COMMENT="${COMMENT}"
 
 OPTIONS_DEFINE=	CODECS GCONF PULSEAUDIO TEST DEBUG
 CODECS_DESC=	Compile and enable patented codecs like H.264
@@ -194,10 +194,13 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \
 		${WRKSRC}/base/base.gypi \
 		${WRKSRC}/build/common.gypi \
-		${WRKSRC}/third_party/libvpx/libvpx.gyp \
 		${WRKSRC}/crypto/crypto.gyp \
+		${WRKSRC}/third_party/libvpx/libvpx.gyp \
+		${WRKSRC}/third_party/WebKit/Source/testing/testing.gyp \
 		${WRKSRC}/v8/tools/gyp/v8.gyp \
 		${WRKSRC}/v8/build/toolchain.gypi
+	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
+		${WRKSRC}/chrome/common/chrome_paths.cc
 	@${REINPLACE_CMD} -e "s|/usr/bin/gcc|${CC}|" \
 		${WRKSRC}/third_party/WebKit/Source/core/core.gypi
 	@${REINPLACE_CMD} -e "s|'../courgette/courgette.gyp:courgette_lib',||" \
@@ -246,6 +249,6 @@ do-install:
 		${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop ${STAGEDIR}${DESKTOPDIR}
-	${LN} -sf ${DATADIR}/chrome ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>

Copied and modified: head/www/chromium/files/chrome.in (from r335158, head/www/chromium/pkg-message)
==============================================================================
--- head/www/chromium/pkg-message	Fri Nov 29 10:04:22 2013	(r335158, copy source)
+++ head/www/chromium/files/chrome.in	Fri Nov 29 10:23:57 2013	(r335160)
@@ -1,13 +1,18 @@
-======================================================================
+#!/bin/sh
 
+SYSCTL=kern.ipc.shm_allow_removed
+if [ `sysctl -n $SYSCTL` = 0 ] ; then
+	cat << EOMSG
 For correct operation, shared memory support has to be enabled
 in Chromium by performing the following command as root :
 
-sysctl kern.ipc.shm_allow_removed=1
+sysctl $SYSCTL=1
 
 To preserve this setting across reboots, append the following
 to /etc/sysctl.conf :
 
-kern.ipc.shm_allow_removed=1
-
-======================================================================
+$SYSCTL=1
+EOMSG
+	exit 1
+fi
+%%PREFIX%%/share/chromium/chrome $*