From aehlig@linta.de  Fri Feb 18 09:12:45 2011
Return-Path: <aehlig@linta.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 08E3A106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Feb 2011 09:12:45 +0000 (UTC)
	(envelope-from aehlig@linta.de)
Received: from linta.de (isilmar-3.linta.de [188.40.101.200])
	by mx1.freebsd.org (Postfix) with ESMTP id 725C68FC1C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Feb 2011 09:12:44 +0000 (UTC)
Received: (qmail 4906 invoked by uid 10); 18 Feb 2011 08:44:42 -0000
Received: from curry.linta.de by isilmar.linta.de with BSMTP; 18 Feb 2011 08:44:42 -0000
Received: by curry.linta.de (Postfix, from userid 1001)
	id 176D61CC1D; Fri, 18 Feb 2011 09:44:34 +0100 (CET)
Message-Id: <20110218084435.176D61CC1D@curry.linta.de>
Date: Fri, 18 Feb 2011 09:44:34 +0100 (CET)
From: Klaus Aehlig <aehlig@linta.de>
Reply-To: Klaus Aehlig <aehlig@linta.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer] www/uzbl update to Version as of 2011.02.15
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         154859
>Category:       ports
>Synopsis:       [maintainer] www/uzbl update to Version as of 2011.02.15
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 18 09:20:10 UTC 2011
>Closed-Date:    Thu Mar 17 14:14:41 UTC 2011
>Last-Modified:  Thu Mar 17 14:20:09 UTC 2011
>Originator:     Klaus Aehlig
>Release:        FreeBSD 8.2-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD curry.linta.de 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #10: Mon Jan 31 22:08:35 CET 2011 aehlig@curry.linta.de:/usr/obj/usr/src/sys/CURRY amd64

>Description:
Update to newest version (as of 2011/02/15).

Note: this update contains incompatible changes. I therefore suggest an entry
      to UPDATING along the following lines.


20110218:
  AFFECTS: users of www/uzbl
  AUTHOR: Klaus Aehlig <aehlig@linta.de>

  The port has been updated to version as of 2011/02/15. This introduces
  the following incompatabilities.

  - $UZBL_FIFO, $UZBL_TITLE are available to scripts as environment ariables, 
    but not as command-line arguments.
  - environment variables are no longer expanded by the config parser
  - download handling has changed
  - cookie daemons are no longer supported

  Users are advised to change their personal configuration files/scripts accordingly.

>How-To-Repeat:
>Fix:

Apply the following patch

