ports/155884: [maintainer] www/uzbl update to 2011.03.17

[Klaus T. Aehlig]

The following reply was made to PR ports/155884; it has been noted by GNATS.

From: "Klaus T. Aehlig" <aehlig at linta.de>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/155884: [maintainer] www/uzbl update to 2011.03.17
Date: Wed, 23 Mar 2011 10:15:26 +0000

 --zhXaljGHf11kAtnf
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 
 Oops, files/patch-examples__data__scripts__uzbl-tabbed is not
 (as I originally thought) completly upstream, and therefore
 CANNOT be removed. However, it is greatly simplified now.
 
 Please find attached the correct diff for www/uzbl. No addition
 or removal of files necessary.
 
 --zhXaljGHf11kAtnf
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="uzbl.diff"
 
 diff -ruN uzbl.orig/Makefile uzbl/Makefile
 --- uzbl.orig/Makefile	2011-03-23 09:21:41.000000000 +0000
 +++ uzbl/Makefile	2011-03-23 09:22:00.000000000 +0000
 @@ -22,8 +22,8 @@
  USE_GMAKE=	yes
  USE_PYTHON=	yes
  
 -GITDATE=	2011.03.14
 -GITVERSION=	f3e52b2
 +GITDATE=	2011.03.17
 +GITVERSION=	7803561
  
  WRKSRC=		${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
  
 diff -ruN uzbl.orig/distinfo uzbl/distinfo
 --- uzbl.orig/distinfo	2011-03-23 09:21:41.000000000 +0000
 +++ uzbl/distinfo	2011-03-23 09:22:00.000000000 +0000
 @@ -1,2 +1,2 @@
 -SHA256 (uzbl-0.0.0.2011.03.14.tar.gz) = 08b6f5b2c2bc33a76c8d12999795aec8db6ed6636b55f0f600fbab982cbf74d4
 -SIZE (uzbl-0.0.0.2011.03.14.tar.gz) = 143473
 +SHA256 (uzbl-0.0.0.2011.03.17.tar.gz) = b7bfe86c10a232dd9858ab678643d86034ba6ed80c31ec42ac3671b6733232f4
 +SIZE (uzbl-0.0.0.2011.03.17.tar.gz) = 143726
 diff -ruN uzbl.orig/files/patch-examples__data__scripts__uzbl-tabbed uzbl/files/patch-examples__data__scripts__uzbl-tabbed
 --- uzbl.orig/files/patch-examples__data__scripts__uzbl-tabbed	2011-03-23 09:21:41.000000000 +0000
 +++ uzbl/files/patch-examples__data__scripts__uzbl-tabbed	2011-03-23 09:57:16.000000000 +0000
 @@ -1,46 +1,11 @@
 ---- examples/data/scripts/uzbl-tabbed.orig	2011-03-14 04:36:33.000000000 +0000
 -+++ examples/data/scripts/uzbl-tabbed	2011-03-15 16:45:32.000000000 +0000
 -@@ -449,8 +449,12 @@
 +--- examples/data/scripts/uzbl-tabbed.orig	2011-03-23 09:55:25.000000000 +0000
 ++++ examples/data/scripts/uzbl-tabbed	2011-03-23 09:56:31.000000000 +0000
 +@@ -1016,7 +1016,7 @@
 +             title = config['new_tab_title']
   
 -         type, _, args = cmd.split(" ", 2)
 -         if type == "EVENT":
 --            type, args = args.split(" ", 1)
 -+            type, args = (args + " ").split(" ", 1)
 -             if type == "TITLE_CHANGED":
 -+                try:
 -+                    _,args,_ = args.split("'",2)
 -+                except:
 -+                    pass
 -                 self.title = args.strip()
 -                 self.title_changed(False)
 -             elif type == "VARIABLE_SET":
 -@@ -459,7 +463,13 @@
 -                 try:
 -                     val = int(val)
 -                 except:
 --                    pass
 -+                    try:
 -+                        val = float(val)
 -+                    except:
 -+                        try:
 -+                            _, val, _ = val.split("'",2)
 -+                        except:
 -+                            pass
 +         cmd = ['uzbl-browser', '-n', name, '-s', str(sid),
 +-               '--connect-socket', self.socket_path, '--uri', uri]
 ++               '--connect-socket', self.socket_path, '--uri', str(uri)]
 +         gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
   
 -                 if var in UZBL_TABBED_VARS:
 -                     if config[var] != val:
 -@@ -497,12 +507,12 @@
 -                 self.parent.new_tab(args, '', 0, next=True)
 - 
 -             elif type == "NEXT_TAB":
 --                if args:
 -+                if args.strip():
 -                     self.parent.next_tab(int(args))
 -                 else:
 -                     self.parent.next_tab()
 -             elif type == "PREV_TAB":
 --                if args:
 -+                if args.strip():
 -                     self.parent.prev_tab(int(args))
 -                 else:
 -                     self.parent.prev_tab()
 +         uzbl = UzblInstance(self, tab, name, uri, title, switch)
 
 --zhXaljGHf11kAtnf--