mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00
Code Issues Releases Activity

- Update to 3.2

Browse Source 
- Update maintainer mail adress

PR:		132601
Submitted by;	Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)
This commit is contained in:
Martin Wilke 2009-03-14 13:36:57 +00:00
parent b455a2f9b6
commit 2ffa6a5d62
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=230046
14 changed files with 64 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11-wm/awesome/Makefile
View File

@ -6,22 +6,22 @@
#
PORTNAME= awesome
PORTVERSION= 3.1.2
PORTREVISION= 1
PORTVERSION= 3.2
CATEGORIES= x11-wm
MASTER_SITES= http://awesome.naquadah.org/download/ \
http://redundancy.redundancy.org/mirror/
MAINTAINER= ntarmos@ceid.upatras.gr
MAINTAINER= ntarmos@cs.uoi.gr
COMMENT= A tiling window manager initially based on a dwm code rewriting
BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \
gperf>=3.0.3:${PORTSDIR}/devel/gperf \
pango>=1.19.3:${PORTSDIR}/x11-toolkits/pango \
xmlto:${PORTSDIR}/textproc/xmlto \
xcb-util>=0.3.3:${PORTSDIR}/x11/xcb-util \
xproto>=7.0.11:${PORTSDIR}/x11/xproto \
gperf>=3.0.3:${PORTSDIR}/devel/gperf \
cmake>=2.6.1_2:${PORTSDIR}/devel/cmake
xproto>=7.0.11:${PORTSDIR}/x11/xproto
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
dbus-1.3:${PORTSDIR}/devel/dbus \
ev.3:${PORTSDIR}/devel/libev \
freetype.9:${PORTSDIR}/print/freetype2 \
xcb.2:${PORTSDIR}/x11/libxcb \
@ -29,6 +29,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
USE_ICONV= yes
USE_CMAKE= yes
CMAKE_USE_PTHREAD=yes
CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc
USE_EFL= imlib2
USE_GNOME= glib20 pango

6
x11-wm/awesome/distinfo
View File

@ -1,3 +1,3 @@
MD5 (awesome-3.1.2.tar.gz) = 175c67f279e8d2da962dea99a0f30b3c
SHA256 (awesome-3.1.2.tar.gz) = 5a3396ba2962c5ae1f53d09f13dec42e69a36089b1abae922a54609980b06df9
SIZE (awesome-3.1.2.tar.gz) = 272089
MD5 (awesome-3.2.tar.gz) = 1f5c4b2b5c1594eb7f362bb73f266b31
SHA256 (awesome-3.2.tar.gz) = 34df6c9ab1ed09d1a37ff25e1f16b17231d92c495d0eb9fe681fe4a9ae93837f
SIZE (awesome-3.2.tar.gz) = 275745

23
x11-wm/awesome/files/patch-awesome.c
View File

@ -1,23 +0,0 @@
--- awesome.c.orig 2009-02-05 16:39:52.000000000 +0200
+++ awesome.c 2009-02-17 22:02:32.000000000 +0200
@@ -58,7 +58,7 @@
{
client_t *c;
xembed_window_t *em;
- int screen_nbr;
+ int screen_nbr, nscreens;
a_dbus_cleanup();
luaA_cs_cleanup();
@@ -71,8 +71,10 @@
}
/* do this only for real screen */
+ const xcb_setup_t *setup = xcb_get_setup(globalconf.connection);
+ nscreens = setup ? xcb_setup_roots_length(setup) : -1;
for(screen_nbr = 0;
- screen_nbr < xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
+ screen_nbr < nscreens;
screen_nbr++)
systray_cleanup(screen_nbr);

17
x11-wm/awesome/files/patch-awesomeConfig.cmake
View File

@ -11,23 +11,6 @@
link_directories(/usr/local/lib)
@@ -134,14 +135,14 @@
cairo
pango
pangocairo
- x11-xcb
+ xcb
xcb-randr
xcb-xinerama
xcb-event>=0.3.0
xcb-aux>=0.3.0
xcb-atom>=0.3.0
xcb-keysyms>=0.3.0
- xcb-icccm>=0.3.0
+ xcb-icccm>=0.3.3
cairo-xcb
xproto>=7.0.11
imlib2)
@@ -248,7 +249,7 @@
if(DEFINED AWESOME_MAN_PATH)
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")

