View | Details | Raw Unified | Return to bug 134708
Collapse All | Expand All

(-)Makefile (-5 / +2 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	awesome
8
PORTNAME=	awesome
9
DISTVERSION=	3.3-rc2
9
DISTVERSION=	3.3-rc3
10
PORTREVISION=	2
11
CATEGORIES=	x11-wm
10
CATEGORIES=	x11-wm
12
MASTER_SITES=	http://awesome.naquadah.org/download/ \
11
MASTER_SITES=	http://awesome.naquadah.org/download/ \
13
		http://redundancy.redundancy.org/mirror/
12
		http://redundancy.redundancy.org/mirror/
Lines 16-21 Link Here
16
COMMENT=	A highly configurable, next generation framework window manager
15
COMMENT=	A highly configurable, next generation framework window manager
17
16
18
BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
17
BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
18
		convert:${PORTSDIR}/graphics/ImageMagick \
19
		gperf>=3.0.3:${PORTSDIR}/devel/gperf \
19
		gperf>=3.0.3:${PORTSDIR}/devel/gperf \
20
		pango>=1.19.3:${PORTSDIR}/x11-toolkits/pango \
20
		pango>=1.19.3:${PORTSDIR}/x11-toolkits/pango \
21
		xmlto:${PORTSDIR}/textproc/xmlto \
21
		xmlto:${PORTSDIR}/textproc/xmlto \
Lines 75-81 Link Here
75
		${WRKSRC}/awesomeConfig.cmake
75
		${WRKSRC}/awesomeConfig.cmake
76
.endif
76
.endif
77
77
78
post-patch:
79
	@${RM} ${WRKSRC}/lib/awful/util.lua.in.orig
80
81
.include <bsd.port.post.mk>
78
.include <bsd.port.post.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (awesome-3.3-rc2.tar.gz) = 4fd1abe54200b881c71b1bc99bb278e5
1
MD5 (awesome-3.3-rc3.tar.gz) = 54d1591f18fea1a076d75c3f111fed8d
2
SHA256 (awesome-3.3-rc2.tar.gz) = 1b1af11292914c9788e8965bd0bb3a62eb53843451346baed1427b93ec03d662
2
SHA256 (awesome-3.3-rc3.tar.gz) = 71d61d6152fd0c453f9e2f6b0ca49c363a8f8d068006f60cb5ab18a84bf66f4b
3
SIZE (awesome-3.3-rc2.tar.gz) = 291500
3
SIZE (awesome-3.3-rc3.tar.gz) = 284285
(-)files/patch-awesomeConfig.cmake (-5 / +14 lines)
Lines 1-7 Link Here
1
--- awesomeConfig.cmake.orig	2009-01-08 12:04:44.000000000 +0200
1
--- awesomeConfig.cmake.orig
2
+++ awesomeConfig.cmake	2009-02-01 00:11:33.000000000 +0200
2
+++ awesomeConfig.cmake
3
@@ -14,8 +14,9 @@
3
@@ -12,8 +12,9 @@
4
 set(CURSES_NEED_NCURSES true)
4
 set(CMAKE_BUILD_TYPE RELEASE)
5
 
5
 
6
 option(WITH_DBUS "build with D-BUS" ON)
6
 option(WITH_DBUS "build with D-BUS" ON)
7
+option(INSTALL_PORTDOCS "install port docs" ON)
7
+option(INSTALL_PORTDOCS "install port docs" ON)
Lines 11-17 Link Here
11
 
11
 
12
 link_directories(/usr/local/lib)
12
 link_directories(/usr/local/lib)
13
 
13
 
14
@@ -248,7 +249,7 @@
14
@@ -61,7 +62,7 @@
15
 # theme graphics
16
 a_find_program(CONVERT_EXECUTABLE convert TRUE)
17
 # doxygen
18
-include(FindDoxygen)
19
+#include(FindDoxygen)
20
 # pkg-config
21
 include(FindPkgConfig)
22
 # lua 5.1
23
@@ -244,7 +245,7 @@
15
 if(DEFINED AWESOME_MAN_PATH)
24
 if(DEFINED AWESOME_MAN_PATH)
16
    set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
25
    set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
17
 else()
26
 else()
(-)files/patch-build-utils-gperf.sh (-54 lines)
Lines 1-54 Link Here
1
--- build-utils/gperf.sh.orig
2
+++ build-utils/gperf.sh
3
@@ -1,4 +1,4 @@
4
-#! /bin/sh -e
5
+#!/bin/sh
6
 #
7
 # Copyright © 2008 Pierre Habouzit <madcoder@debian.org>
8
 #
9
@@ -50,7 +50,7 @@ do_h() {
10
 
11
 typedef enum awesome_token_t {
12
     A_TK_UNKNOWN,
13
-`tr 'a-z-./ ' 'A-Z____' | sed -e "s/^[^/].*/    A_TK_&,/"`
14
+`tr '[:lower:]' '[:upper:]' | sed -e "s/^[^/].*/    A_TK_&,/"`
15
 } awesome_token_t;
16
 
17
 __attribute__((pure)) enum awesome_token_t a_tokenize(const char *s, int len);
18
@@ -63,20 +63,21 @@ do_tokens() {
19
         case "$tok" in
20
             "") continue;;
21
             *)
22
-                echo "$tok, A_TK_`echo $tok | tr 'a-z-./ ' 'A-Z____'`"
23
+                echo "$tok, A_TK_`echo $tok | tr '[:lower:]' '[:upper:]'`"
24
                 ;;
25
         esac
26
     done
27
 }
