Date: Wed, 13 Apr 2011 23:28:53 +0100 (BST) From: Klaus Aehlig <aehlig@linta.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/156379: [maintainer] www/uzbl update to 2011.04.12 Message-ID: <20110413222854.14D841CC1D@curry.linta.de> Resent-Message-ID: <201104132230.p3DMU7PL045204@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156379
>Category: ports
>Synopsis: [maintainer] www/uzbl update to 2011.04.12
>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: Wed Apr 13 22:30:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Klaus Aehlig
>Release: FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD curry.linta.de 8.2-STABLE FreeBSD 8.2-STABLE #11: Sun Feb 27 03:33:40 GMT 2011 aehlig@curry.linta.de:/usr/obj/usr/src/sys/CURRY amd64
>Description:
Update to the release as of 2011/04/12
>How-To-Repeat:
>Fix:
apply the following patch.
Note: the file files/patch-examples__data__scripts__uzbl-tabbed has been removed as it
is now contained in upstream
--- uzbl.diff begins here ---
diff -ruN uzbl.orig/Makefile uzbl/Makefile
--- uzbl.orig/Makefile 2011-04-13 23:21:17.000000000 +0100
+++ uzbl/Makefile 2011-04-13 23:22:32.000000000 +0100
@@ -22,8 +22,8 @@
USE_GMAKE= yes
USE_PYTHON= yes
-GITDATE= 2011.03.17
-GITVERSION= 7803561
+GITDATE= 2011.04.12
+GITVERSION= ed8f45d
WRKSRC= ${WRKDIR}/Dieterbe-uzbl-${GITVERSION}
@@ -44,23 +44,22 @@
post-patch:
@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
${WRKSRC}/examples/config/config \
- ${WRKSRC}/src/uzbl-browser \
- ${WRKSRC}/examples/data/scripts/uzbl-event-manager
+ ${WRKSRC}/bin/uzbl-browser \
+ ${WRKSRC}/bin/uzbl-event-manager
@${REINPLACE_CMD} -e "s|share/uzbl|${DATADIR_REL}|" \
${WRKSRC}/examples/config/config \
- ${WRKSRC}/src/uzbl-browser \
- ${WRKSRC}/examples/data/scripts/uzbl-event-manager
+ ${WRKSRC}/bin/uzbl-browser \
+ ${WRKSRC}/bin/uzbl-event-manager
@${REINPLACE_CMD} -e "s|/usr/share/uzbl|${DATADIR}|" \
- ${WRKSRC}/examples/data/scripts/uzbl-tabbed
+ ${WRKSRC}/bin/uzbl-tabbed
post-build:
@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/uzbl-core ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/src/uzbl-browser ${PREFIX}/bin
-.for f in uzbl-event-manager uzbl-tabbed
- ${INSTALL_SCRIPT} ${WRKSRC}/examples/data/scripts/${f} ${PREFIX}/bin
+.for f in uzbl-event-manager uzbl-browser uzbl-tabbed
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin
.endfor
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
@@ -78,7 +77,7 @@
${MKDIR} ${DATADIR}/examples/data/dforms ${DATADIR}/examples/config
.for f in data/bookmarks \
data/dforms/bbs.archlinux.org \
- data/style.css data/uzbl.png
+ config/style.css data/uzbl.png
${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DATADIR}/examples/${f}
.endfor
${INSTALL_DATA} ${WRKSRC}/examples/config/config ${DATADIR}/examples/config/config
diff -ruN uzbl.orig/distinfo uzbl/distinfo
--- uzbl.orig/distinfo 2011-04-13 23:21:17.000000000 +0100
+++ uzbl/distinfo 2011-04-13 23:21:34.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (uzbl-0.0.0.2011.03.17.tar.gz) = b7bfe86c10a232dd9858ab678643d86034ba6ed80c31ec42ac3671b6733232f4
-SIZE (uzbl-0.0.0.2011.03.17.tar.gz) = 143726
+SHA256 (uzbl-0.0.0.2011.04.12.tar.gz) = 6d2fb50bf89c94593f258a274f68f44a10d6e1f685dc3f11e1b56282f526d7b5
+SIZE (uzbl-0.0.0.2011.04.12.tar.gz) = 144532
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 2011-04-13 23:21:17.000000000 +0100
+++ uzbl/files/patch-examples__data__scripts__uzbl-tabbed 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
---- examples/data/scripts/uzbl-tabbed.orig 2011-03-17 13:06:03.000000000 +0000
-+++ examples/data/scripts/uzbl-tabbed 2011-03-23 10:33:53.000000000 +0000
-@@ -507,12 +507,12 @@
- self.parent.new_tab(args[0], '', 0, next=True)
-
- elif type == "NEXT_TAB":
-- if args[0]:
-+ if args:
- self.parent.next_tab(int(args[0]))
- else:
- self.parent.next_tab()
- elif type == "PREV_TAB":
-- if args[0]:
-+ if args:
- self.parent.prev_tab(int(args[0]))
- else:
- self.parent.prev_tab()
-@@ -1016,7 +1016,7 @@
- title = config['new_tab_title']
-
- cmd = ['uzbl-browser', '-n', name, '-s', str(sid),
-- '--connect-socket', self.socket_path, '--uri', uri]
-+ '--connect-socket', self.socket_path, '--uri', str(uri)]
- gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
-
- uzbl = UzblInstance(self, tab, name, uri, title, switch)
diff -ruN uzbl.orig/files/patch-src__uzbl-browser uzbl/files/patch-src__uzbl-browser
--- uzbl.orig/files/patch-src__uzbl-browser 2011-04-13 23:21:17.000000000 +0100
+++ uzbl/files/patch-src__uzbl-browser 2011-04-13 23:21:34.000000000 +0100
@@ -1,5 +1,5 @@
---- src/uzbl-browser.orig 2010-12-01 00:06:50.000000000 +0100
-+++ src/uzbl-browser 2010-12-01 00:07:09.000000000 +0100
+--- bin/uzbl-browser.orig 2010-12-01 00:06:50.000000000 +0100
++++ bin/uzbl-browser 2010-12-01 00:07:09.000000000 +0100
@@ -74,7 +74,7 @@
DAEMON_SOCKET="$XDG_CACHE_HOME"/uzbl/event_daemon
#if [ ! -f "$DAEMON_SOCKET".pid ]
--- 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?20110413222854.14D841CC1D>