32
x11-wm/awesome/files/patch-client.c
View File

@ -1,32 +0,0 @@
--- client.c.orig 2009-01-08 12:04:44.000000000 +0200
+++ client.c 2009-01-31 21:03:28.000000000 +0200
@@ -838,6 +838,11 @@ client_unmanage(client_t *c)
{
tag_array_t *tags = &globalconf.screens[c->screen].tags;
+ /* Reset transient_for attributes of widows that maybe refering to us */
+ for(client_t *tc = globalconf.clients; tc; tc = tc->next)
+ if(tc->transient_for == c)
+ tc->transient_for = NULL;
+
if(globalconf.screens[c->phys_screen].client_focus == c)
client_unfocus(c);
@@ -1455,7 +1455,7 @@
xcb_get_wm_class_unchecked(globalconf.connection, (*c)->win),
&hint, NULL))
return 0;
- lua_pushstring(L, hint.class);
+ lua_pushstring(L, hint.class_name);
xcb_get_wm_class_reply_wipe(&hint);
break;
case A_TK_INSTANCE:
@@ -1463,7 +1463,7 @@
xcb_get_wm_class_unchecked(globalconf.connection, (*c)->win),
&hint, NULL))
return 0;
- lua_pushstring(L, hint.name);
+ lua_pushstring(L, hint.instance_name);
xcb_get_wm_class_reply_wipe(&hint);
break;
case A_TK_ROLE:

11
x11-wm/awesome/files/patch-utils-awsetbg
View File

