ports/168206: [patch][maintainer] www/uzbl update to 2012/05/14

[Klaus Aehlig]

>Number:         168206
>Category:       ports
>Synopsis:       [patch][maintainer] www/uzbl update to 2012/05/14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 21 20:00:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Klaus Aehlig
>Release:        FreeBSD 8.3-STABLE amd64
>Organization:
>Environment:
System: FreeBSD curry.linta.de 8.3-STABLE FreeBSD 8.3-STABLE #18: Fri May 4 09:47:05 CEST 2012 root at curry.linta.de:/usr/obj/usr/src/sys/CURRY amd64

>Description:
	Update to the version as of 2012/05/14
>How-To-Repeat:
	Release notes see http://www.uzbl.org/news.php?id=40
>Fix:
	Apply the following patch.

	Note: The file files/patch-src__util.c was removed, as this patch is
	now included upstream (well, kind-of: see change of files/patch-Makefile).


--- uzbl.diff begins here ---
diff -ruN uzbl.orig/Makefile uzbl/Makefile
--- uzbl.orig/Makefile	2012-05-21 21:39:42.000000000 +0200
+++ uzbl/Makefile	2012-05-21 21:39:57.000000000 +0200
@@ -24,10 +24,10 @@
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	2.4-2.7
 
-GITDATE=	2011.11.28
-GITVERSION=	e93bd72
+GITDATE=	2012.05.14
+GITVERSION=	228bc38
 
 WRKSRC=		${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
 
@@ -53,6 +53,8 @@
 		${WRKSRC}/bin/uzbl-event-manager
 	@${REINPLACE_CMD} -e "s|/usr/share/uzbl|${DATADIR}|" \
 		${WRKSRC}/bin/uzbl-tabbed
+	@${REINPLACE_CMD} -e "s|/usr/bin/env python2|/usr/bin/env ${PYTHON_VERSION}|" \
+		${WRKSRC}/bin/uzbl-event-manager
 
 post-build:
 	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
diff -ruN uzbl.orig/distinfo uzbl/distinfo
--- uzbl.orig/distinfo	2012-05-21 21:39:42.000000000 +0200
+++ uzbl/distinfo	2012-05-21 21:39:57.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (uzbl-0.0.0.2011.11.28.tar.gz) = c0f728d1a0f9d7472dbf57a155f2bfaa153aa621b0e784c9789c446e942e9c9c
-SIZE (uzbl-0.0.0.2011.11.28.tar.gz) = 151693
+SHA256 (uzbl-0.0.0.2012.05.14.tar.gz) = 4b4b3baf2339250b81818b12918af51a33f353a580856fe27eb193f71a4294cf
+SIZE (uzbl-0.0.0.2012.05.14.tar.gz) = 152376
diff -ruN uzbl.orig/files/patch-Makefile uzbl/files/patch-Makefile
--- uzbl.orig/files/patch-Makefile	2012-05-21 21:39:42.000000000 +0200
+++ uzbl/files/patch-Makefile	2012-05-21 21:39:57.000000000 +0200
@@ -1,6 +1,6 @@
---- Makefile.orig	2011-07-20 11:12:34.000000000 +0100
-+++ Makefile	2011-07-20 11:14:15.000000000 +0100
-@@ -7,7 +7,8 @@
+--- Makefile.orig	2012-04-28 20:27:17.000000000 +0200
++++ Makefile	2012-05-21 21:18:51.000000000 +0200
+@@ -7,13 +7,14 @@
  RUN_PREFIX?=$(PREFIX)
  
  # use GTK3-based webkit when it is available
@@ -9,4 +9,20 @@
 +USE_GTK3 = 0
  
  ifeq ($(USE_GTK3),1)
- 	REQ_PKGS += gtk+-3.0 webkitgtk-3.0
+ 	REQ_PKGS += gtk+-3.0 webkitgtk-3.0 javascriptcoregtk-3.0
+ 	CPPFLAGS = -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+ else
+-	REQ_PKGS += gtk+-2.0 webkit-1.0 javascriptcoregtk-1.0
++	REQ_PKGS += gtk+-2.0 webkit-1.0
+ 	CPPFLAGS =
+ endif
+ 
+@@ -25,7 +26,7 @@
+ 
+ COMMIT_HASH:=$(shell ./misc/hash.sh)
+ 
+-CPPFLAGS += -D_BSD_SOURCE -D_POSIX_SOURCE -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\"
++CPPFLAGS += -D_BSD_SOURCE -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\"
+ 
+ PKG_CFLAGS:=$(shell pkg-config --cflags $(REQ_PKGS))
+ 
diff -ruN uzbl.orig/files/patch-src__util.c uzbl/files/patch-src__util.c
--- uzbl.orig/files/patch-src__util.c	2012-05-21 21:39:42.000000000 +0200
+++ uzbl/files/patch-src__util.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
---- src/util.c.orig	2010-11-30 23:22:23.000000000 +0100
-+++ src/util.c	2010-11-30 23:23:09.000000000 +0100
-@@ -1,5 +1,3 @@
--#define _POSIX_SOURCE
--
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
--- uzbl.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: