svn commit: r323484 - in head/www/midori: . files

[Olivier Duchateau]

Author: olivierd
Date: Mon Jul 22 17:31:58 2013
New Revision: 323484
URL: http://svnweb.freebsd.org/changeset/ports/323484

Log:
  Fix PACKAGE_VERSION in gtk_about_dialog widget

Added:
  head/www/midori/files/patch-wscript   (contents, props changed)
Modified:
  head/www/midori/Makefile

Modified: head/www/midori/Makefile
==============================================================================
--- head/www/midori/Makefile	Mon Jul 22 17:29:52 2013	(r323483)
+++ head/www/midori/Makefile	Mon Jul 22 17:31:58 2013	(r323484)
@@ -3,6 +3,7 @@
 
 PORTNAME=	midori
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	www xfce
 MASTER_SITES=	http://www.midori-browser.org/downloads/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_all_

Added: head/www/midori/files/patch-wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/midori/files/patch-wscript	Mon Jul 22 17:31:58 2013	(r323484)
@@ -0,0 +1,29 @@
+Fix PACKAGE_VERSION in gtk_about_dialog widget.
+https://bugs.launchpad.net/midori/+bug/1200903
+
+--- ./wscript.orig	2013-07-15 22:38:28.000000000 +0000
++++ ./wscript	2013-07-21 16:02:48.000000000 +0000
+@@ -29,7 +29,7 @@
+ 
+ APPNAME = 'midori'
+ VERSION = VERSION_FULL = '0.5.4'
+-VERSION_SUFFIX = ' (%s)' % VERSION
++#VERSION_SUFFIX = ' (%s)' % VERSION
+ 
+ try:
+     if os.path.isdir ('.git'):
+@@ -44,8 +44,12 @@
+         folder = os.getcwd ()
+         if VERSION in folder:
+             VERSION_FULL = os.path.basename (folder)
+-    if VERSION in VERSION_FULL:
+-        VERSION_SUFFIX = VERSION_FULL.replace (VERSION, '')
++    if VERSION_FULL.endswith ('_all_'):
++            VERSION_FULL = VERSION_FULL.replace('_all_', '')
++    if APPNAME in VERSION_FULL:
++            VERSION_FULL = VERSION_FULL.replace(APPNAME, '')[1:]
++
++    VERSION_SUFFIX = ' (%s)' % VERSION_FULL
+ except:
+     pass
+