--- uzbl.patch begins here ---
diff -ruN uzbl.orig/Makefile uzbl/Makefile
--- uzbl.orig/Makefile	2011-02-18 08:48:41.000000000 +0100
+++ uzbl/Makefile	2011-02-18 08:33:03.000000000 +0100
@@ -20,14 +20,16 @@
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 
-GITDATE=	2010.11.25
-GITVERSION=	5180049
+GITDATE=	2011.02.15
+GITVERSION=	8bbc39b
 
 WRKSRC=		${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+MAKE_JOBS_SAFE=	YES
+
 .if !defined(NOPORTDOCS)
 PORTDOCS=	AUTHORS README COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
 		multiple-instances-management performance url-editing config.h vim README.cookies
diff -ruN uzbl.orig/distinfo uzbl/distinfo
--- uzbl.orig/distinfo	2011-02-18 08:48:41.000000000 +0100
+++ uzbl/distinfo	2011-02-18 08:32:16.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (uzbl-0.0.0.2010.11.25.tar.gz) = 715163193b1c15377a1caaf2e993ef56584e356e6e62e74184b0acdb0c76bbd3
-SIZE (uzbl-0.0.0.2010.11.25.tar.gz) = 145473
+SHA256 (uzbl-0.0.0.2011.02.15.tar.gz) = c406eca3dd20dd40b557435c7766ee469378bcb4316d5a83bfa5af366193cd1f
+SIZE (uzbl-0.0.0.2011.02.15.tar.gz) = 152648
--- uzbl.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri Feb 18 10:57:34 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154859 
Responsible-Changed-From-To: miwi->wen 
Responsible-Changed-By: wen 
Responsible-Changed-When: Fri Feb 18 10:59:32 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154859 
Responsible-Changed-From-To: wen->miwi 
Responsible-Changed-By: wen 
Responsible-Changed-When: Fri Feb 18 12:58:03 UTC 2011 
Responsible-Changed-Why:  
Over to miwi. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154859 

From: "Klaus T. Aehlig" <aehlig@linta.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/154859: [maintainer] www/uzbl update to Version as of
 2011.02.15
Date: Wed, 16 Mar 2011 08:35:09 +0000

 --vtzGhvizbBRQ85DL
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 
 In the meantime, a new version has been released. The attached patch
 is a diff between the committed sate and a port for the latest version
 (20011/03/14). Please note that
 
  * files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon
    files/patch-examples__uzbl-cookie-manager.c
    files/patch-src__cookie-jar.c
 
    are removed
 
  * files/patch-examples__data__scripts__uzbl-tabbed
    files/patch-src__events.c
    
    are new
 
 
 An UPDATING entry is still needed. E.g., as follows.
 
 20110316:
 AFFECTS: users of www/uzbl
 AUTHOR: Klaus Aehlig <aehlig@linta.de>
 
 The port has been updated to version as of 2011/03/14. This introduces
 the following incompatabilities with respect to the version of 2010/11/25. 
 
 - $UZBL_FIFO, $UZBL_TITLE, etc are available to scripts as environment ariables,
   but not as command-line arguments.
 - environment variables are no longer expanded by the config parser
 - download handling has changed
 - cookie daemons are no longer supported
 
 Users are advised to change their personal configuration files/scripts accordingly;
 detailed instructions can be found at
 http://www.uzbl.org/wiki/experimental-branch#backwards-incompatible_changes_as_of_2010-12-30
 
 --vtzGhvizbBRQ85DL
 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-16 08:17:35.000000000 +0000
 +++ uzbl/Makefile	2011-03-16 08:17:43.000000000 +0000
 @@ -14,23 +14,27 @@
  COMMENT=	Web interface tools which adhere to the unix philosophy
  
  LIB_DEPENDS=	webkit:${PORTSDIR}/www/webkit-gtk2
 -RUN_DEPENDS=	socat:${PORTSDIR}/net/socat
 +RUN_DEPENDS=	socat:${PORTSDIR}/net/socat \
 +		${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2
  
  USE_GNOME=	gtk20
  USE_LDCONFIG=	yes
  USE_GMAKE=	yes
 +USE_PYTHON=     yes
  
 -GITDATE=	2010.11.25
 -GITVERSION=	5180049
 +GITDATE=	2011.03.14
 +GITVERSION=	f3e52b2
  
  WRKSRC=		${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
  
  LICENSE=	GPLv3
  LICENSE_FILE=	${WRKSRC}/LICENSE
  
 +MAKE_JOBS_SAFE=	YES
 +
  .if !defined(NOPORTDOCS)
  PORTDOCS=	AUTHORS README COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
 -		multiple-instances-management performance url-editing config.h vim README.cookies
 +		multiple-instances-management performance url-editing config.h vim
  .endif
  
  .if !defined(NOPORTDATA)
 @@ -54,16 +58,15 @@
  
  do-install:
  	${INSTALL_PROGRAM} ${WRKSRC}/uzbl-core ${PREFIX}/bin
 -	${INSTALL_PROGRAM} ${WRKSRC}/uzbl-cookie-manager ${PREFIX}/bin
  	${INSTALL_SCRIPT} ${WRKSRC}/src/uzbl-browser ${PREFIX}/bin
 -.for f in uzbl-event-manager uzbl-cookie-daemon uzbl-tabbed
 +.for f in uzbl-event-manager uzbl-tabbed
  	${INSTALL_SCRIPT} ${WRKSRC}/examples/data/scripts/${f} ${PREFIX}/bin
  .endfor
  .if !defined(NOPORTDOCS)
  	${MKDIR} ${DOCSDIR}
  	${INSTALL_DATA} ${WRKSRC}/src/config.h ${DOCSDIR}
  .for f in COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \
 -		multiple-instances-management performance url-editing README.cookies
 +		multiple-instances-management performance url-editing
  	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}/${f}
  .endfor
  .for f in AUTHORS README
 diff -ruN uzbl.orig/distinfo uzbl/distinfo
 --- uzbl.orig/distinfo	2011-03-16 08:17:35.000000000 +0000
 +++ uzbl/distinfo	2011-03-16 08:17:43.000000000 +0000
 @@ -1,2 +1,2 @@
 -SHA256 (uzbl-0.0.0.2010.11.25.tar.gz) = 715163193b1c15377a1caaf2e993ef56584e356e6e62e74184b0acdb0c76bbd3
 -SIZE (uzbl-0.0.0.2010.11.25.tar.gz) = 145473
 +SHA256 (uzbl-0.0.0.2011.03.14.tar.gz) = 08b6f5b2c2bc33a76c8d12999795aec8db6ed6636b55f0f600fbab982cbf74d4
 +SIZE (uzbl-0.0.0.2011.03.14.tar.gz) = 143473
 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	1970-01-01 01:00:00.000000000 +0100
 +++ uzbl/files/patch-examples__data__scripts__uzbl-tabbed	2011-03-16 08:17:43.000000000 +0000
 @@ -0,0 +1,46 @@
 +--- 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 @@
 + 
 +         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
 + 
 +                 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()
 diff -ruN uzbl.orig/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon
 --- uzbl.orig/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon	2011-03-16 08:17:35.000000000 +0000
 +++ uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon	1970-01-01 01:00:00.000000000 +0100
 @@ -1,29 +0,0 @@
 ---- ./examples/data/scripts/uzbl-cookie-daemon.orig	2010-01-05 20:17:29.000000000 +0100
 -+++ ./examples/data/scripts/uzbl-cookie-daemon	2010-01-07 13:24:58.000000000 +0100
 -@@ -187,7 +187,7 @@
 -         raise Exception("directory at %r is not a socket" % cookie_socket)
 - 
 -     try:
 --        sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)
 -+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 -         sock.connect(cookie_socket)
 -         sock.close()
 -         echo("detected daemon listening on %r" % cookie_socket)
 -@@ -210,7 +210,7 @@
 -         return False
 - 
 -     try:
 --        sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)
 -+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 -         sock.connect(cookie_socket)
 -         sock.send(cmd)
 -         sock.close()
 -@@ -420,7 +420,7 @@
 -         mkbasedir(cookie_socket)
 - 
 -         self.server_socket = socket.socket(socket.AF_UNIX,
 --          socket.SOCK_SEQPACKET)
 -+          socket.SOCK_STREAM)
 - 
 -         self.server_socket.bind(cookie_socket)
 - 
 diff -ruN uzbl.orig/files/patch-examples__uzbl-cookie-manager.c uzbl/files/patch-examples__uzbl-cookie-manager.c
 --- uzbl.orig/files/patch-examples__uzbl-cookie-manager.c	2011-03-16 08:17:35.000000000 +0000
 +++ uzbl/files/patch-examples__uzbl-cookie-manager.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,26 +0,0 @@
 ---- examples/uzbl-cookie-manager.c.orig	2010-11-25 05:56:44.000000000 +0100
 -+++ examples/uzbl-cookie-manager.c	2010-12-01 00:18:04.000000000 +0100
 -@@ -1,5 +1,3 @@
 --#define _POSIX_SOURCE
 --
 - #include <stdio.h>
 - #include <errno.h>
 - #include <string.h>
 -@@ -10,7 +8,7 @@
 - #include <sys/socket.h>
 - #include <sys/un.h>
 - #include <sys/select.h>
 --#include <sys/unistd.h>
 -+#include <unistd.h>
 - 
 - #include <sys/stat.h>
 - #include <sys/file.h>
 -@@ -36,7 +34,7 @@
 -   /* delete the cookie socket if it was left behind on a previous run */
 -   unlink(cookied_socket_path);
 - 
 --  int socket_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
 -+  int socket_fd = socket(AF_UNIX, SOCK_STREAM, 0);
 - 
 -   if(socket_fd < 0) {
 -     fprintf(stderr, "socket failed (%s)\n", strerror(errno));
 diff -ruN uzbl.orig/files/patch-src__cookie-jar.c uzbl/files/patch-src__cookie-jar.c
 --- uzbl.orig/files/patch-src__cookie-jar.c	2011-03-16 08:17:35.000000000 +0000
 +++ uzbl/files/patch-src__cookie-jar.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,11 +0,0 @@
 ---- src/cookie-jar.c.orig	2010-11-29 21:00:58.000000000 +0100
 -+++ src/cookie-jar.c	2010-11-29 21:01:17.000000000 +0100
 -@@ -211,7 +211,7 @@
 -     sa.sun_family = AF_UNIX;
 - 
 -     /* create socket file descriptor and connect it to path */
 --    fd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
 -+    fd = socket(AF_UNIX, SOCK_STREAM, 0);
 -     if(fd == -1) {
 -         g_printerr("connect_cookie_socket: creating socket failed (%s)\n", strerror(errno));
 -         return;
 diff -ruN uzbl.orig/files/patch-src__events.c uzbl/files/patch-src__events.c
 --- uzbl.orig/files/patch-src__events.c	1970-01-01 01:00:00.000000000 +0100
 +++ uzbl/files/patch-src__events.c	2011-03-16 08:17:43.000000000 +0000
 @@ -0,0 +1,10 @@
 +--- src/events.c.orig	2011-03-15 12:19:22.000000000 +0000
 ++++ src/events.c	2011-03-15 12:19:36.000000000 +0000
 +@@ -3,6 +3,7 @@
 +  ** (c) 2009 by Robert Manea
 + */
 + 
 ++#include <stdarg.h>
 + #include "uzbl-core.h"
 + #include "events.h"
 + #include "util.h"
 diff -ruN uzbl.orig/pkg-plist uzbl/pkg-plist
 --- uzbl.orig/pkg-plist	2011-03-16 08:17:35.000000000 +0000
 +++ uzbl/pkg-plist	2011-03-16 08:17:43.000000000 +0000
 @@ -1,6 +1,4 @@
  bin/uzbl-core
  bin/uzbl-browser
 -bin/uzbl-cookie-daemon
 -bin/uzbl-cookie-manager
  bin/uzbl-event-manager
  bin/uzbl-tabbed
 
 --vtzGhvizbBRQ85DL--
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Mar 17 14:14:40 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154859 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/154859: commit references a PR
Date: Thu, 17 Mar 2011 14:11:57 +0000 (UTC)

 miwi        2011-03-17 14:11:47 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/uzbl             Makefile distinfo pkg-plist 
   Added files:
     www/uzbl/files       
                          patch-examples__data__scripts__uzbl-tabbed 
                          patch-src__events.c 
   Removed files:
     www/uzbl/files       
                          patch-examples__data__uzbl__scripts__uzbl-cookie-daemon 
                          patch-examples__uzbl-cookie-manager.c 
                          patch-src__cookie-jar.c 
   Log:
   - Update to 2011.03.14
   
   PR:             ports/154859
   Submitted by:   "Klaus T. Aehlig" <aehlig@linta.de> (maintainer)
   
   Revision  Changes    Path
   1.10      +10 -7     ports/www/uzbl/Makefile
   1.7       +2 -2      ports/www/uzbl/distinfo
   1.1       +46 -0     ports/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed (new)
   1.3       +0 -29     ports/www/uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon (dead)
   1.2       +0 -26     ports/www/uzbl/files/patch-examples__uzbl-cookie-manager.c (dead)
   1.2       +0 -11     ports/www/uzbl/files/patch-src__cookie-jar.c (dead)
   1.1       +10 -0     ports/www/uzbl/files/patch-src__events.c (new)
   1.4       +0 -2      ports/www/uzbl/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
