Date: Fri, 7 Oct 2011 22:24:04 +0100 (BST) From: Klaus Aehlig <aehlig@linta.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/161384: [maintainer] www/uzbl update to 2011/10/01 Message-ID: <20111007212404.A7A1556440@hilbert.linta.de> Resent-Message-ID: <201110072130.p97LU8rh067975@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161384
>Category: ports
>Synopsis: [maintainer] www/uzbl update to 2011/10/01
>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: Fri Oct 07 21:30:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Klaus Aehlig
>Release: FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD hilbert.linta.de 8.2-STABLE FreeBSD 8.2-STABLE #6: Sat May 28 22:29:20 BST 2011 root@hilbert.linta.de:/usr/obj/usr/src/sys/HILBERT amd64
>Description:
* Update to version as of 2011/10/01
* add missing run dependency on dmenu (reported by Pierre Smars)
* replace tac by tail -r in the example scripts, as tail is base system (reported by Pierre Smars)
>How-To-Repeat:
>Fix:
Apply the following patch.
Note: two new files are added, files/patch-examples__data__scripts__load_url_from_history.sh
and files/patch-examples__data__scripts__instance-select-wii.sh
--- uzbl.diff begins here ---
diff -ruN uzbl.orig/Makefile uzbl/Makefile
--- uzbl.orig/Makefile 2011-10-07 22:08:07.000000000 +0100
+++ uzbl/Makefile 2011-10-07 22:16:30.000000000 +0100
@@ -7,7 +7,6 @@
PORTNAME= uzbl
DISTVERSION= 0.0.0.${GITDATE}
-PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.linta.de/distfiles/
@@ -16,6 +15,7 @@
LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
RUN_DEPENDS= socat:${PORTSDIR}/net/socat \
+ dmenu:${PORTSDIR}/x11/dmenu \
${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2
USE_GNOME= gtk20
@@ -23,8 +23,8 @@
USE_GMAKE= yes
USE_PYTHON= yes
-GITDATE= 2011.07.25
-GITVERSION= 9b73b93
+GITDATE= 2011.10.01
+GITVERSION= 9576f59
WRKSRC= ${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
diff -ruN uzbl.orig/distinfo uzbl/distinfo
--- uzbl.orig/distinfo 2011-10-07 22:08:07.000000000 +0100
+++ uzbl/distinfo 2011-10-07 22:16:30.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (uzbl-0.0.0.2011.07.25.tar.gz) = 2e61fa6c62e48d3f13e95a4ea7e7aead65345f6c88a688844ef921685dffe565
-SIZE (uzbl-0.0.0.2011.07.25.tar.gz) = 146851
+SHA256 (uzbl-0.0.0.2011.10.01.tar.gz) = fd72ea7e3246e904b451cda8339a1aab2fcd259ec07ec82aa0c9affe6084c2fe
+SIZE (uzbl-0.0.0.2011.10.01.tar.gz) = 148483
diff -ruN uzbl.orig/files/patch-examples__data__scripts__instance-select-wii.sh uzbl/files/patch-examples__data__scripts__instance-select-wii.sh
--- uzbl.orig/files/patch-examples__data__scripts__instance-select-wii.sh 1970-01-01 01:00:00.000000000 +0100
+++ uzbl/files/patch-examples__data__scripts__instance-select-wii.sh 2011-10-07 22:16:30.000000000 +0100
@@ -0,0 +1,11 @@
+--- examples/data/scripts/instance-select-wmii.sh.orig 2011-10-06 03:29:31.000000000 +0100
++++ examples/data/scripts/instance-select-wmii.sh 2011-10-06 03:30:05.000000000 +0100
+@@ -35,7 +35,7 @@
+ ;;
+ "prev")
+ current="$( wmiir read /client/sel/ctl | head -n 1 )"
+- prev="$( wmiir read /tag/sel/index | grep -B 10000 " $current " | tac | grep -m 1 uzbl | cut -d ' ' -f 2 )"
++ prev="$( wmiir read /tag/sel/index | grep -B 10000 " $current " | tail -r | grep -m 1 uzbl | cut -d ' ' -f 2 )"
+ if [ -n "$prev" ]; then
+ wmiir xwrite /tag/sel/ctl "select client $prev"
+ fi
diff -ruN uzbl.orig/files/patch-examples__data__scripts__load_url_from_history.sh uzbl/files/patch-examples__data__scripts__load_url_from_history.sh
--- uzbl.orig/files/patch-examples__data__scripts__load_url_from_history.sh 1970-01-01 01:00:00.000000000 +0100
+++ uzbl/files/patch-examples__data__scripts__load_url_from_history.sh 2011-10-07 22:16:30.000000000 +0100
@@ -0,0 +1,11 @@
+--- examples/data/scripts/load_url_from_history.sh.orig 2011-10-06 03:31:31.000000000 +0100
++++ examples/data/scripts/load_url_from_history.sh 2011-10-06 03:32:32.000000000 +0100
+@@ -15,7 +15,7 @@
+ else
+ # choose an item in reverse order, showing also the date and page titles
+ # pick the last field from the first 3 fields. this way you can pick a url (prefixed with date & time) or type just a new url.
+- goto="$( tac "$UZBL_HISTORY_FILE" | $DMENU | cut -d ' ' -f -3 | awk '{ print $NF }' )"
++ goto="$( tail -r "$UZBL_HISTORY_FILE" | $DMENU | cut -d ' ' -f -3 | awk '{ print $NF }' )"
+ fi
+
+ [ -n "$goto" ] && echo "uri $goto" > "$UZBL_FIFO"
--- uzbl.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111007212404.A7A1556440>