Update x11-wm/awesome to 3.5.8

4 files changed, 32 insertions, 32 deletions

diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 6080d3819d5..a06a596ab43 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	awesome
-PORTVERSION=	3.5.6
+PORTVERSION=	3.5.8
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
@@ -12,25 +12,25 @@ COMMENT=	Highly configurable, next generation framework window manager
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		pango>=1.19.3:${PORTSDIR}/x11-toolkits/pango \
-		xmlto:${PORTSDIR}/textproc/xmlto \
-		xcb-util>=0.3.8:${PORTSDIR}/x11/xcb-util \
-		xproto>=7.0.11:${PORTSDIR}/x11/xproto \
-		${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:${PORTSDIR}/devel/lua-lgi \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
-RUN_DEPENDS=	${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:${PORTSDIR}/devel/lua-lgi
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libev.so:${PORTSDIR}/devel/libev \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libxdg-basedir.so:${PORTSDIR}/x11/libxdg-basedir \
-		libxcb-util.so:${PORTSDIR}/x11/xcb-util \
-		libxcb-cursor.so:${PORTSDIR}/x11/xcb-util-cursor \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+		convert:graphics/ImageMagick \
+		pango>=1.19.3:x11-toolkits/pango \
+		xmlto:textproc/xmlto \
+		xcb-util>=0.3.8:x11/xcb-util \
+		xproto>=7.0.11:x11/xproto \
+		${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi \
+		docbook-xml>0:textproc/docbook-xml
+RUN_DEPENDS=	${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libev.so:devel/libev \
+		libfreetype.so:print/freetype2 \
+		libstartup-notification-1.so:x11/startup-notification \
+		libxdg-basedir.so:x11/libxdg-basedir \
+		libxcb-util.so:x11/xcb-util \
+		libxcb-cursor.so:x11/xcb-util-cursor \
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-icccm.so:x11/xcb-util-wm \
+		libImlib2.so:graphics/imlib2
 
 USES=		cmake execinfo iconv pkgconfig lua tar:xz
 CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc
@@ -44,7 +44,7 @@ PORTDOCS=	AUTHORS BUGS LICENSE README
 OPTIONS_DEFINE=	DBUS DOCS
 OPTIONS_DEFAULT=DBUS DOCS
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_ON=		-DWITH_DBUS=YES
 DBUS_CMAKE_OFF=		-DWITH_DBUS=NO
 
diff --git a/x11-wm/awesome/distinfo b/x11-wm/awesome/distinfo
index ae6f907fbf5..030604b265f 100644
--- a/x11-wm/awesome/distinfo
+++ b/x11-wm/awesome/distinfo
@@ -1,2 +1,2 @@
-SHA256 (awesome-3.5.6.tar.xz) = 37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7
-SIZE (awesome-3.5.6.tar.xz) = 720112
+SHA256 (awesome-3.5.8.tar.xz) = 7c30c96c57bd72cfed630bbccc344054fe44b37c0a79bdd98075c507af672ec6
+SIZE (awesome-3.5.8.tar.xz) = 723000
diff --git a/x11-wm/awesome/files/patch-CMakeLists.txt b/x11-wm/awesome/files/patch-CMakeLists.txt
index 2e1893377eb..6ec11bb8e31 100644
--- a/x11-wm/awesome/files/patch-CMakeLists.txt
+++ b/x11-wm/awesome/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2012-12-21 21:18:18.000000000 -0200
-+++ CMakeLists.txt	2013-03-11 08:20:10.000000000 -0300
-@@ -95,7 +95,7 @@
+--- CMakeLists.txt.orig	2016-01-15 15:51:19 UTC
++++ CMakeLists.txt
+@@ -95,7 +95,7 @@ add_executable(${PROJECT_AWE_NAME}
  if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
      set_target_properties(${PROJECT_AWE_NAME}
          PROPERTIES
@@ -9,7 +9,7 @@
  endif()
  
  target_link_libraries(${PROJECT_AWE_NAME}
-@@ -317,7 +317,9 @@
+@@ -317,7 +317,9 @@ install(DIRECTORY ${BUILD_DIR}/themes DE
      PATTERN "*.in" EXCLUDE)
  install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}
      PATTERN "*.in" EXCLUDE)
diff --git a/x11-wm/awesome/files/patch-awesomeConfig.cmake b/x11-wm/awesome/files/patch-awesomeConfig.cmake
index b4585fa72d2..ab349a453ef 100644
--- a/x11-wm/awesome/files/patch-awesomeConfig.cmake
+++ b/x11-wm/awesome/files/patch-awesomeConfig.cmake
@@ -1,6 +1,6 @@
---- awesomeConfig.cmake.orig	2012-12-21 21:18:18.000000000 -0200
-+++ awesomeConfig.cmake	2013-03-08 11:46:07.000000000 -0300
-@@ -14,6 +14,7 @@
+--- awesomeConfig.cmake.orig	2016-01-15 15:51:19 UTC
++++ awesomeConfig.cmake
+@@ -14,6 +14,7 @@ option(WITH_DBUS "build with D-BUS" ON)
  option(GENERATE_MANPAGES "generate manpages" ON)
  option(COMPRESS_MANPAGES "compress manpages" ON)
  option(GENERATE_DOC "generate API documentation" ON)
@@ -8,7 +8,7 @@
  
  # {{{ CFLAGS
  add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra
-@@ -58,7 +59,7 @@
+@@ -61,7 +62,7 @@ endif()
  # theme graphics
  a_find_program(CONVERT_EXECUTABLE convert TRUE)
  # doxygen
@@ -17,7 +17,7 @@
  # pkg-config
  include(FindPkgConfig)
  # lua 5.1
-@@ -256,7 +257,7 @@
+@@ -264,7 +265,7 @@ endif()
  if(DEFINED AWESOME_MAN_PATH)
     set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
  else()