@ -1,11 +0,0 @@
--- utils/awsetbg.orig 2009-02-05 16:39:52.000000000 +0200
+++ utils/awsetbg 2009-02-17 22:02:54.000000000 +0200
@@ -117,7 +117,7 @@
}
find_it() {
- [ -n "$1" ] && hash $1 2> /dev/null
+ [ -n "$1" ] && which $1 1>/dev/null 2>&1
}
message() {

34
x11-wm/awesome/pkg-plist
View File

@ -19,10 +19,24 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/lib/awful/hooks.lua.in
%%DATADIR%%/lib/awful/init.lua
%%DATADIR%%/lib/awful/init.lua.in
%%DATADIR%%/lib/awful/layout.lua
%%DATADIR%%/lib/awful/layout.lua.in
%%DATADIR%%/lib/awful/layout/init.lua
%%DATADIR%%/lib/awful/layout/init.lua.in
%%DATADIR%%/lib/awful/layout/suit/fair.lua
%%DATADIR%%/lib/awful/layout/suit/fair.lua.in
%%DATADIR%%/lib/awful/layout/suit/floating.lua
%%DATADIR%%/lib/awful/layout/suit/floating.lua.in
%%DATADIR%%/lib/awful/layout/suit/init.lua
%%DATADIR%%/lib/awful/layout/suit/init.lua.in
%%DATADIR%%/lib/awful/layout/suit/magnifier.lua
%%DATADIR%%/lib/awful/layout/suit/magnifier.lua.in
%%DATADIR%%/lib/awful/layout/suit/max.lua
%%DATADIR%%/lib/awful/layout/suit/max.lua.in
%%DATADIR%%/lib/awful/layout/suit/tile.lua
%%DATADIR%%/lib/awful/layout/suit/tile.lua.in
%%DATADIR%%/lib/awful/menu.lua
%%DATADIR%%/lib/awful/menu.lua.in
%%DATADIR%%/lib/awful/mouse.lua
%%DATADIR%%/lib/awful/mouse.lua.in
%%DATADIR%%/lib/awful/placement.lua
%%DATADIR%%/lib/awful/placement.lua.in
%%DATADIR%%/lib/awful/prompt.lua
@ -43,13 +57,11 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/lib/invaders.lua.in
%%DATADIR%%/lib/naughty.lua
%%DATADIR%%/lib/naughty.lua.in
%%DATADIR%%/lib/revelation.lua
%%DATADIR%%/lib/revelation.lua.in
%%DATADIR%%/lib/tabulous.lua
%%DATADIR%%/lib/tabulous.lua.in
%%DATADIR%%/lib/telak.lua
%%DATADIR%%/lib/telak.lua.in
%%DATADIR%%/themes/default/background.png
%%DATADIR%%/themes/default/layouts/dwindle.png
%%DATADIR%%/themes/default/layouts/dwindlew.png
%%DATADIR%%/themes/default/layouts/fairh.png
%%DATADIR%%/themes/default/layouts/fairhw.png
%%DATADIR%%/themes/default/layouts/fairv.png
@ -60,8 +72,6 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/themes/default/layouts/magnifierw.png
%%DATADIR%%/themes/default/layouts/max.png
%%DATADIR%%/themes/default/layouts/maxw.png
%%DATADIR%%/themes/default/layouts/spiral.png
%%DATADIR%%/themes/default/layouts/spiralw.png
%%DATADIR%%/themes/default/layouts/tile.png
%%DATADIR%%/themes/default/layouts/tilebottom.png
%%DATADIR%%/themes/default/layouts/tilebottomw.png
@ -80,14 +90,12 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/themes/default/titlebar/close.png
%%DATADIR%%/themes/default/titlebar/closer.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
%%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
@ -95,8 +103,11 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/themes/sky/sky-background.png
%%DATADIR%%/themes/sky/theme
%%DATADIR%%/themes/sky/theme.in
share/xsessions/awesome.desktop
@dirrm %%DATADIR%%/icons/invaders
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/lib/awful/layout/suit
@dirrm %%DATADIR%%/lib/awful/layout
@dirrm %%DATADIR%%/lib/awful
@dirrm %%DATADIR%%/lib
@dirrm %%DATADIR%%/themes/default/layouts
@ -108,7 +119,6 @@ etc/xdg/awesome/rc.lua
@dirrm %%DATADIR%%/themes/sky
@dirrm %%DATADIR%%/themes
@dirrm %%DATADIR%%
share/xsessions/awesome.desktop
@dirrmtry share/xsessions
@dirrmtry etc/xdg/awesome
@dirrmtry etc/xdg
@dirrmtry share/xsessions

13
x11-wm/awesome2/Makefile
View File

@ -6,22 +6,22 @@
#
PORTNAME= awesome
PORTVERSION= 3.1.2
PORTREVISION= 1
PORTVERSION= 3.2
CATEGORIES= x11-wm
MASTER_SITES= http://awesome.naquadah.org/download/ \
http://redundancy.redundancy.org/mirror/
MAINTAINER= ntarmos@ceid.upatras.gr
MAINTAINER= ntarmos@cs.uoi.gr
COMMENT= A tiling window manager initially based on a dwm code rewriting
BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \
gperf>=3.0.3:${PORTSDIR}/devel/gperf \
pango>=1.19.3:${PORTSDIR}/x11-toolkits/pango \
xmlto:${PORTSDIR}/textproc/xmlto \
xcb-util>=0.3.3:${PORTSDIR}/x11/xcb-util \
xproto>=7.0.11:${PORTSDIR}/x11/xproto \
gperf>=3.0.3:${PORTSDIR}/devel/gperf \
cmake>=2.6.1_2:${PORTSDIR}/devel/cmake
xproto>=7.0.11:${PORTSDIR}/x11/xproto
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
dbus-1.3:${PORTSDIR}/devel/dbus \
ev.3:${PORTSDIR}/devel/libev \
freetype.9:${PORTSDIR}/print/freetype2 \
xcb.2:${PORTSDIR}/x11/libxcb \
@ -29,6 +29,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
USE_ICONV= yes
USE_CMAKE= yes
CMAKE_USE_PTHREAD=yes
CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc
USE_EFL= imlib2
USE_GNOME= glib20 pango

6
x11-wm/awesome2/distinfo
View File

@ -1,3 +1,3 @@
MD5 (awesome-3.1.2.tar.gz) = 175c67f279e8d2da962dea99a0f30b3c
SHA256 (awesome-3.1.2.tar.gz) = 5a3396ba2962c5ae1f53d09f13dec42e69a36089b1abae922a54609980b06df9
SIZE (awesome-3.1.2.tar.gz) = 272089
MD5 (awesome-3.2.tar.gz) = 1f5c4b2b5c1594eb7f362bb73f266b31
SHA256 (awesome-3.2.tar.gz) = 34df6c9ab1ed09d1a37ff25e1f16b17231d92c495d0eb9fe681fe4a9ae93837f
SIZE (awesome-3.2.tar.gz) = 275745

23
x11-wm/awesome2/files/patch-awesome.c
View File

@ -1,23 +0,0 @@
--- awesome.c.orig 2009-02-05 16:39:52.000000000 +0200
+++ awesome.c 2009-02-17 22:02:32.000000000 +0200
@@ -58,7 +58,7 @@
{
client_t *c;
xembed_window_t *em;
- int screen_nbr;
+ int screen_nbr, nscreens;
a_dbus_cleanup();
luaA_cs_cleanup();
@@ -71,8 +71,10 @@
}
/* do this only for real screen */
+ const xcb_setup_t *setup = xcb_get_setup(globalconf.connection);
+ nscreens = setup ? xcb_setup_roots_length(setup) : -1;
for(screen_nbr = 0;
- screen_nbr < xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
+ screen_nbr < nscreens;
screen_nbr++)
systray_cleanup(screen_nbr);

17
x11-wm/awesome2/files/patch-awesomeConfig.cmake
View File

@ -11,23 +11,6 @@
link_directories(/usr/local/lib)
@@ -134,14 +135,14 @@
cairo
pango
pangocairo
- x11-xcb
+ xcb
xcb-randr
xcb-xinerama
xcb-event>=0.3.0
xcb-aux>=0.3.0
xcb-atom>=0.3.0
xcb-keysyms>=0.3.0
- xcb-icccm>=0.3.0
+ xcb-icccm>=0.3.3
cairo-xcb
xproto>=7.0.11
imlib2)
@@ -248,7 +249,7 @@
if(DEFINED AWESOME_MAN_PATH)
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")

