View | Details | Raw Unified | Return to bug 131229 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-37 / +34 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	awesome
8
PORTNAME=	awesome
9
PORTVERSION=	2.3.4
9
PORTVERSION=	3.1.1
10
CATEGORIES=	x11-wm
10
CATEGORIES=	x11-wm
11
MASTER_SITES=	http://awesome.naquadah.org/download/
11
MASTER_SITES=	http://awesome.naquadah.org/download/
12
12
Lines 14-62 MAINTAINER= ntarmos@ceid.upatras.gr Link Here
14
COMMENT=	A tiling window manager initially based on a dwm code rewriting
14
COMMENT=	A tiling window manager initially based on a dwm code rewriting
15
15
16
BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
16
BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
17
		xmlto:${PORTSDIR}/textproc/xmlto
17
		xmlto:${PORTSDIR}/textproc/xmlto \
18
LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
18
		xcb-util>=0.3.3:${PORTSDIR}/x11/xcb-util \
19
		cairo.2:${PORTSDIR}/graphics/cairo \
19
		xproto>=7.0.11:${PORTSDIR}/x11/xproto \
20
		freetype.9:${PORTSDIR}/print/freetype2
20
		gperf>=3.0.3:${PORTSDIR}/devel/gperf
21
LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
22
		ev.3:${PORTSDIR}/devel/libev \
23
		freetype.9:${PORTSDIR}/print/freetype2 \
24
		xcb.2:${PORTSDIR}/x11/libxcb \
25
		xcb-event.1:${PORTSDIR}/x11/xcb-util
21
26
22
USE_ICONV=	yes
27
USE_ICONV=	yes
23
GNU_CONFIGURE=	yes
28
USE_CMAKE=	yes
29
CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc
24
USE_EFL=	imlib2
30
USE_EFL=	imlib2
25
USE_GNOME=	pango
31
USE_GNOME=	glib20 pango
26
USE_XORG=	x11 xft xext xinerama xt xrandr xproto
32
USE_LUA=	5.1+
33
USE_XORG=	pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto
27
34
28
MAN1=		awesome.1 \
35
MAN1=		awesome.1 \
29
		awesome-client.1 \
36
		awesome-client.1 \
30
		awesome-menu.1 \
37
		awsetbg.1
31
		awesome-message.1
32
MAN5=		awesomerc.5
38
MAN5=		awesomerc.5
33
PORTDOCS=	AUTHORS LICENSE README STYLE UPGRADE
39
MANCOMPRESSED=	yes
34
PORTEXAMPLES=	awesomerc
40
PORTDOCS=	AUTHORS BUGS LICENSE README
35
41
36
post-patch:
42
.include <bsd.port.pre.mk>
37
	@${REINPLACE_CMD} -e 's, "$$(DESTDIR)$$(docdir)";,;,g' \
43
38
			  -e 's,\([[:space:]]\)install-docDATA ,\1,g' \
44
.if	(exists(${LOCALBASE}/libdata/pkgconfig/cairo.pc) && \
39
		${WRKSRC}/Makefile.in
45
	!exists(${LOCALBASE}/libdata/pkgconfig/cairo-xcb.pc))
40
46
IGNORE= cannot find dependency: The cairo exists but not with XCB support. Please reinstall graphics/cairo with XCB support
41
post-configure:
42
	@${REINPLACE_CMD} -E '/^awesome_(message_)?LDADD/s/$$/ -liconv/g; \
43
			      /^doc_DATA/s/=.*$$/=/g' \
44
		${WRKSRC}/Makefile
45
46
post-install:
47
.if !defined(NOPORTDOCS)
48
	@${ECHO_MSG} "installing additional documentation to ${DOCSDIR}"
49
	@${MKDIR} ${DOCSDIR}
50
. for doc in ${PORTDOCS}
51
	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
