Date: Sun, 10 Apr 2016 12:17:04 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412925 - in head/www/uzbl: . files Message-ID: <201604101217.u3ACH4pW089756@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Apr 10 12:17:04 2016 New Revision: 412925 URL: https://svnweb.freebsd.org/changeset/ports/412925 Log: Update to upstream version 0.9 PR: 208293 Submitted by: aehlig@linta.de (maintainer) Added: head/www/uzbl/files/patch-src__requests.c (contents, props changed) Deleted: head/www/uzbl/files/patch-examples__data__scripts__auth.py Modified: head/www/uzbl/Makefile head/www/uzbl/distinfo head/www/uzbl/files/patch-Makefile head/www/uzbl/files/patch-examples__data__scripts__instance-select-wii.sh head/www/uzbl/files/patch-examples__data__scripts__load_url_from_history.sh head/www/uzbl/files/patch-src__events.c head/www/uzbl/files/patch-src__uzbl-browser head/www/uzbl/files/patch-uzbl-core.c head/www/uzbl/pkg-plist Modified: head/www/uzbl/Makefile ============================================================================== --- head/www/uzbl/Makefile Sun Apr 10 12:04:42 2016 (r412924) +++ head/www/uzbl/Makefile Sun Apr 10 12:17:04 2016 (r412925) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= uzbl -DISTVERSION= 0.0.0.${GITDATE} -PORTREVISION= 3 +PORTVERSION= 0.9.0 +DISTVERSIONPREFIX=v CATEGORIES= www -MASTER_SITES= http://www.linta.de/distfiles/ MAINTAINER= aehlig@linta.de COMMENT= Web interface tools which adhere to the unix philosophy @@ -13,26 +12,28 @@ COMMENT= Web interface tools which adher LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 RUN_DEPENDS= socat:net/socat \ - dmenu:x11/dmenu + dmenu:x11/dmenu \ + ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser -USES= gmake pkgconfig python:2 +USES= gmake pkgconfig python:2 desktop-file-utils USE_GNOME= gtk20 pygtk2 USE_LDCONFIG= yes +INSTALLS_ICONS= yes -GITDATE= 2012.05.14 -GITVERSION= 228bc38 - -WRKSRC= ${WRKDIR}/Dieterbe-uzbl-${GITVERSION} +USE_GITHUB= yes +GH_ACCOUNT= uzbl OPTIONS_DEFINE= DOCS +MAKE_ENV+= PYTHON=${PYTHON_VERSION} + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} -PORTDOCS= AUTHORS README COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \ - multiple-instances-management performance url-editing config.h vim +PORTDOCS= AUTHORS DEBUGGING.md FAQ.md HACKING.md vim .endif PORTDATA= examples @@ -40,33 +41,20 @@ PORTDATA= examples post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ ${WRKSRC}/examples/config/config \ - ${WRKSRC}/bin/uzbl-browser \ - ${WRKSRC}/bin/uzbl-event-manager + ${WRKSRC}/bin/uzbl-browser.in @${REINPLACE_CMD} -e "s|share/uzbl|${DATADIR_REL}|" \ ${WRKSRC}/examples/config/config \ - ${WRKSRC}/bin/uzbl-browser \ - ${WRKSRC}/bin/uzbl-event-manager + ${WRKSRC}/bin/uzbl-browser.in @${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 {} \; -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/uzbl-core ${STAGEDIR}${PREFIX}/bin -.for f in uzbl-event-manager uzbl-browser uzbl-tabbed - ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin -.endfor +post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/src/config.h ${STAGEDIR}${DOCSDIR} -.for f in COMMUNITY CONTRIBUTING FAQ INSTALL TODO config-syntax \ - multiple-instances-management performance url-editing - ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR}/${f} -.endfor -.for f in AUTHORS README +.for f in AUTHORS DEBUGGING.md FAQ.md HACKING.md ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f} .endfor (cd ${WRKSRC}/extras && ${COPYTREE_SHARE} vim ${STAGEDIR}${DOCSDIR}) @@ -79,8 +67,10 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/examples/config/config ${STAGEDIR}${DATADIR}/examples/config/config (cd ${WRKSRC}/examples/data && \ - ${COPYTREE_BIN} plugins ${STAGEDIR}${DATADIR}/examples/data/) - (cd ${WRKSRC}/examples/data && \ ${COPYTREE_BIN} scripts ${STAGEDIR}${DATADIR}/examples/data/) +.for f in uzbl-browser.1 uzbl-core.1 uzbl-event-manager.1 + ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/${f} +.endfor + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/uzbl-core .include <bsd.port.mk> Modified: head/www/uzbl/distinfo ============================================================================== --- head/www/uzbl/distinfo Sun Apr 10 12:04:42 2016 (r412924) +++ head/www/uzbl/distinfo Sun Apr 10 12:17:04 2016 (r412925) @@ -1,2 +1,2 @@ -SHA256 (uzbl-0.0.0.2012.05.14.tar.gz) = 4b4b3baf2339250b81818b12918af51a33f353a580856fe27eb193f71a4294cf -SIZE (uzbl-0.0.0.2012.05.14.tar.gz) = 152376 +SHA256 (uzbl-uzbl-v0.9.0_GH0.tar.gz) = 931cf0bd91ebf140ddb0659d8ee547826bfa5d8235b618552eb5b951cc865347 +SIZE (uzbl-uzbl-v0.9.0_GH0.tar.gz) = 254468 Modified: head/www/uzbl/files/patch-Makefile ============================================================================== --- head/www/uzbl/files/patch-Makefile Sun Apr 10 12:04:42 2016 (r412924) +++ head/www/uzbl/files/patch-Makefile Sun Apr 10 12:17:04 2016 (r412925) @@ -1,28 +1,27 @@ ---- 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 --USE_GTK3 = $(shell pkg-config --exists gtk+-3.0 webkitgtk-3.0 && echo 1) -+# USE_GTK3 = $(shell pkg-config --exists gtk+-3.0 webkitgtk-3.0 && echo 1) -+USE_GTK3 = 0 - - ifeq ($(USE_GTK3),1) - 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 = +--- Makefile.orig 2016-02-28 14:27:33 UTC ++++ Makefile +@@ -22,13 +22,13 @@ + # --- configuration ends here --- + + ifeq ($(ENABLE_GTK3),auto) +-ENABLE_GTK3 := $(shell pkg-config --exists gtk+-3.0 && echo yes) ++# ENABLE_GTK3 := $(shell pkg-config --exists gtk+-3.0 && echo yes) endif -@@ -25,7 +26,7 @@ + ifeq ($(ENABLE_GTK3),yes) + REQ_PKGS += 'webkitgtk-3.0 >= 1.2.4' javascriptcoregtk-3.0 + else +-REQ_PKGS += 'webkit-1.0 >= 1.2.4' javascriptcoregtk-1.0 ++REQ_PKGS += 'webkit-1.0 >= 1.2.4' + endif - COMMIT_HASH:=$(shell ./misc/hash.sh) + ifeq ($(ENABLE_GTK3),yes) +@@ -46,7 +46,7 @@ --CPPFLAGS += -D_BSD_SOURCE -D_POSIX_SOURCE -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\" -+CPPFLAGS += -D_BSD_SOURCE -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\" + COMMIT_HASH := $(shell ./misc/hash.sh) - PKG_CFLAGS:=$(shell pkg-config --cflags $(REQ_PKGS)) +-CPPFLAGS += -D_XOPEN_SOURCE=500 -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\" -DLIBDIR=\"$(LIBDIR)\" ++CPPFLAGS += -DARCH=\"$(ARCH)\" -DCOMMIT=\"$(COMMIT_HASH)\" -DLIBDIR=\"$(LIBDIR)\" + HAVE_LIBSOUP_VERSION := $(shell pkg-config --exists 'libsoup-2.4 >= 2.41.1' && echo yes) + ifeq ($(HAVE_LIBSOUP_VERSION),yes) Modified: head/www/uzbl/files/patch-examples__data__scripts__instance-select-wii.sh ============================================================================== --- head/www/uzbl/files/patch-examples__data__scripts__instance-select-wii.sh Sun Apr 10 12:04:42 2016 (r412924) +++ head/www/uzbl/files/patch-examples__data__scripts__instance-select-wii.sh Sun Apr 10 12:17:04 2016 (r412925) @@ -1,11 +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 +--- examples/data/scripts/instance-select-wmii.sh.orig 2016-03-23 07:35:11 UTC ++++ examples/data/scripts/instance-select-wmii.sh +@@ -40,7 +40,7 @@ case "$action" in + ;; + "prev") + readonly current="$( wmiir read /client/sel/ctl | head -n 1 )" +- readonly prev="$( wmiir read /tag/sel/index | grep -B 10000 " $current " | tac | grep -m 1 uzbl | cut -d ' ' -f 2 )" ++ readonly 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 Modified: head/www/uzbl/files/patch-examples__data__scripts__load_url_from_history.sh ============================================================================== --- head/www/uzbl/files/patch-examples__data__scripts__load_url_from_history.sh Sun Apr 10 12:04:42 2016 (r412924) +++ head/www/uzbl/files/patch-examples__data__scripts__load_url_from_history.sh Sun Apr 10 12:17:04 2016 (r412925) @@ -1,11 +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 +--- examples/data/scripts/load_url_from_history.sh.orig 2016-02-28 14:27:33 UTC ++++ examples/data/scripts/load_url_from_history.sh +@@ -13,7 +13,7 @@ + if $DMENU_HAS_VERTICAL; then # 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" + else + readonly current="$( tail -n 1 "$UZBL_HISTORY_FILE" | cut -d ' ' -f 3 )" + goto="$( ( print "$current\n"; cut -d ' ' -f 3 < "$UZBL_HISTORY_FILE" | grep -v -e "^$current\$" | sort -u ) | $DMENU )" Modified: head/www/uzbl/files/patch-src__events.c ============================================================================== --- head/www/uzbl/files/patch-src__events.c Sun Apr 10 12:04:42 2016 (r412924) +++ head/www/uzbl/files/patch-src__events.c Sun Apr 10 12:17:04 2016 (r412925) @@ -1,10 +1,10 @@ ---- src/events.c.orig 2011-03-15 12:19:22.000000000 +0000 -+++ src/events.c 2011-03-15 12:19:36.000000000 +0000 -@@ -3,6 +3,7 @@ - ** (c) 2009 by Robert Manea - */ +--- src/events.c.orig 2016-02-28 14:27:33 UTC ++++ src/events.c +@@ -5,6 +5,7 @@ + #include "util.h" + #include "uzbl-core.h" +#include <stdarg.h> - #include "uzbl-core.h" - #include "events.h" - #include "util.h" + #include <string.h> + + const char *event_table[] = { Added: head/www/uzbl/files/patch-src__requests.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/uzbl/files/patch-src__requests.c Sun Apr 10 12:17:04 2016 (r412925) @@ -0,0 +1,10 @@ +--- src/requests.c.orig 2016-03-25 08:47:49 UTC ++++ src/requests.c +@@ -8,6 +8,7 @@ + + #include <errno.h> + #include <string.h> ++#include <stdarg.h> + + struct _UzblRequests { + /* Reply buffer */ Modified: head/www/uzbl/files/patch-src__uzbl-browser ============================================================================== --- head/www/uzbl/files/patch-src__uzbl-browser Sun Apr 10 12:04:42 2016 (r412924) +++ head/www/uzbl/files/patch-src__uzbl-browser Sun Apr 10 12:17:04 2016 (r412925) @@ -1,11 +1,11 @@ ---- 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 ] - #then -- ${UZBL_EVENT_MANAGER:-uzbl-event-manager -va start} -+ ${UZBL_EVENT_MANAGER:-uzbl-event-manager} -va start - #fi - - exec uzbl-core "$@" ${config_file:+--config "$config_file"} --connect-socket $DAEMON_SOCKET +--- bin/uzbl-browser.in.orig 2016-02-28 14:27:33 UTC ++++ bin/uzbl-browser.in +@@ -63,7 +63,7 @@ fi + if [ -z "$UZBL_EVENT_SOCKET" ]; then + UZBL_EVENT_SOCKET="$XDG_CACHE_HOME/uzbl/event_daemon" + if ! [ -f "$UZBL_EVENT_SOCKET.pid" ] || ! ps -p "$(cat "$UZBL_EVENT_SOCKET.pid")" >/dev/null; then +- ${UZBL_EVENT_MANAGER:-uzbl-event-manager -va --server-socket "$UZBL_EVENT_SOCKET" start} || \ ++ ${UZBL_EVENT_MANAGER:-uzbl-event-manager} -va --server-socket "$UZBL_EVENT_SOCKET" start || \ + die_with_status 4 "Error: Could not start uzbl-event-manager" + fi + fi Modified: head/www/uzbl/files/patch-uzbl-core.c ============================================================================== --- head/www/uzbl/files/patch-uzbl-core.c Sun Apr 10 12:04:42 2016 (r412924) +++ head/www/uzbl/files/patch-uzbl-core.c Sun Apr 10 12:17:04 2016 (r412925) @@ -1,10 +1,10 @@ ---- src/uzbl-core.c.orig 2010-11-29 20:00:45.000000000 +0100 -+++ src/uzbl-core.c 2010-11-29 19:59:16.000000000 +0100 -@@ -29,6 +29,7 @@ +--- src/uzbl-core.c.orig 2016-02-28 14:27:33 UTC ++++ src/uzbl-core.c +@@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/errno.h> #include "uzbl-core.h" - #include "callbacks.h" - #include "events.h" + + #include "commands.h" Modified: head/www/uzbl/pkg-plist ============================================================================== --- head/www/uzbl/pkg-plist Sun Apr 10 12:04:42 2016 (r412924) +++ head/www/uzbl/pkg-plist Sun Apr 10 12:17:04 2016 (r412925) @@ -1,3 +1,67 @@ +%%PYTHON_SITELIBDIR%%/uzbl-201100808-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYTHON_SITELIBDIR%%/uzbl-201100808-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYTHON_SITELIBDIR%%/uzbl-201100808-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYTHON_SITELIBDIR%%/uzbl-201100808-py%%PYTHON_VER%%.egg-info/entry_points.txt +%%PYTHON_SITELIBDIR%%/uzbl-201100808-py%%PYTHON_VER%%.egg-info/top_level.txt +%%PYTHON_SITELIBDIR%%/uzbl/__init__.py +%%PYTHON_SITELIBDIR%%/uzbl/__init__.pyc +%%PYTHON_SITELIBDIR%%/uzbl/arguments.py +%%PYTHON_SITELIBDIR%%/uzbl/arguments.pyc +%%PYTHON_SITELIBDIR%%/uzbl/core.py +%%PYTHON_SITELIBDIR%%/uzbl/core.pyc +%%PYTHON_SITELIBDIR%%/uzbl/event_manager.py +%%PYTHON_SITELIBDIR%%/uzbl/event_manager.pyc +%%PYTHON_SITELIBDIR%%/uzbl/ext.py +%%PYTHON_SITELIBDIR%%/uzbl/ext.pyc +%%PYTHON_SITELIBDIR%%/uzbl/net.py +%%PYTHON_SITELIBDIR%%/uzbl/net.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/__init__.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/__init__.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/bind.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/bind.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/cmd_expand.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/cmd_expand.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/completion.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/completion.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/config.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/config.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/cookies.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/cookies.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/downloads.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/downloads.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/history.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/history.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/keycmd.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/keycmd.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/mode.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/mode.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/on_event.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/on_event.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/on_set.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/on_set.pyc +%%PYTHON_SITELIBDIR%%/uzbl/plugins/progress_bar.py +%%PYTHON_SITELIBDIR%%/uzbl/plugins/progress_bar.pyc +%%PYTHON_SITELIBDIR%%/uzbl/xdg.py +%%PYTHON_SITELIBDIR%%/uzbl/xdg.pyc +share/appdata/uzbl.appdata.xml +share/applications/uzbl-core.desktop +share/applications/uzbl-tabbed.desktop +share/icons/hicolor/32x32/apps/uzbl.png +share/icons/hicolor/48x48/apps/uzbl.png +share/icons/hicolor/64x64/apps/uzbl.png +share/icons/hicolor/96x96/apps/uzbl.png +share/man/man1/uzbl-browser.1.gz +share/man/man1/uzbl-core.1.gz +share/man/man1/uzbl-event-manager.1.gz +%%DATADIR%%/docs/AUTHORS +%%DATADIR%%/docs/COMMUNITY.md +%%DATADIR%%/docs/CONTRIBUTING.md +%%DATADIR%%/docs/FAQ.md +%%DATADIR%%/docs/INSTALL.md +%%DATADIR%%/docs/README.event-manager.md +%%DATADIR%%/docs/README.md +%%DATADIR%%/docs/README.scripts.md +%%DATADIR%%/docs/config.h bin/uzbl-core bin/uzbl-browser bin/uzbl-event-manager
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604101217.u3ACH4pW089756>