[73932] trunk/dports/www/midori

afb at macports.org afb at macports.org
Mon Nov 29 13:16:21 PST 2010


Revision: 73932
          http://trac.macports.org/changeset/73932
Author:   afb at macports.org
Date:     2010-11-29 13:16:16 -0800 (Mon, 29 Nov 2010)
Log Message:
-----------
midori: various waf patches for darwin (#27437)

Modified Paths:
--------------
    trunk/dports/www/midori/Portfile

Added Paths:
-----------
    trunk/dports/www/midori/files/patch-wscript-darwin-options.diff
    trunk/dports/www/midori/files/patch-wscript-dont-look-for-libm.diff

Modified: trunk/dports/www/midori/Portfile
===================================================================
--- trunk/dports/www/midori/Portfile	2010-11-29 19:17:56 UTC (rev 73931)
+++ trunk/dports/www/midori/Portfile	2010-11-29 21:16:16 UTC (rev 73932)
@@ -4,7 +4,7 @@
 
 name		midori
 version		0.2.9
-revision	1
+revision	2
 categories	www
 description	Midori is a lightweight web browser
 long_description	${description}
@@ -23,7 +23,6 @@
 # patch-extensions-mouse-gestures-c.diff reported as
 # http://www.twotoasts.de/bugs/index.php?do=details&task_id=903
 patchfiles	patch-extensions-mouse-gestures-c.diff \
-		patch-extensions-wscript_build.diff \
 		patch-wscript.diff
 
 		# glib 2.16.5 or later is required:
@@ -37,6 +36,12 @@
 configure.env-append	LINKFLAGS="-L${prefix}/lib"
 configure.universal_args-delete --disable-dependency-tracking
 
+platform darwin {
+	patchfiles-append patch-extensions-wscript_build.diff \
+	                  patch-wscript-dont-look-for-libm.diff \
+	                  patch-wscript-darwin-options.diff
+}
+
 # libnotify doesn't build without X11 (that is on a gtk +quartz stack)
 variant no_x11 {
 	depends_lib-delete	port:libnotify

Added: trunk/dports/www/midori/files/patch-wscript-darwin-options.diff
===================================================================
--- trunk/dports/www/midori/files/patch-wscript-darwin-options.diff	                        (rev 0)
+++ trunk/dports/www/midori/files/patch-wscript-darwin-options.diff	2010-11-29 21:16:16 UTC (rev 73932)
@@ -0,0 +1,19 @@
+--- wscript.ini	2010-11-23 21:12:53.000000000 +0100
++++ wscript	2010-11-23 20:26:12.000000000 +0100
+@@ -88,6 +88,16 @@
+         return dirvalue
+ 
+     conf.check_tool ('compiler_cc')
++    conf.check_tool('gcc', funs='''
++find_gcc
++find_cpp
++find_ar
++gcc_common_flags
++gcc_modifier_darwin
++cc_add_flags
++cc_load_tools
++'''
++)
+     conf.check_tool ('osx')
+     if option_enabled ('vala'):
+         if find_program_impl (conf.env, 'valac'):

Added: trunk/dports/www/midori/files/patch-wscript-dont-look-for-libm.diff
===================================================================
--- trunk/dports/www/midori/files/patch-wscript-dont-look-for-libm.diff	                        (rev 0)
+++ trunk/dports/www/midori/files/patch-wscript-dont-look-for-libm.diff	2010-11-29 21:16:16 UTC (rev 73932)
@@ -0,0 +1,10 @@
+--- wscript.m	2010-11-22 19:53:59.000000000 +0100
++++ wscript	2010-11-22 19:54:32.000000000 +0100
+@@ -202,7 +202,6 @@
+         libnotify = 'no '
+     conf.define ('HAVE_LIBNOTIFY', [0,1][libnotify == 'yes'])
+ 
+-    conf.check (lib='m', mandatory=True)
+     check_pkg ('gmodule-2.0', '2.8.0', False)
+     check_pkg ('gthread-2.0', '2.8.0', False)
+     check_pkg ('gio-2.0', '2.16.0')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101129/cf4dc220/attachment.html>


More information about the macports-changes mailing list