52
. endfor
53
.endif
47
.endif
54
.if !defined(NOPORTEXAMPLES)
48
55
	@${ECHO_MSG} "installing example config file to ${EXAMPLESDIR}"
49
pre-configure:
56
	@${MKDIR} ${EXAMPLESDIR}
50
	@${REINPLACE_CMD} \
57
. for example in ${PORTEXAMPLES}
51
	-e 's/"generate luadoc" ON/\"generate luadoc" OFF/g' \
58
	${INSTALL_DATA} ${WRKSRC}/${example} ${EXAMPLESDIR}
52
		${WRKSRC}/awesomeConfig.cmake
59
. endfor
53
.if defined(NOPORTDOCS)
54
	@${REINPLACE_CMD} \
55
		-e 's/"install port docs" ON/\"install port docs" OFF/g' \
56
		${WRKSRC}/awesomeConfig.cmake
60
.endif
57
.endif
61
58
62
.include <bsd.port.mk>
59
.include <bsd.port.post.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (awesome-2.3.4.tar.gz) = c7e27e94a9e8badfee7bcca4ac6ff9ce
1
MD5 (awesome-3.1.1.tar.gz) = c82a5bfe4cf4012047eecfe1a4000180
2
SHA256 (awesome-2.3.4.tar.gz) = a73236c31557981746f3e96a6bdc8437455040f33ac0fa9365b2efe8d2889c3a
2
SHA256 (awesome-3.1.1.tar.gz) = e777fca8d0154f1a2555371f20d91eccc9290238c2a52b81a8f1313d4b517c9c
3
SIZE (awesome-2.3.4.tar.gz) = 230800
3
SIZE (awesome-3.1.1.tar.gz) = 272091
(-)files/patch-CMakeLists.txt (+13 lines)
Added Link Here
1
--- CMakeLists.txt.orig	2009-01-08 12:04:44.000000000 +0200
2
+++ CMakeLists.txt	2009-02-01 00:10:36.000000000 +0200
3
@@ -330,7 +330,9 @@
4
 install(DIRECTORY ${BUILD_DIR}/themes DESTINATION ${AWESOME_DATA_PATH})
5
 install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}
6
     PATTERN "*.in" EXCLUDE)
7
-install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
8
+if(INSTALL_PORTDOCS)
9
+    install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
10
+endif()
11
 install(FILES "awesome.desktop" DESTINATION ${AWESOME_XSESSION_PATH})
12
 if(GENERATE_LUADOC)
13
     install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH})
(-)files/patch-awesomeConfig.cmake (+39 lines)
Added Link Here
1
--- awesomeConfig.cmake.orig	2009-01-08 12:04:44.000000000 +0200
2
+++ awesomeConfig.cmake	2009-02-01 00:11:33.000000000 +0200
3
@@ -14,8 +14,9 @@
4
 set(CURSES_NEED_NCURSES true)
5
 
6
 option(WITH_DBUS "build with D-BUS" ON)
7
+option(INSTALL_PORTDOCS "install port docs" ON)
8
 option(GENERATE_MANPAGES "generate manpages" ON)
9
-option(GENERATE_LUADOC "generate luadoc" ON)
10
+option(GENERATE_LUADOC "generate luadoc" OFF)
11
 
12
 link_directories(/usr/local/lib)
13
 
14
@@ -134,14 +135,14 @@
15
     cairo
16
     pango
17
     pangocairo
18
-    x11-xcb
19
+    xcb
20
     xcb-randr
21
     xcb-xinerama
22
     xcb-event>=0.3.0
23
     xcb-aux>=0.3.0
24
     xcb-atom>=0.3.0
25
     xcb-keysyms>=0.3.0
26
-    xcb-icccm>=0.3.0
27
+    xcb-icccm>=0.3.3
28
     cairo-xcb
29
     xproto>=7.0.11
30
     imlib2)
31
@@ -248,7 +249,7 @@
32
 if(DEFINED AWESOME_MAN_PATH)
