8 files changed, 68 insertions, 77 deletions

diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index 4122a2597a07..ac980364cd42 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -14,23 +14,27 @@ MAINTAINER=	aehlig@linta.de
 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 @@ post-build:
 
 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 --git a/www/uzbl/distinfo b/www/uzbl/distinfo
index e43300904864..c59524490604 100644
--- a/www/uzbl/distinfo
+++ b/www/uzbl/distinfo
@@ -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 --git a/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed b/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed
new file mode 100644
index 000000000000..8b0409c480f2
--- /dev/null
+++ b/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed
@@ -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 --git a/www/uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon b/www/uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon
deleted file mode 100644
index 6e000260f79c..000000000000
--- a/www/uzbl/files/patch-examples__data__uzbl__scripts__uzbl-cookie-daemon
+++ /dev/null
@@ -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 --git a/www/uzbl/files/patch-examples__uzbl-cookie-manager.c b/www/uzbl/files/patch-examples__uzbl-cookie-manager.c
deleted file mode 100644
index 87a2fdb37894..000000000000
--- a/www/uzbl/files/patch-examples__uzbl-cookie-manager.c
+++ /dev/null
@@ -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 --git a/www/uzbl/files/patch-src__cookie-jar.c b/www/uzbl/files/patch-src__cookie-jar.c
deleted file mode 100644
index f4d247c2d4eb..000000000000
--- a/www/uzbl/files/patch-src__cookie-jar.c
+++ /dev/null
@@ -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 --git a/www/uzbl/files/patch-src__events.c b/www/uzbl/files/patch-src__events.c
new file mode 100644
index 000000000000..1606f4b86b4f
--- /dev/null
+++ b/www/uzbl/files/patch-src__events.c
@@ -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 --git a/www/uzbl/pkg-plist b/www/uzbl/pkg-plist
index 83dbd337ddd9..15510001f691 100644
--- a/www/uzbl/pkg-plist
+++ b/www/uzbl/pkg-plist
@@ -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