32
x11-wm/awesome2/files/patch-client.c
View File

@ -1,32 +0,0 @@
--- client.c.orig 2009-01-08 12:04:44.000000000 +0200
+++ client.c 2009-01-31 21:03:28.000000000 +0200
@@ -838,6 +838,11 @@ client_unmanage(client_t *c)
{
tag_array_t *tags = &globalconf.screens[c->screen].tags;
+ /* Reset transient_for attributes of widows that maybe refering to us */
+ for(client_t *tc = globalconf.clients; tc; tc = tc->next)
+ if(tc->transient_for == c)
+ tc->transient_for = NULL;
+
if(globalconf.screens[c->phys_screen].client_focus == c)
client_unfocus(c);
@@ -1455,7 +1455,7 @@
xcb_get_wm_class_unchecked(globalconf.connection, (*c)->win),
&hint, NULL))
return 0;
- lua_pushstring(L, hint.class);
+ lua_pushstring(L, hint.class_name);
xcb_get_wm_class_reply_wipe(&hint);
break;
case A_TK_INSTANCE:
@@ -1463,7 +1463,7 @@
xcb_get_wm_class_unchecked(globalconf.connection, (*c)->win),
&hint, NULL))
return 0;
- lua_pushstring(L, hint.name);
+ lua_pushstring(L, hint.instance_name);
xcb_get_wm_class_reply_wipe(&hint);
break;
case A_TK_ROLE:

11
x11-wm/awesome2/files/patch-utils-awsetbg
View File