33
    set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
34
 else()
35
-   set(AWESOME_MAN_PATH ${PREFIX}/share/man CACHE PATH "awesome manpage directory")
36
+   set(AWESOME_MAN_PATH ${PREFIX}/man CACHE PATH "awesome manpage directory")
37
 endif()
38
 
39
 # Hide to avoid confusion
(-)files/patch-client.c (+20 lines)
Added Link Here
1
--- client.c.orig	2009-01-08 12:04:44.000000000 +0200
2
+++ client.c	2009-01-31 21:03:28.000000000 +0200
3
@@ -1455,7 +1455,7 @@
4
                                    xcb_get_wm_class_unchecked(globalconf.connection, (*c)->win),
5
                                    &hint, NULL))
6
              return 0;
7
-        lua_pushstring(L, hint.class);
8
+        lua_pushstring(L, hint.class_name);
9
         xcb_get_wm_class_reply_wipe(&hint);
10
         break;
11
       case A_TK_INSTANCE:
12
@@ -1463,7 +1463,7 @@
13
                                    xcb_get_wm_class_unchecked(globalconf.connection, (*c)->win),
14
                                    &hint, NULL))
15
             return 0;
16
-        lua_pushstring(L, hint.name);
17
+        lua_pushstring(L, hint.instance_name);
18
         xcb_get_wm_class_reply_wipe(&hint);
19
         break;
20
       case A_TK_ROLE:
(-)files/patch-wibox.c (+28 lines)
Added Link Here
1
--- wibox.c.orig
2
+++ wibox.c
3
@@ -101,14 +101,17 @@ wibox_systray_kickout(int phys_screen)
4
 {
5
     xcb_screen_t *s = xutil_screen_get(globalconf.connection, phys_screen);
6
 
7
-    /* Who! Check that we're not deleting a wibox with a systray, because it
8
-     * may be its parent. If so, we reparent to root before, otherwise it will
9
-     * hurt very much. */
10
-    xcb_reparent_window(globalconf.connection,
11
-                        globalconf.screens[phys_screen].systray.window,
12
-                        s->root, -512, -512);
13
-
14
-    globalconf.screens[phys_screen].systray.parent = s->root;
15
+    if(globalconf.screens[phys_screen].systray.parent != s->root)
16
+    {
17
+        /* Who! Check that we're not deleting a wibox with a systray, because it
18
+         * may be its parent. If so, we reparent to root before, otherwise it will
19
+         * hurt very much. */
20
+        xcb_reparent_window(globalconf.connection,
21
+                            globalconf.screens[phys_screen].systray.window,
22
+                            s->root, -512, -512);
23
+
24
+        globalconf.screens[phys_screen].systray.parent = s->root;
25
+    }
26
 }
27
 
28
 static void
