diff options
| -rw-r--r-- | www/uzbl/Makefile | 21 | ||||
| -rw-r--r-- | www/uzbl/distinfo | 4 | ||||
| -rw-r--r-- | www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed | 26 | ||||
| -rw-r--r-- | www/uzbl/files/patch-src__uzbl-browser | 4 |
4 files changed, 14 insertions, 41 deletions
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile index 1e0b0cea218e..d731a89eecb5 100644 --- a/www/uzbl/Makefile +++ b/www/uzbl/Makefile @@ -22,8 +22,8 @@ USE_LDCONFIG= yes 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 @@ PORTDATA= examples 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 @@ do-install: ${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 --git a/www/uzbl/distinfo b/www/uzbl/distinfo index c75661daa2f5..ea29875e203a 100644 --- a/www/uzbl/distinfo +++ b/www/uzbl/distinfo @@ -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 --git a/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed b/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed deleted file mode 100644 index c9f69f0b6697..000000000000 --- a/www/uzbl/files/patch-examples__data__scripts__uzbl-tabbed +++ /dev/null @@ -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 --git a/www/uzbl/files/patch-src__uzbl-browser b/www/uzbl/files/patch-src__uzbl-browser index 423cf86d0c79..9f1a96276fcb 100644 --- a/www/uzbl/files/patch-src__uzbl-browser +++ b/www/uzbl/files/patch-src__uzbl-browser @@ -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 ] |