svn commit: r429420 - in head/www/uzbl: . files

Dmitry Marakasov amdmi3 at FreeBSD.org
Sun Dec 25 13:22:25 UTC 2016 

Author: amdmi3
Date: Sun Dec 25 13:22:23 2016
New Revision: 429420
URL: https://svnweb.freebsd.org/changeset/ports/429420

Log:
  - Update to 0.9.1
  - While here, convert to options helpers and fix manpage installation
  
  PR:		213881
  Submitted by:	aehlig at linta.de (maintainer)

Modified:
  head/www/uzbl/Makefile
  head/www/uzbl/distinfo
  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/pkg-plist

Modified: head/www/uzbl/Makefile
==============================================================================
--- head/www/uzbl/Makefile	Sun Dec 25 13:16:00 2016	(r429419)
+++ head/www/uzbl/Makefile	Sun Dec 25 13:22:23 2016	(r429420)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	uzbl
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 DISTVERSIONPREFIX=v
 CATEGORIES=	www
 
@@ -12,32 +12,32 @@ 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
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2  \
+		libsoup-2.4.so:devel/libsoup
 RUN_DEPENDS=	socat:net/socat \
 		dmenu:x11/dmenu \
 		${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser
 
-USES=		gmake pkgconfig python:2 desktop-file-utils
-USE_GNOME=	gtk20 pygtk2
+USES=		gmake pkgconfig python:2 desktop-file-utils gettext-runtime
+USE_XORG=	x11
+USE_GNOME=	gtk20 pygtk2 cairo
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uzbl
 
-OPTIONS_DEFINE=	DOCS
-
-MAKE_ENV+=	PYTHON=${PYTHON_VERSION}
+MAKE_ENV=	PYTHON=${PYTHON_VERSION} \
+		MANDIR=${STAGEDIR}${MANPREFIX}/man
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS DEBUGGING.md FAQ.md HACKING.md vim
-.endif
-
 PORTDATA=	examples
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
 		${WRKSRC}/examples/config/config \
@@ -52,14 +52,7 @@ post-build:
 	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} {} \;
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.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})
-.endif
-	${MKDIR} ${STAGEDIR}${DATADIR}/examples/data/dforms ${STAGEDIR}${DATADIR}/examples/config
+	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/data/dforms ${STAGEDIR}${DATADIR}/examples/config
 .for f in data/bookmarks \
 	data/dforms/bbs.archlinux.org \
 	config/style.css data/uzbl.png
@@ -68,9 +61,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/config/config ${STAGEDIR}${DATADIR}/examples/config/config
 	(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}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/uzbl-core
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in AUTHORS DEBUGGING.md FAQ.md HACKING.md
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f}
 .endfor
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/uzbl-core
+	(cd ${WRKSRC}/extras && ${COPYTREE_SHARE} vim ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/www/uzbl/distinfo
==============================================================================
--- head/www/uzbl/distinfo	Sun Dec 25 13:16:00 2016	(r429419)
+++ head/www/uzbl/distinfo	Sun Dec 25 13:22:23 2016	(r429420)
@@ -1,2 +1,3 @@
-SHA256 (uzbl-uzbl-v0.9.0_GH0.tar.gz) = 931cf0bd91ebf140ddb0659d8ee547826bfa5d8235b618552eb5b951cc865347
-SIZE (uzbl-uzbl-v0.9.0_GH0.tar.gz) = 254468
+TIMESTAMP = 1481997827
+SHA256 (uzbl-uzbl-v0.9.1_GH0.tar.gz) = b5d6a0ffa602839f338af80b286c3550b85e68dd2412ccad3fea896ad2501ae9
+SIZE (uzbl-uzbl-v0.9.1_GH0.tar.gz) = 257493

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 Dec 25 13:16:00 2016	(r429419)
+++ head/www/uzbl/files/patch-examples__data__scripts__instance-select-wii.sh	Sun Dec 25 13:22:23 2016	(r429420)
@@ -1,6 +1,6 @@
---- 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
+--- examples/data/scripts/instance-select-wmii.sh.orig	2016-10-29 14:53:48.987875000 +0200
++++ examples/data/scripts/instance-select-wmii.sh	2016-10-29 14:54:09.084640000 +0200
+@@ -40,7 +40,7 @@
      ;;
  "prev")
      readonly current="$( wmiir read /client/sel/ctl | head -n 1 )"

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 Dec 25 13:16:00 2016	(r429419)
+++ head/www/uzbl/files/patch-examples__data__scripts__load_url_from_history.sh	Sun Dec 25 13:22:23 2016	(r429420)
@@ -1,11 +1,11 @@
---- 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 }' )"
+--- examples/data/scripts/load_url_from_history.sh.orig	2016-10-29 15:00:34.816505000 +0200
++++ examples/data/scripts/load_url_from_history.sh	2016-10-29 15:01:01.835001000 +0200
+@@ -17,7 +17,7 @@
+     # cut: get the first three fields, awk: pick the last field
+     # As opposed to just getting the third field directly, the combination of cut+awk allows
+     # to enter a completely new URL (which would be field number 1 or $NF, but not 3).
+-    goto="$( tac "$UZBL_HISTORY_FILE" | awk '!a[$3]++' | $DMENU | cut -d ' ' -f -3  | awk '{ print $NF }' )"
++    goto="$( tail -r "$UZBL_HISTORY_FILE" | awk '!a[$3]++' | $DMENU | cut -d ' ' -f -3  | awk '{ print $NF }' )"
  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/pkg-plist
==============================================================================
--- head/www/uzbl/pkg-plist	Sun Dec 25 13:16:00 2016	(r429419)
+++ head/www/uzbl/pkg-plist	Sun Dec 25 13:22:23 2016	(r429420)
@@ -1,3 +1,7 @@
+bin/uzbl-browser
+bin/uzbl-core
+bin/uzbl-event-manager
+bin/uzbl-tabbed
 %%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
@@ -9,6 +13,8 @@
 %%PYTHON_SITELIBDIR%%/uzbl/arguments.pyc
 %%PYTHON_SITELIBDIR%%/uzbl/core.py
 %%PYTHON_SITELIBDIR%%/uzbl/core.pyc
+%%PYTHON_SITELIBDIR%%/uzbl/daemon.py
+%%PYTHON_SITELIBDIR%%/uzbl/daemon.pyc
 %%PYTHON_SITELIBDIR%%/uzbl/event_manager.py
 %%PYTHON_SITELIBDIR%%/uzbl/event_manager.pyc
 %%PYTHON_SITELIBDIR%%/uzbl/ext.py
@@ -43,6 +49,9 @@
 %%PYTHON_SITELIBDIR%%/uzbl/plugins/progress_bar.pyc
 %%PYTHON_SITELIBDIR%%/uzbl/xdg.py
 %%PYTHON_SITELIBDIR%%/uzbl/xdg.pyc
+man/man1/uzbl-browser.1.gz
+man/man1/uzbl-core.1.gz
+man/man1/uzbl-event-manager.1.gz
 share/appdata/uzbl.appdata.xml
 share/applications/uzbl-core.desktop
 share/applications/uzbl-tabbed.desktop
@@ -50,19 +59,13 @@ 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/KEYBINDINGS.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
-bin/uzbl-tabbed

More information about the svn-ports-all mailing list