28
 
29
 do_c() {
30
-    if ! which gperf > /dev/null; then
31
+    which gperf > /dev/null
32
+    if test $? = 1 ; then
33
         echo "gperf not found. You need to install gperf." > /dev/stderr;
34
         exit 1;
35
     fi;
36
 
37
-    cat <<EOF | gperf -l -t -C -F",0" \
38
-        --language=ANSI-C -Na_tokenize_aux \
39
+    gperf -l -t -C -F",0" \
40
+        --language=ANSI-C -Na_tokenize_aux <<EOF \
41
         | sed -e '/__gnu_inline__/d;s/\<\(__\|\)inline\>//g'
42
 %{
43
 `do_hdr`
44
@@ -119,8 +120,8 @@ trap "rm -f ${TARGET}" 0
45
 
46
 rm -f "${TARGET}"
47
 case "${TARGET}" in
48
-    *.h) cat "${TOKENS_FILE}" | do_h > "${TARGET}";;
49
-    *.c) cat "${TOKENS_FILE}" | do_c > "${TARGET}";;
50
+    *.h) do_h > "${TARGET}" < "${TOKENS_FILE}" ;;
51
+    *.c) do_c > "${TARGET}" < "${TOKENS_FILE}" ;;
52
     *)  die "you must ask for the 'h' or 'c' generation";;
53
 esac
54
 chmod -w "${TARGET}"
(-)files/patch-lib-awful-util.lua.in (-22 lines)
Lines 1-22 Link Here
1
--- lib/awful/util.lua.in.orig
2
+++ lib/awful/util.lua.in
3
@@ -26,6 +26,8 @@ module("awful.util")
4
 
5
 table = {}
6
 
7
+shell = os.getenv("SHELL") or "/bin/sh"
8
+
9
 function deprecate(see)
10
     io.stderr:write("W: awful: function is deprecated")
11
     if see then
12
@@ -79,10 +81,6 @@ end
13
 -- @param screen The screen where to run the command.
14
 function spawn_with_shell(cmd, screen)
15
     if cmd and cmd ~= "" then
16
-        -- Get the shell once for all
17
-        if not shell then
18
-            shell = os.getenv("SHELL") or "/bin/sh"
19
-        end
20
         cmd = shell .. " -c \"" .. cmd .. "\""
21
         return capi.awesome.spawn(cmd, false, screen or capi.mouse.screen)
22
     end
(-)files/patch-utils-awesome-client (-21 lines)
Lines 1-21 Link Here
1
--- utils/awesome-client.orig
2
+++ utils/awesome-client
3
@@ -1,4 +1,4 @@
4
-#!/bin/bash
5
+#!/bin/sh
6
 
7
 # rlwrap provides readline to stuff which doesn't know readline by itself
8
 RLWRAP=`which rlwrap 2>/dev/null`
9
@@ -15,9 +15,11 @@ fi
10
 
11
 DBUS_SEND=dbus-send
12
 
13
-if ! which ${DBUS_SEND} >/dev/null 2>&1
14
+which ${DBUS_SEND} > /dev/null
15
+if test $? = 1
16
 then
17
     echo "E: Unable to find" ${DBUS_SEND}
18
+    exit 1
19
 fi
20
 
21
 DBUS_METHOD=org.awesome.Remote.Eval
(-)pkg-plist (-2 lines)
Lines 109-118 Link Here
109
%%DATADIR%%/themes/default/tasklist/floatingw.png
109
%%DATADIR%%/themes/default/tasklist/floatingw.png
110
%%DATADIR%%/themes/default/theme.lua
110
%%DATADIR%%/themes/default/theme.lua
111
%%DATADIR%%/themes/default/theme.lua.in
111
%%DATADIR%%/themes/default/theme.lua.in
112
%%DATADIR%%/themes/default/titlebar/close.png
113
%%DATADIR%%/themes/default/titlebar/close_focus.png
112
%%DATADIR%%/themes/default/titlebar/close_focus.png
114
%%DATADIR%%/themes/default/titlebar/close_normal.png
113
%%DATADIR%%/themes/default/titlebar/close_normal.png
115
%%DATADIR%%/themes/default/titlebar/closer.png
116
%%DATADIR%%/themes/default/titlebar/floating_focus_active.png
114
%%DATADIR%%/themes/default/titlebar/floating_focus_active.png
117
%%DATADIR%%/themes/default/titlebar/floating_focus_inactive.png
115
%%DATADIR%%/themes/default/titlebar/floating_focus_inactive.png
118
%%DATADIR%%/themes/default/titlebar/floating_normal_active.png
116
%%DATADIR%%/themes/default/titlebar/floating_normal_active.png

Return to bug 134708