[96696] trunk/dports/www/midori

[jeremyhu at macports.org]

Revision: 96696
          https://trac.macports.org/changeset/96696
Author:   jeremyhu at macports.org
Date:     2012-08-17 10:47:28 -0700 (Fri, 17 Aug 2012)
Log Message:
-----------
midori: Bump to 0.4.6 (#32068)

Modified Paths:
--------------
    trunk/dports/www/midori/Portfile
    trunk/dports/www/midori/files/patch-wscript.diff

Modified: trunk/dports/www/midori/Portfile
===================================================================
--- trunk/dports/www/midori/Portfile	2012-08-17 17:30:23 UTC (rev 96695)
+++ trunk/dports/www/midori/Portfile	2012-08-17 17:47:28 UTC (rev 96696)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name		midori
-version		0.2.9
-revision	5
+version		0.4.6
 categories	www
 description	Midori is a lightweight web browser
 long_description	${description}
@@ -17,14 +16,11 @@
 master_sites	http://archive.xfce.org/src/apps/midori/${branch}
 use_bzip2	yes
 
-checksums           md5     a5821d8e31fa944374ed51c09ca4e740 \
-                    sha1    3329c3b9cbe1d2fa0cb94e3f864802fae4fc5e9b \
-                    rmd160  3b8f2f8fa55f10e80a9e769e4085f96b7fa769ab
+checksums           sha1    68a41fef15dde865f7cf4579c0dfbd0bae0cccc5 \
+                    rmd160  4f55a332579426c91406617d554ff59570d60f8a \
+                    sha256  910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea
 
-# 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-wscript.diff
+patchfiles	patch-wscript.diff
 
 		# glib 2.16.5 or later is required:
 depends_lib	port:gtk2 path:include/gio/gio.h:glib2 \
@@ -38,13 +34,13 @@
 configure.universal_args-delete --disable-dependency-tracking
 
 platform darwin {
+	configure.env-append  PYTHON=/usr/bin/python 
 	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 description {Disable X11 support} {
+variant quartz description {Disable libnotify support (doesn't work with gtk2+quartz)} {
 	depends_lib-delete	port:libnotify
 	configure.args-append 	--disable-libnotify
 }

Modified: trunk/dports/www/midori/files/patch-wscript.diff
===================================================================
--- trunk/dports/www/midori/files/patch-wscript.diff	2012-08-17 17:30:23 UTC (rev 96695)
+++ trunk/dports/www/midori/files/patch-wscript.diff	2012-08-17 17:47:28 UTC (rev 96696)
@@ -1,14 +1,14 @@
---- wscript.old	2010-09-14 23:02:24.000000000 +0200
-+++ wscript	2010-09-14 23:02:31.000000000 +0200
-@@ -87,6 +87,7 @@
+--- /Users/pierre/Desktop/midori-0.4.2/wscript - copie	2011-11-11 00:21:06.000000000 +0100
++++ wscript	2011-11-22 17:52:37.000000000 +0100
+@@ -90,6 +90,7 @@
          return dirvalue
  
      conf.check_tool ('compiler_cc')
 +    conf.check_tool ('osx')
-     if option_enabled ('vala'):
-         if find_program_impl (conf.env, 'valac'):
-             conf.check_tool ('vala')
-@@ -331,6 +332,7 @@
+     conf.check_tool ('vala')
+     conf.check_tool ('glib2')
+ 
+@@ -353,6 +354,7 @@
      if unique == 'yes' and conf.check_cfg (modversion='unique-1.0') == '1.0.4':
          Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.')
          Utils.pprint ('RED', 'Please use an older or newer version.')
@@ -16,7 +16,7 @@
  
  def set_options (opt):
      def is_maemo (): return os.path.exists ('/etc/osso-af-init/')
-@@ -345,6 +347,7 @@
+@@ -368,6 +370,7 @@
              default=disable, help='Disable ' + desc, dest='disable_' + option_)
  
      opt.tool_options ('compiler_cc')
@@ -24,12 +24,3 @@
      opt.get_option_group ('--check-c-compiler').add_option('-d', '--debug-level',
          action = 'store', default = '',
          help = 'Specify the debugging level. [\'none\', \'debug\', \'full\']',
-@@ -505,7 +508,7 @@
-                 if os.path.exists (source):
-                     bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
-                                        '/extensions/' + folder, source)
--        elif Options.platform == 'linux':
-+        else:
-             extensions = os.listdir ('data/extensions')
-             for extension in extensions:
-                 folder = 'lib' + extension + '.so'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120817/f0c73cf6/attachment.html>