[Midnightbsd-cvs] mports [19804] trunk/x11-wm/awesome: awesome 3.5.6
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 18 21:10:14 EDT 2015
Revision: 19804
http://svnweb.midnightbsd.org/mports/?rev=19804
Author: laffer1
Date: 2015-08-18 21:10:13 -0400 (Tue, 18 Aug 2015)
Log Message:
-----------
awesome 3.5.6
Modified Paths:
--------------
trunk/x11-wm/awesome/Makefile
trunk/x11-wm/awesome/distinfo
trunk/x11-wm/awesome/files/patch-CMakeLists.txt
trunk/x11-wm/awesome/files/patch-awesomeConfig.cmake
trunk/x11-wm/awesome/pkg-descr
trunk/x11-wm/awesome/pkg-plist
Modified: trunk/x11-wm/awesome/Makefile
===================================================================
--- trunk/x11-wm/awesome/Makefile 2015-08-19 01:09:28 UTC (rev 19803)
+++ trunk/x11-wm/awesome/Makefile 2015-08-19 01:10:13 UTC (rev 19804)
@@ -1,53 +1,54 @@
+# Created by: Nikos Ntarmos <ntarmos at ceid.upatras.gr>
# $MidnightBSD$
+# $FreeBSD: head/x11-wm/awesome/Makefile 377770 2015-01-23 22:50:49Z antoine $
PORTNAME= awesome
-PORTVERSION= 3.4.11
+PORTVERSION= 3.5.6
+PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= http://awesome.naquadah.org/download/
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A highly configurable, next generation framework window manager
+COMMENT= Highly configurable, next generation framework window manager
+
LICENSE= gpl2
BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \
convert:${PORTSDIR}/graphics/ImageMagick \
- gperf>=3.0.3:${PORTSDIR}/devel/gperf \
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 \
- ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-450
-LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
- ev.4:${PORTSDIR}/devel/libev \
- freetype.9:${PORTSDIR}/print/freetype2 \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
- xdg-basedir.2:${PORTSDIR}/x11/libxdg-basedir \
- xcb.2:${PORTSDIR}/x11/libxcb \
- xcb-util.0:${PORTSDIR}/x11/xcb-util \
- xcb-image.0:${PORTSDIR}/x11/xcb-util-image \
- xcb-keysyms.1:${PORTSDIR}/x11/xcb-util-keysyms \
- xcb-icccm.4:${PORTSDIR}/x11/xcb-util-wm \
- execinfo.1:${PORTSDIR}/devel/libexecinfo
+ ${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
-USE_BZIP2= yes
-USE_ICONV= yes
-USE_CMAKE= yes
+USES= cmake execinfo iconv pkgconfig lua tar:xz
CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc
-USE_EFL= imlib2
-USE_GNOME= glib20 pango
-USE_LUA= 5.1
-USE_XORG= pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
+USE_GNOME= glib20 pango gdkpixbuf2
+USE_XORG= pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
+ xproto
+LDFLAGS+= ${ICONV_LIB}
-MAN1= awesome.1 \
- awesome-client.1 \
- awsetbg.1
-MAN5= awesomerc.5
-MANLANG= "" de es fr
-MANCOMPRESSED= yes
PORTDOCS= AUTHORS BUGS LICENSE README
-OPTIONS+= DBUS "Enable D-BUS support" On
+OPTIONS_DEFINE= DBUS DOCS
+OPTIONS_DEFAULT=DBUS DOCS
+DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_CMAKE_ON= -DWITH_DBUS=YES
+DBUS_CMAKE_OFF= -DWITH_DBUS=NO
+
.include <bsd.port.pre.mk>
.if (exists(${LOCALBASE}/libdata/pkgconfig/cairo.pc) && \
@@ -55,28 +56,13 @@
IGNORE= cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support
.endif
-.ifdef(WITH_DBUS)
-LIB_DEPENDS += dbus-1.3:${PORTSDIR}/devel/dbus
-CMAKE_ARGS += -DWITH_DBUS=YES
-.else
-CMAKE_ARGS += -DWITH_DBUS=NO
-.endif
-
-pre-configure:
- @${REINPLACE_CMD} \
- -e 's/"generate luadoc" ON/\"generate luadoc" OFF/g' \
+post-patch:
+ @${REINPLACE_CMD} -e "/LUA_EXECUTABLE lua/ s,lua,lua${LUA_VER_STR}," \
+ -e '/Lua51/d' \
+ -e 's/glib-2.0/lua-${LUA_VER} glib-2.0/g' \
+ -e '/LUA51_FOUND/,+2d' \
${WRKSRC}/awesomeConfig.cmake
- @${REINPLACE_CMD} \
- -e 's,tr ,env LC_ALL="C" ${TR} ,g' \
- -e 's,gperf,${LOCALBASE}/bin/gperf,g' \
- ${WRKSRC}/build-utils/gperf.sh
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} \
- -e 's/"install port docs" ON/\"install port docs" OFF/g' \
- ${WRKSRC}/awesomeConfig.cmake
-.endif
+ @${REINPLACE_CMD} -e "s,^lua ,${LUA_CMD} ," \
+ ${WRKSRC}/build-utils/lgi-check.sh
-post-patch:
- @${RM} -f ${WRKSRC}/lib/awful/placement.lua.in.orig
-
.include <bsd.port.post.mk>
Modified: trunk/x11-wm/awesome/distinfo
===================================================================
--- trunk/x11-wm/awesome/distinfo 2015-08-19 01:09:28 UTC (rev 19803)
+++ trunk/x11-wm/awesome/distinfo 2015-08-19 01:10:13 UTC (rev 19804)
@@ -1,3 +1,2 @@
-SHA256 (awesome-3.4.11.tar.bz2) = 83fc42d4ea71914d1b456023ce53b546e22e8ccc11a73c4a39a1152d2f30b628
-RMD160 (awesome-3.4.11.tar.bz2) = 1ceafb96ebe4e5b04c09dee5d6a69266516203b4
-SIZE (awesome-3.4.11.tar.bz2) = 758495
+SHA256 (awesome-3.5.6.tar.xz) = 37f49de187825425cb3096fc870959d5fec9302b22ffd0f2874d8a18e85046d7
+SIZE (awesome-3.5.6.tar.xz) = 720112
Modified: trunk/x11-wm/awesome/files/patch-CMakeLists.txt
===================================================================
--- trunk/x11-wm/awesome/files/patch-CMakeLists.txt 2015-08-19 01:09:28 UTC (rev 19803)
+++ trunk/x11-wm/awesome/files/patch-CMakeLists.txt 2015-08-19 01:10:13 UTC (rev 19804)
@@ -1,6 +1,15 @@
---- CMakeLists.txt.orig 2011-01-17 19:38:13.000000000 +0800
-+++ CMakeLists.txt 2011-03-01 19:52:50.000000000 +0800
-@@ -343,7 +344,9 @@
+--- 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 @@
+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ set_target_properties(${PROJECT_AWE_NAME}
+ PROPERTIES
+- LINK_FLAGS -export-dynamic)
++ LINK_FLAGS -Wl,--export-dynamic)
+ endif()
+
+ target_link_libraries(${PROJECT_AWE_NAME}
+@@ -317,7 +317,9 @@
PATTERN "*.in" EXCLUDE)
install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}
PATTERN "*.in" EXCLUDE)
@@ -9,5 +18,5 @@
+ install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
+endif()
install(FILES "awesome.desktop" DESTINATION ${AWESOME_XSESSION_PATH})
- if(GENERATE_LUADOC)
- install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH})
+ if(GENERATE_DOC)
+ install(DIRECTORY ${BUILD_DIR}/doc DESTINATION ${AWESOME_DOC_PATH})
Modified: trunk/x11-wm/awesome/files/patch-awesomeConfig.cmake
===================================================================
--- trunk/x11-wm/awesome/files/patch-awesomeConfig.cmake 2015-08-19 01:09:28 UTC (rev 19803)
+++ trunk/x11-wm/awesome/files/patch-awesomeConfig.cmake 2015-08-19 01:10:13 UTC (rev 19804)
@@ -1,16 +1,14 @@
---- awesomeConfig.cmake.orig 2010-01-04 06:50:02.000000000 -0200
-+++ awesomeConfig.cmake 2010-01-04 08:06:18.000000000 -0200
-@@ -13,7 +13,8 @@
- option(WITH_DBUS "build with D-BUS" ON)
+--- 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 @@
option(GENERATE_MANPAGES "generate manpages" ON)
option(COMPRESS_MANPAGES "compress manpages" ON)
--option(GENERATE_LUADOC "generate luadoc" ON)
-+option(GENERATE_LUADOC "generate luadoc" OFF)
+ option(GENERATE_DOC "generate API documentation" ON)
+option(INSTALL_PORTDOCS "install port docs" ON)
- link_directories(/usr/local/lib)
-
-@@ -61,7 +62,7 @@
+ # {{{ CFLAGS
+ add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra
+@@ -58,7 +59,7 @@
# theme graphics
a_find_program(CONVERT_EXECUTABLE convert TRUE)
# doxygen
@@ -19,29 +17,12 @@
# pkg-config
include(FindPkgConfig)
# lua 5.1
-@@ -167,6 +168,8 @@
-
- # Check for libev
- a_find_library(LIB_EV ev)
-+# Check for libexecinfo on non Glibc system
-+a_find_library(LIB_EXECINFO execinfo)
-
- # Error check
- if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
-@@ -177,6 +180,7 @@
- ${AWESOME_COMMON_REQUIRED_LDFLAGS}
- ${AWESOME_REQUIRED_LIBRARIES}
- ${LIB_EV}
-+ ${LIB_EXECINFO}
- ${LUA_LIBRARIES})
-
- set(AWESOME_REQUIRED_INCLUDE_DIRS
-@@ -245,7 +249,7 @@
+@@ -256,7 +257,7 @@
if(DEFINED AWESOME_MAN_PATH)
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
else()
-- set(AWESOME_MAN_PATH ${PREFIX}/share/man CACHE PATH "awesome manpage directory")
-+ set(AWESOME_MAN_PATH ${PREFIX}/man CACHE PATH "awesome manpage directory")
+- set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "awesome manpage directory")
++ set(AWESOME_MAN_PATH ${CMAKE_INSTALL_PREFIX}/man CACHE PATH "awesome manpage directory")
endif()
# Hide to avoid confusion
Modified: trunk/x11-wm/awesome/pkg-descr
===================================================================
--- trunk/x11-wm/awesome/pkg-descr 2015-08-19 01:09:28 UTC (rev 19803)
+++ trunk/x11-wm/awesome/pkg-descr 2015-08-19 01:10:13 UTC (rev 19804)
@@ -6,4 +6,5 @@
dealing with every day computing tasks and who want to have fine-grained
control on theirs graphical environment.
+
WWW: http://awesome.naquadah.org/
Modified: trunk/x11-wm/awesome/pkg-plist
===================================================================
--- trunk/x11-wm/awesome/pkg-plist 2015-08-19 01:09:28 UTC (rev 19803)
+++ trunk/x11-wm/awesome/pkg-plist 2015-08-19 01:10:13 UTC (rev 19804)
@@ -1,8 +1,24 @@
- at comment $FreeBSD: ports/x11-wm/awesome/pkg-plist,v 1.9 2010/05/20 18:11:13 garga Exp $
bin/awesome
bin/awesome-client
-bin/awsetbg
etc/xdg/awesome/rc.lua
+man/de/man1/awesome-client.1.gz
+man/de/man1/awesome.1.gz
+man/de/man5/awesomerc.5.gz
+man/es/man1/awesome-client.1.gz
+man/es/man1/awesome.1.gz
+man/es/man5/awesomerc.5.gz
+man/fr/man1/awesome-client.1.gz
+man/fr/man1/awesome.1.gz
+man/fr/man5/awesomerc.5.gz
+man/it/man1/awesome-client.1.gz
+man/it/man1/awesome.1.gz
+man/it/man5/awesomerc.5.gz
+man/man1/awesome-client.1.gz
+man/man1/awesome.1.gz
+man/man5/awesomerc.5.gz
+man/ru/man1/awesome-client.1.gz
+man/ru/man1/awesome.1.gz
+man/ru/man5/awesomerc.5.gz
%%DATADIR%%/icons/awesome16.png
%%DATADIR%%/icons/awesome32.png
%%DATADIR%%/icons/awesome48.png
@@ -12,9 +28,10 @@
%%DATADIR%%/lib/awful/client.lua
%%DATADIR%%/lib/awful/completion.lua
%%DATADIR%%/lib/awful/dbus.lua
-%%DATADIR%%/lib/awful/hooks.lua
+%%DATADIR%%/lib/awful/ewmh.lua
%%DATADIR%%/lib/awful/init.lua
%%DATADIR%%/lib/awful/key.lua
+%%DATADIR%%/lib/awful/keygrabber.lua
%%DATADIR%%/lib/awful/layout/init.lua
%%DATADIR%%/lib/awful/layout/suit/fair.lua
%%DATADIR%%/lib/awful/layout/suit/floating.lua
@@ -42,10 +59,6 @@
%%DATADIR%%/lib/awful/widget/graph.lua
%%DATADIR%%/lib/awful/widget/init.lua
%%DATADIR%%/lib/awful/widget/launcher.lua
-%%DATADIR%%/lib/awful/widget/layout/default.lua
-%%DATADIR%%/lib/awful/widget/layout/horizontal.lua
-%%DATADIR%%/lib/awful/widget/layout/init.lua
-%%DATADIR%%/lib/awful/widget/layout/vertical.lua
%%DATADIR%%/lib/awful/widget/layoutbox.lua
%%DATADIR%%/lib/awful/widget/progressbar.lua
%%DATADIR%%/lib/awful/widget/prompt.lua
@@ -53,7 +66,34 @@
%%DATADIR%%/lib/awful/widget/tasklist.lua
%%DATADIR%%/lib/awful/widget/textclock.lua
%%DATADIR%%/lib/beautiful.lua
+%%DATADIR%%/lib/gears/color.lua
+%%DATADIR%%/lib/gears/debug.lua
+%%DATADIR%%/lib/gears/init.lua
+%%DATADIR%%/lib/gears/object.lua
+%%DATADIR%%/lib/gears/sort.lua
+%%DATADIR%%/lib/gears/surface.lua
+%%DATADIR%%/lib/gears/wallpaper.lua
+%%DATADIR%%/lib/menubar/init.lua
+%%DATADIR%%/lib/menubar/menu_gen.lua
+%%DATADIR%%/lib/menubar/utils.lua
%%DATADIR%%/lib/naughty.lua
+%%DATADIR%%/lib/wibox/drawable.lua
+%%DATADIR%%/lib/wibox/init.lua
+%%DATADIR%%/lib/wibox/layout/align.lua
+%%DATADIR%%/lib/wibox/layout/base.lua
+%%DATADIR%%/lib/wibox/layout/constraint.lua
+%%DATADIR%%/lib/wibox/layout/fixed.lua
+%%DATADIR%%/lib/wibox/layout/flex.lua
+%%DATADIR%%/lib/wibox/layout/init.lua
+%%DATADIR%%/lib/wibox/layout/margin.lua
+%%DATADIR%%/lib/wibox/layout/mirror.lua
+%%DATADIR%%/lib/wibox/layout/rotate.lua
+%%DATADIR%%/lib/wibox/widget/background.lua
+%%DATADIR%%/lib/wibox/widget/base.lua
+%%DATADIR%%/lib/wibox/widget/imagebox.lua
+%%DATADIR%%/lib/wibox/widget/init.lua
+%%DATADIR%%/lib/wibox/widget/systray.lua
+%%DATADIR%%/lib/wibox/widget/textbox.lua
%%DATADIR%%/themes/default/README
%%DATADIR%%/themes/default/background.png
%%DATADIR%%/themes/default/background_white.png
@@ -84,8 +124,6 @@
%%DATADIR%%/themes/default/submenu.png
%%DATADIR%%/themes/default/taglist/squarefw.png
%%DATADIR%%/themes/default/taglist/squarew.png
-%%DATADIR%%/themes/default/tasklist/floating.png
-%%DATADIR%%/themes/default/tasklist/floatingw.png
%%DATADIR%%/themes/default/theme.lua
%%DATADIR%%/themes/default/titlebar/close_focus.png
%%DATADIR%%/themes/default/titlebar/close_normal.png
@@ -106,6 +144,7 @@
%%DATADIR%%/themes/default/titlebar/sticky_normal_active.png
%%DATADIR%%/themes/default/titlebar/sticky_normal_inactive.png
%%DATADIR%%/themes/sky/awesome-icon.png
+%%DATADIR%%/themes/sky/layouts/dwindle.png
%%DATADIR%%/themes/sky/layouts/fairh.png
%%DATADIR%%/themes/sky/layouts/fairv.png
%%DATADIR%%/themes/sky/layouts/floating.png
@@ -112,6 +151,7 @@
%%DATADIR%%/themes/sky/layouts/fullscreen.png
%%DATADIR%%/themes/sky/layouts/magnifier.png
%%DATADIR%%/themes/sky/layouts/max.png
+%%DATADIR%%/themes/sky/layouts/spiral.png
%%DATADIR%%/themes/sky/layouts/tile.png
%%DATADIR%%/themes/sky/layouts/tilebottom.png
%%DATADIR%%/themes/sky/layouts/tileleft.png
@@ -154,36 +194,3 @@
%%DATADIR%%/themes/zenburn/titlebar/sticky_normal_inactive.png
%%DATADIR%%/themes/zenburn/zenburn-background.png
share/xsessions/awesome.desktop
- at dirrm %%DATADIR%%/icons
- at dirrm %%DATADIR%%/lib/awful/layout/suit
- at dirrm %%DATADIR%%/lib/awful/layout
- at dirrm %%DATADIR%%/lib/awful/mouse
- at dirrm %%DATADIR%%/lib/awful/widget/layout
- at dirrm %%DATADIR%%/lib/awful/widget
- at dirrm %%DATADIR%%/lib/awful
- at dirrm %%DATADIR%%/lib
- at dirrm %%DATADIR%%/themes/default/layouts
- at dirrm %%DATADIR%%/themes/default/taglist
- at dirrm %%DATADIR%%/themes/default/tasklist
- at dirrm %%DATADIR%%/themes/default/titlebar
- at dirrm %%DATADIR%%/themes/default
- at dirrm %%DATADIR%%/themes/sky/layouts
- at dirrm %%DATADIR%%/themes/sky
- at dirrm %%DATADIR%%/themes/zenburn/titlebar
- at dirrm %%DATADIR%%/themes/zenburn/taglist
- at dirrm %%DATADIR%%/themes/zenburn/layouts
- at dirrm %%DATADIR%%/themes/zenburn
- at dirrm %%DATADIR%%/themes
- at dirrm %%DATADIR%%
- at dirrmtry etc/xdg/awesome
- at dirrmtry etc/xdg
- at dirrmtry man/de/man1
- at dirrmtry man/de/man5
- at dirrmtry man/de
- at dirrmtry man/es/man1
- at dirrmtry man/es/man5
- at dirrmtry man/es
- at dirrmtry man/fr/man1
- at dirrmtry man/fr/man5
- at dirrmtry man/fr
- at dirrmtry share/xsessions
More information about the Midnightbsd-cvs
mailing list