(-)pkg-plist (-19 / +102 lines)
Lines 1-28 Link Here
1
@comment $FreeBSD: ports/x11-wm/awesome/pkg-plist,v 1.2 2008/05/21 11:56:55 garga Exp $
1
@comment $FreeBSD: ports/x11-wm/awesome/pkg-plist,v 1.2 2008/05/21 11:56:55 garga Exp $
2
bin/awesome
2
bin/awesome
3
bin/awesome-client
3
bin/awesome-client
4
bin/awesome-menu
4
bin/awsetbg
5
bin/awesome-message
5
etc/xdg/awesome/rc.lua
6
%%DATADIR%%/icons/awesome16.png
6
%%DATADIR%%/icons/awesome16.png
7
%%DATADIR%%/icons/awesome32.png
7
%%DATADIR%%/icons/awesome32.png
8
%%DATADIR%%/icons/awesome48.png
8
%%DATADIR%%/icons/awesome48.png
9
%%DATADIR%%/icons/awesome64.png
9
%%DATADIR%%/icons/awesome64.png
10
%%DATADIR%%/icons/layouts/dwindle.png
10
%%DATADIR%%/icons/invaders/enemy_1.png
11
%%DATADIR%%/icons/layouts/dwindlew.png
11
%%DATADIR%%/icons/invaders/enemy_2.png
12
%%DATADIR%%/icons/layouts/floating.png
12
%%DATADIR%%/icons/invaders/enemy_3.png
13
%%DATADIR%%/icons/layouts/floatingw.png
13
%%DATADIR%%/icons/invaders/player.png
14
%%DATADIR%%/icons/layouts/max.png
14
%%DATADIR%%/lib/awful/client.lua
15
%%DATADIR%%/icons/layouts/maxw.png
15
%%DATADIR%%/lib/awful/client.lua.in
16
%%DATADIR%%/icons/layouts/spiral.png
16
%%DATADIR%%/lib/awful/completion.lua
17
%%DATADIR%%/icons/layouts/spiralw.png
17
%%DATADIR%%/lib/awful/completion.lua.in
18
%%DATADIR%%/icons/layouts/tile.png
18
%%DATADIR%%/lib/awful/hooks.lua
19
%%DATADIR%%/icons/layouts/tilebottom.png
19
%%DATADIR%%/lib/awful/hooks.lua.in
20
%%DATADIR%%/icons/layouts/tilebottomw.png
20
%%DATADIR%%/lib/awful/init.lua
21
%%DATADIR%%/icons/layouts/tileleft.png
21
%%DATADIR%%/lib/awful/init.lua.in
22
%%DATADIR%%/icons/layouts/tileleftw.png
22
%%DATADIR%%/lib/awful/layout.lua
23
%%DATADIR%%/icons/layouts/tiletop.png
23
%%DATADIR%%/lib/awful/layout.lua.in
24
%%DATADIR%%/icons/layouts/tiletopw.png
24
%%DATADIR%%/lib/awful/menu.lua
25
%%DATADIR%%/icons/layouts/tilew.png
25
%%DATADIR%%/lib/awful/menu.lua.in
26
@dirrm %%DATADIR%%/icons/layouts
26
%%DATADIR%%/lib/awful/placement.lua
27
%%DATADIR%%/lib/awful/placement.lua.in
28
%%DATADIR%%/lib/awful/prompt.lua
29
%%DATADIR%%/lib/awful/prompt.lua.in
30
%%DATADIR%%/lib/awful/screen.lua
31
%%DATADIR%%/lib/awful/screen.lua.in
32
%%DATADIR%%/lib/awful/tag.lua
33
%%DATADIR%%/lib/awful/tag.lua.in
34
%%DATADIR%%/lib/awful/titlebar.lua
35
%%DATADIR%%/lib/awful/titlebar.lua.in
36
%%DATADIR%%/lib/awful/util.lua
37
%%DATADIR%%/lib/awful/util.lua.in
38
%%DATADIR%%/lib/awful/widget.lua
39
%%DATADIR%%/lib/awful/widget.lua.in
40
%%DATADIR%%/lib/beautiful.lua
41
%%DATADIR%%/lib/beautiful.lua.in
42
%%DATADIR%%/lib/invaders.lua
43
%%DATADIR%%/lib/invaders.lua.in
44
%%DATADIR%%/lib/naughty.lua
45
%%DATADIR%%/lib/naughty.lua.in
46
%%DATADIR%%/lib/revelation.lua
47
%%DATADIR%%/lib/revelation.lua.in
48
%%DATADIR%%/lib/tabulous.lua
49
%%DATADIR%%/lib/tabulous.lua.in
50
%%DATADIR%%/themes/default/background.png
51
%%DATADIR%%/themes/default/layouts/dwindle.png
52
%%DATADIR%%/themes/default/layouts/dwindlew.png
53
%%DATADIR%%/themes/default/layouts/fairh.png
54
%%DATADIR%%/themes/default/layouts/fairhw.png
55
%%DATADIR%%/themes/default/layouts/fairv.png
56
%%DATADIR%%/themes/default/layouts/fairvw.png
57
%%DATADIR%%/themes/default/layouts/floating.png
58
%%DATADIR%%/themes/default/layouts/floatingw.png
59
%%DATADIR%%/themes/default/layouts/magnifier.png
60
%%DATADIR%%/themes/default/layouts/magnifierw.png
61
%%DATADIR%%/themes/default/layouts/max.png
62
%%DATADIR%%/themes/default/layouts/maxw.png
63
%%DATADIR%%/themes/default/layouts/spiral.png
64
%%DATADIR%%/themes/default/layouts/spiralw.png
65
%%DATADIR%%/themes/default/layouts/tile.png
66
%%DATADIR%%/themes/default/layouts/tilebottom.png
67
%%DATADIR%%/themes/default/layouts/tilebottomw.png
68
%%DATADIR%%/themes/default/layouts/tileleft.png
69
%%DATADIR%%/themes/default/layouts/tileleftw.png
70
%%DATADIR%%/themes/default/layouts/tiletop.png
71
%%DATADIR%%/themes/default/layouts/tiletopw.png
72
%%DATADIR%%/themes/default/layouts/tilew.png
73
%%DATADIR%%/themes/default/submenu.png
74
%%DATADIR%%/themes/default/taglist/squarefw.png
75
%%DATADIR%%/themes/default/taglist/squarew.png
76
%%DATADIR%%/themes/default/tasklist/floating.png
77
%%DATADIR%%/themes/default/tasklist/floatingw.png
78
%%DATADIR%%/themes/default/theme
79
%%DATADIR%%/themes/default/theme.in
80
%%DATADIR%%/themes/default/titlebar/close.png
81
%%DATADIR%%/themes/default/titlebar/closer.png
82
%%DATADIR%%/themes/sky/awesome-icon.png
83
%%DATADIR%%/themes/sky/layouts/dwindle.png
84
%%DATADIR%%/themes/sky/layouts/fairh.png
85
%%DATADIR%%/themes/sky/layouts/fairv.png
86
%%DATADIR%%/themes/sky/layouts/floating.png
87
%%DATADIR%%/themes/sky/layouts/fullscreen.png
88
%%DATADIR%%/themes/sky/layouts/magnifier.png
89
%%DATADIR%%/themes/sky/layouts/max.png
90
%%DATADIR%%/themes/sky/layouts/spiral.png
91
%%DATADIR%%/themes/sky/layouts/tile.png
92
%%DATADIR%%/themes/sky/layouts/tilebottom.png
93
%%DATADIR%%/themes/sky/layouts/tileleft.png
94
%%DATADIR%%/themes/sky/layouts/tiletop.png
95
%%DATADIR%%/themes/sky/sky-background.png
96
%%DATADIR%%/themes/sky/theme
97
%%DATADIR%%/themes/sky/theme.in
98
@dirrm %%DATADIR%%/icons/invaders
27
@dirrm %%DATADIR%%/icons
99
@dirrm %%DATADIR%%/icons
100
@dirrm %%DATADIR%%/lib/awful
101
@dirrm %%DATADIR%%/lib
102
@dirrm %%DATADIR%%/themes/default/layouts
103
@dirrm %%DATADIR%%/themes/default/taglist
104
@dirrm %%DATADIR%%/themes/default/tasklist
105
@dirrm %%DATADIR%%/themes/default/titlebar
106
@dirrm %%DATADIR%%/themes/default
107
@dirrm %%DATADIR%%/themes/sky/layouts
108
@dirrm %%DATADIR%%/themes/sky
109
@dirrm %%DATADIR%%/themes
28
@dirrm %%DATADIR%%
110
@dirrm %%DATADIR%%
111
share/xsessions/awesome.desktop

Return to bug 131229