@ -1,11 +0,0 @@
--- utils/awsetbg.orig 2009-02-05 16:39:52.000000000 +0200
+++ utils/awsetbg 2009-02-17 22:02:54.000000000 +0200
@@ -117,7 +117,7 @@
}
find_it() {
- [ -n "$1" ] && hash $1 2> /dev/null
+ [ -n "$1" ] && which $1 1>/dev/null 2>&1
}
message() {

34
x11-wm/awesome2/pkg-plist
View File

@ -19,10 +19,24 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/lib/awful/hooks.lua.in
%%DATADIR%%/lib/awful/init.lua
%%DATADIR%%/lib/awful/init.lua.in
%%DATADIR%%/lib/awful/layout.lua
%%DATADIR%%/lib/awful/layout.lua.in
%%DATADIR%%/lib/awful/layout/init.lua
%%DATADIR%%/lib/awful/layout/init.lua.in
%%DATADIR%%/lib/awful/layout/suit/fair.lua
%%DATADIR%%/lib/awful/layout/suit/fair.lua.in
%%DATADIR%%/lib/awful/layout/suit/floating.lua
%%DATADIR%%/lib/awful/layout/suit/floating.lua.in
%%DATADIR%%/lib/awful/layout/suit/init.lua
%%DATADIR%%/lib/awful/layout/suit/init.lua.in
%%DATADIR%%/lib/awful/layout/suit/magnifier.lua
%%DATADIR%%/lib/awful/layout/suit/magnifier.lua.in
%%DATADIR%%/lib/awful/layout/suit/max.lua
%%DATADIR%%/lib/awful/layout/suit/max.lua.in
%%DATADIR%%/lib/awful/layout/suit/tile.lua
%%DATADIR%%/lib/awful/layout/suit/tile.lua.in
%%DATADIR%%/lib/awful/menu.lua
%%DATADIR%%/lib/awful/menu.lua.in
%%DATADIR%%/lib/awful/mouse.lua
%%DATADIR%%/lib/awful/mouse.lua.in
%%DATADIR%%/lib/awful/placement.lua
%%DATADIR%%/lib/awful/placement.lua.in
%%DATADIR%%/lib/awful/prompt.lua
@ -43,13 +57,11 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/lib/invaders.lua.in
%%DATADIR%%/lib/naughty.lua
%%DATADIR%%/lib/naughty.lua.in
%%DATADIR%%/lib/revelation.lua
%%DATADIR%%/lib/revelation.lua.in
%%DATADIR%%/lib/tabulous.lua
%%DATADIR%%/lib/tabulous.lua.in
%%DATADIR%%/lib/telak.lua
%%DATADIR%%/lib/telak.lua.in
%%DATADIR%%/themes/default/background.png
%%DATADIR%%/themes/default/layouts/dwindle.png
%%DATADIR%%/themes/default/layouts/dwindlew.png
%%DATADIR%%/themes/default/layouts/fairh.png
%%DATADIR%%/themes/default/layouts/fairhw.png
%%DATADIR%%/themes/default/layouts/fairv.png
@ -60,8 +72,6 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/themes/default/layouts/magnifierw.png
%%DATADIR%%/themes/default/layouts/max.png
%%DATADIR%%/themes/default/layouts/maxw.png
%%DATADIR%%/themes/default/layouts/spiral.png
%%DATADIR%%/themes/default/layouts/spiralw.png
%%DATADIR%%/themes/default/layouts/tile.png
%%DATADIR%%/themes/default/layouts/tilebottom.png
%%DATADIR%%/themes/default/layouts/tilebottomw.png
@ -80,14 +90,12 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/themes/default/titlebar/close.png
%%DATADIR%%/themes/default/titlebar/closer.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
%%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
@ -95,8 +103,11 @@ etc/xdg/awesome/rc.lua
%%DATADIR%%/themes/sky/sky-background.png
%%DATADIR%%/themes/sky/theme
%%DATADIR%%/themes/sky/theme.in
share/xsessions/awesome.desktop
@dirrm %%DATADIR%%/icons/invaders
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/lib/awful/layout/suit
@dirrm %%DATADIR%%/lib/awful/layout
@dirrm %%DATADIR%%/lib/awful
@dirrm %%DATADIR%%/lib
@dirrm %%DATADIR%%/themes/default/layouts
@ -108,7 +119,6 @@ etc/xdg/awesome/rc.lua
@dirrm %%DATADIR%%/themes/sky
@dirrm %%DATADIR%%/themes
@dirrm %%DATADIR%%
share/xsessions/awesome.desktop
@dirrmtry share/xsessions
@dirrmtry etc/xdg/awesome
@dirrmtry etc/xdg
@dirrmtry share/xsessions