Now works correctly for branches 8 and 7.

bump portrevision

Submitted by:	avg

5 files changed, 52 insertions, 17 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 6b31bbc8fdd3..9cb5445e4e93 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	chromium
 DISTVERSIONPREFIX=	courgette-redacted-
 DISTVERSION=	10.0.648.205
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.goodking.org/downloads/ \
 		ftp://rene-ladan.nl/pub/distfiles/ \
@@ -147,11 +148,6 @@ post-patch:
 			-e "s|'python_ver%': '2.5'|'python_ver%': '2.6'|" \
 			-e "s|.so.1.0|.so.1|" \
 				${WRKSRC}/build/common.gypi
-	@${REINPLACE_CMD} -e "s|'-ldl',|'-lc',|" \
-		${WRKSRC}/app/app_base.gypi \
-		${WRKSRC}/build/linux/system.gyp \
-		${WRKSRC}/chrome/chrome_browser.gypi \
-		${WRKSRC}/media/media.gyp
 
 do-configure:
 	cd ${WRKSRC} && \
@@ -173,11 +169,4 @@ do-install:
 		${COPYTREE_SHARE} "locales resources" ${DATADIR}
 	${LN} -sf ${DATADIR}/chrome ${PREFIX}/bin
 
-post-install:
-.if ${OSVERSION} < 900000
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/chromium/files/patch-app__app_base.gypi b/www/chromium/files/patch-app__app_base.gypi
index 7a951d899feb..d0d0feeed462 100644
--- a/www/chromium/files/patch-app__app_base.gypi
+++ b/www/chromium/files/patch-app__app_base.gypi
@@ -1,5 +1,5 @@
---- app/app_base.gypi.orig	2011-03-20 22:02:04.362467155 +0200
-+++ app/app_base.gypi	2011-03-20 22:02:04.479736529 +0200
+--- app/app_base.gypi.orig	2011-04-13 10:01:07.000000000 +0200
++++ app/app_base.gypi	2011-04-17 22:15:49.000000000 +0200
 @@ -232,7 +232,7 @@
          'surface/io_surface_support_mac.cc',
          'surface/io_surface_support_mac.h',
@@ -18,3 +18,11 @@
            'sources': [
              'gfx/gl/gl_context_egl.cc',
              'gfx/gl/gl_context_egl.h',
+@@ -363,7 +363,6 @@
+             'link_settings': {
+               'libraries': [
+                 '-lX11',
+-                '-ldl',
+               ],
+             },
+           },
diff --git a/www/chromium/files/patch-build__linux__system.gyp b/www/chromium/files/patch-build__linux__system.gyp
new file mode 100644
index 000000000000..902ad94a0252
--- /dev/null
+++ b/www/chromium/files/patch-build__linux__system.gyp
@@ -0,0 +1,15 @@
+--- build/linux/system.gyp.orig	2011-04-17 22:18:20.000000000 +0200
++++ build/linux/system.gyp	2011-04-17 22:18:57.000000000 +0200
+@@ -309,12 +309,6 @@
+                   '<!@(<(pkg-config) --libs-only-l gnome-keyring-1)',
+                 ],
+               },
+-            }, {
+-              'link_settings': {
+-                'libraries': [
+-                  '-ldl',
+-                ],
+-              },
+             }],
+           ],
+         }],
diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi
index b393fdcbb58b..29059cfd4550 100644
--- a/www/chromium/files/patch-chrome__chrome_browser.gypi
+++ b/www/chromium/files/patch-chrome__chrome_browser.gypi
@@ -1,5 +1,5 @@
---- chrome/chrome_browser.gypi.orig	2011-03-20 22:02:04.255736830 +0200
-+++ chrome/chrome_browser.gypi	2011-03-20 22:02:04.431736294 +0200
+--- chrome/chrome_browser.gypi.orig	2011-04-13 10:01:59.000000000 +0200
++++ chrome/chrome_browser.gypi	2011-04-17 22:24:15.000000000 +0200
 @@ -1237,7 +1237,7 @@
          'browser/favicon_service.h',
          'browser/file_path_watcher/file_path_watcher.cc',
@@ -38,7 +38,20 @@
            'dependencies': [
              '../build/linux/system.gyp:dbus-glib',
              '../build/linux/system.gyp:gconf',
-@@ -4294,7 +4294,7 @@
+@@ -3631,12 +3631,6 @@
+             '../build/linux/system.gyp:x11',
+             '../third_party/undoview/undoview.gyp:undoview',
+           ],
+-          'link_settings': {
+-            'libraries': [
+-              # For dlsym() in 'browser/zygote_main_linux.cc'
+-              '-ldl',
+-            ],
+-          },
+           'sources!': [
+             'browser/ui/views/extensions/extension_view.cc',
+             'browser/ui/views/extensions/extension_view.h',
+@@ -4294,7 +4288,7 @@
                ],
              }],
              # GTK build only
diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp
new file mode 100644
index 000000000000..98d0fa984fc1
--- /dev/null
+++ b/www/chromium/files/patch-media__media.gyp
@@ -0,0 +1,10 @@
+--- media/media.gyp.orig	2011-04-17 22:22:00.000000000 +0200
++++ media/media.gyp	2011-04-17 22:22:15.000000000 +0200
+@@ -600,7 +600,6 @@
+           ],
+           'link_settings': {
+             'libraries': [
+-              '-ldl',
+               '-lX11',
+               '-lXrender',
+               '-lXext',