aboutsummaryrefslogtreecommitdiff
path: root/www/uzbl
diff options
context:
space:
mode:
authorBeech Rintoul <beech@FreeBSD.org>2012-05-23 06:55:07 +0000
committerBeech Rintoul <beech@FreeBSD.org>2012-05-23 06:55:07 +0000
commitff09d6966e1196a67495960c0bd01deff50989fb (patch)
tree029051fbc49964561fe1532f708db2b733e32a23 /www/uzbl
parent00bdff3f9f40dd9869a346f9677e0239a3c5236e (diff)
downloadports-ff09d6966e1196a67495960c0bd01deff50989fb.tar.gz
ports-ff09d6966e1196a67495960c0bd01deff50989fb.zip
Notes
Diffstat (limited to 'www/uzbl')
-rw-r--r--www/uzbl/Makefile8
-rw-r--r--www/uzbl/distinfo4
-rw-r--r--www/uzbl/files/patch-Makefile24
-rw-r--r--www/uzbl/files/patch-src__util.c8
4 files changed, 27 insertions, 17 deletions
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index 76c0fcfd0c10..26d46ca6e017 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -24,10 +24,10 @@ RUN_DEPENDS= socat:${PORTSDIR}/net/socat \
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 @@ post-patch:
${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 --git a/www/uzbl/distinfo b/www/uzbl/distinfo
index 511cb2d66ae4..bc694c6d3e20 100644
--- a/www/uzbl/distinfo
+++ b/www/uzbl/distinfo
@@ -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 --git a/www/uzbl/files/patch-Makefile b/www/uzbl/files/patch-Makefile
index e1cebbe7ab4a..7c4b3b635f6b 100644
--- a/www/uzbl/files/patch-Makefile
+++ b/www/uzbl/files/patch-Makefile
@@ -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 --git a/www/uzbl/files/patch-src__util.c b/www/uzbl/files/patch-src__util.c
deleted file mode 100644
index 62c38281a892..000000000000
--- a/www/uzbl/files/patch-src__util.c
+++ /dev/null
@@ -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>