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

(-)ports/x11-wm/sawfish/Makefile (-6 / +5 lines)
Lines 7-14 Link Here
7
#
7
#
8
8
9
PORTNAME=	sawfish
9
PORTNAME=	sawfish
10
PORTVERSION=	1.3
10
PORTVERSION=	1.3.2
11
PORTREVISION=	16
12
PORTEPOCH=	2
11
PORTEPOCH=	2
13
CATEGORIES=	x11-wm
12
CATEGORIES=	x11-wm
14
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
Lines 28-38 Link Here
28
USE_XLIB=	yes
27
USE_XLIB=	yes
29
USE_GMAKE=	yes
28
USE_GMAKE=	yes
30
USE_GNOME=	gnomehier gnomehack esound
29
USE_GNOME=	gnomehier gnomehack esound
30
USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
31
WANT_GNOME=	yes
31
WANT_GNOME=	yes
32
USE_GETTEXT=	yes
32
USE_GETTEXT=	yes
33
GNU_CONFIGURE=	yes
33
GNU_CONFIGURE=	yes
34
CONFIGURE_ARGS=	--with-readline \
34
35
		--localstatedir=${PREFIX}/share \
35
CONFIGURE_SCRIPT=	autogen.sh
36
CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
36
		--datadir=${PREFIX}/share \
37
		--datadir=${PREFIX}/share \
37
		--enable-capplet \
38
		--enable-capplet \
38
		--disable-themer \
39
		--disable-themer \
Lines 44-51 Link Here
44
INFO=		sawfish
45
INFO=		sawfish
45
46
46
post-patch:
47
post-patch:
47
	@${REINPLACE_CMD} -e 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
48
		 s|[$$][(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
49
	@${REINPLACE_CMD} -e 's|prog_name|program_name|g' \
48
	@${REINPLACE_CMD} -e 's|prog_name|program_name|g' \
50
	    	${WRKSRC}/src/main.c
49
	    	${WRKSRC}/src/main.c
51
50
(-)ports/x11-wm/sawfish/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (gnome2/sawfish-1.3.tar.gz) = 9e5ce5e76c60acecdb1889c1f173295a
1
MD5 (gnome2/sawfish-1.3.2.tar.gz) = b068bb0f0c4326bbac0981837f6d293e
2
SHA256 (gnome2/sawfish-1.3.tar.gz) = c53cd96d03c584cf3570cb92fc03c8b2af4e68fa86f19259535d4a7b178faa87
2
SHA256 (gnome2/sawfish-1.3.2.tar.gz) = 2d614fdf62da8f70b52b8025789f236adca29ad6c8ee791c1d60747f1e1a4309
3
SIZE (gnome2/sawfish-1.3.tar.gz) = 1582279
3
SIZE (gnome2/sawfish-1.3.2.tar.gz) = 1950794
(-)ports/x11-wm/sawfish/pkg-descr (-1 / +2 lines)
Lines 1-3 Link Here
1
Lisp configurable window manager
1
Lisp configurable window manager
2
2
3
WWW: http://sawmill.sourceforge.net/
3
WWW: http://sawfish.wikia.com/
4
(-)ports/x11-wm/sawfish/pkg-plist (-3 / +14 lines)
Lines 47-52 Link Here
47
share/pixmaps/sawfish-workspaces.png
47
share/pixmaps/sawfish-workspaces.png
48
share/gnome/wm-properties/Sawfish.desktop
48
share/gnome/wm-properties/Sawfish.desktop
49
share/locale/am/LC_MESSAGES/sawfish.mo
49
share/locale/am/LC_MESSAGES/sawfish.mo
50
share/locale/ar/LC_MESSAGES/sawfish.mo
50
share/locale/az/LC_MESSAGES/sawfish.mo
51
share/locale/az/LC_MESSAGES/sawfish.mo
51
share/locale/be/LC_MESSAGES/sawfish.mo
52
share/locale/be/LC_MESSAGES/sawfish.mo
52
share/locale/bg/LC_MESSAGES/sawfish.mo
53
share/locale/bg/LC_MESSAGES/sawfish.mo
Lines 55-61 Link Here
55
share/locale/cs/LC_MESSAGES/sawfish.mo
56
share/locale/cs/LC_MESSAGES/sawfish.mo
56
share/locale/da/LC_MESSAGES/sawfish.mo
57
share/locale/da/LC_MESSAGES/sawfish.mo
57
share/locale/de/LC_MESSAGES/sawfish.mo
58
share/locale/de/LC_MESSAGES/sawfish.mo
59
share/locale/dz/LC_MESSAGES/sawfish.mo
58
share/locale/el/LC_MESSAGES/sawfish.mo
60
share/locale/el/LC_MESSAGES/sawfish.mo
61
share/locale/en_CA/LC_MESSAGES/sawfish.mo
59
share/locale/en_GB/LC_MESSAGES/sawfish.mo
62
share/locale/en_GB/LC_MESSAGES/sawfish.mo
60
share/locale/es/LC_MESSAGES/sawfish.mo
63
share/locale/es/LC_MESSAGES/sawfish.mo
61
share/locale/et/LC_MESSAGES/sawfish.mo
64
share/locale/et/LC_MESSAGES/sawfish.mo
Lines 69-85 Link Here
69
share/locale/ja/LC_MESSAGES/sawfish.mo
72
share/locale/ja/LC_MESSAGES/sawfish.mo
70
share/locale/ko/LC_MESSAGES/sawfish.mo
73
share/locale/ko/LC_MESSAGES/sawfish.mo
71
share/locale/lv/LC_MESSAGES/sawfish.mo
74
share/locale/lv/LC_MESSAGES/sawfish.mo
75
share/locale/mk/LC_MESSAGES/sawfish.mo
72
share/locale/ms/LC_MESSAGES/sawfish.mo
76
share/locale/ms/LC_MESSAGES/sawfish.mo
77
share/locale/nb/LC_MESSAGES/sawfish.mo
78
share/locale/ne/LC_MESSAGES/sawfish.mo
73
share/locale/nl/LC_MESSAGES/sawfish.mo
79
share/locale/nl/LC_MESSAGES/sawfish.mo
74
share/locale/nn/LC_MESSAGES/sawfish.mo
80
share/locale/nn/LC_MESSAGES/sawfish.mo
75
share/locale/no/LC_MESSAGES/sawfish.mo
81
share/locale/no/LC_MESSAGES/sawfish.mo
82
share/locale/oc/LC_MESSAGES/sawfish.mo
83
share/locale/pa/LC_MESSAGES/sawfish.mo
76
share/locale/pl/LC_MESSAGES/sawfish.mo
84
share/locale/pl/LC_MESSAGES/sawfish.mo
77
share/locale/pt/LC_MESSAGES/sawfish.mo
85
share/locale/pt/LC_MESSAGES/sawfish.mo
78
share/locale/pt_BR/LC_MESSAGES/sawfish.mo
86
share/locale/pt_BR/LC_MESSAGES/sawfish.mo
79
share/locale/ro/LC_MESSAGES/sawfish.mo
87
share/locale/ro/LC_MESSAGES/sawfish.mo
80
share/locale/ru/LC_MESSAGES/sawfish.mo
88
share/locale/ru/LC_MESSAGES/sawfish.mo
89
share/locale/rw/LC_MESSAGES/sawfish.mo
81
share/locale/sk/LC_MESSAGES/sawfish.mo
90
share/locale/sk/LC_MESSAGES/sawfish.mo
82
share/locale/sl/LC_MESSAGES/sawfish.mo
91
share/locale/sl/LC_MESSAGES/sawfish.mo
92
share/locale/sr/LC_MESSAGES/sawfish.mo
93
share/locale/sr@Latn/LC_MESSAGES/sawfish.mo
83
share/locale/sv/LC_MESSAGES/sawfish.mo
94
share/locale/sv/LC_MESSAGES/sawfish.mo
84
share/locale/tr/LC_MESSAGES/sawfish.mo
95
share/locale/tr/LC_MESSAGES/sawfish.mo
85
share/locale/uk/LC_MESSAGES/sawfish.mo
96
share/locale/uk/LC_MESSAGES/sawfish.mo
Lines 652-658 Link Here
652
@dirrm %%DATADIR%%/%%VERSION%%/themes/brushed-metal
663
@dirrm %%DATADIR%%/%%VERSION%%/themes/brushed-metal
653
@dirrm %%DATADIR%%/%%VERSION%%/themes/absolute-e
664
@dirrm %%DATADIR%%/%%VERSION%%/themes/absolute-e
654
@dirrm %%DATADIR%%/%%VERSION%%/themes/Crux
665
@dirrm %%DATADIR%%/%%VERSION%%/themes/Crux
655
@dirrm %%DATADIR%%/%%VERSION%%/themes
666
@dirrmtry %%DATADIR%%/%%VERSION%%/themes
656
@dirrm %%DATADIR%%/%%VERSION%%/sounds
667
@dirrm %%DATADIR%%/%%VERSION%%/sounds
657
@dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/wm/util
668
@dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/wm/util
658
@dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/wm/theming
669
@dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/wm/theming
Lines 671-678 Link Here
671
@dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/gtk
682
@dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish/gtk
672
@dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish
683
@dirrm %%DATADIR%%/%%VERSION%%/lisp/sawfish
673
@dirrm %%DATADIR%%/%%VERSION%%/lisp
684
@dirrm %%DATADIR%%/%%VERSION%%/lisp
674
@dirrm %%DATADIR%%/%%VERSION%%
685
@dirrmtry %%DATADIR%%/%%VERSION%%
675
@dirrm %%DATADIR%%
686
@dirrmtry %%DATADIR%%
676
@dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm/util
687
@dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm/util
677
@dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm
688
@dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm
678
@dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish
689
@dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish
(-)ports/x11-wm/sawfish/files/patch-configure (-20 lines)
Removed Link Here
1
--- configure.orig	Tue Nov 12 16:10:53 2002
2
+++ configure	Tue Nov 12 16:12:11 2002
3
@@ -2688,7 +2688,7 @@
4
   (error
5
     (throw 'quit 1)))
6
 EOF
7
-if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
8
+if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then
9
   echo "$ac_t""yes" 1>&6
10
 else
11
   echo "$ac_t""no" 1>&6
12
@@ -3387,7 +3387,7 @@
13
 if test "$enable_themer" = yes; then
14
     echo $ac_n "checking for rep-gtk libglade wrapper""... $ac_c" 1>&6
15
 echo "configure:3390: checking for rep-gtk libglade wrapper" >&5
16
-  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then 
17
+   if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then
18
     echo "$ac_t""yes" 1>&6
19
     add_subdir "themer"
20
   else 
(-)ports/x11-wm/sawfish/files/patch-configure.in (+20 lines)
Added Link Here
1
--- configure.in.orig	2007-07-27 15:43:23.000000000 +0300
2
+++ configure.in	2007-11-24 00:39:45.000000000 +0200
3
@@ -159,7 +159,7 @@
4
   (error
5
     (throw 'quit 1)))
6
 EOF
7
-if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
8
+if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then
9
   AC_MSG_RESULT([yes])
10
 else
11
   AC_MSG_RESULT([no])
12
@@ -264,7 +264,7 @@
13
 if test "$enable_themer" = yes; then
14
   dnl configure redirects &5 to config.log
15
   AC_MSG_CHECKING([for rep-gtk libglade wrapper])
16
-  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then 
17
+  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then 
18
     AC_MSG_RESULT([yes])
19
     add_subdir "themer"
20
   else 
(-)ports/x11-wm/sawfish/files/patch-functions.c (-14 lines)
Removed Link Here
1
--- src/functions.c 3 Nov 2002 21:00:36 -0000       1.98
2
+++ src/functions.c 30 Oct 2003 05:35:18 -0000      1.99
3
@@ -704,8 +704,10 @@
4
	    repv name;
5
	    if (type == XA_ATOM && (name = x_atom_symbol (l_data[i])) != Qnil)
6
		rep_VECTI(ret_data, i) = name;
7
+	    else if (type == XA_INTEGER)
8
+		rep_VECTI(ret_data, i) = rep_make_long_int((long) l_data[i]);
9
	    else
10
-		rep_VECTI(ret_data, i) = rep_make_long_uint(l_data[i]);
11
+		rep_VECTI(ret_data, i) = rep_make_long_uint(l_data[i] & 0xffffffffUL);
12
	}
13
	break;
14
     }
(-)ports/x11-wm/sawfish/files/patch-lisp::sawfish::wm::state::wm-spec.jl (-11 lines)
Removed Link Here
1
--- lisp/sawfish/wm/state/wm-spec.jl.orig	Sun Sep 28 22:51:20 2003
2
+++ lisp/sawfish/wm/state/wm-spec.jl	Sun Sep 28 22:52:10 2003
3
@@ -125,7 +125,7 @@
4
      _NET_WM_WINDOW_TYPE_UTILITY
5
      _NET_WM_WINDOW_TYPE_SPLASH])
6
   
7
-  (defvar wm-spec-below-depth +2)
8
+  (defvar wm-spec-below-depth -2)
9
   (defvar wm-spec-above-depth +2)
10
 
11
   (define supported-states '())
(-)ports/x11-wm/sawfish/files/patch-sawmill.h (-11 lines)
Removed Link Here
1
--- src/sawmill.h.orig      Mon Jan 13 05:35:23 2003
2
+++ src/sawmill.h   Mon May  8 11:52:40 2006
3
@@ -153,7 +153,7 @@
4
     /* Frame data */
5
     Window frame;
6
     struct frame_part *frame_parts;
7
-    u_int frame_x, frame_y;		/* relative to client-window */
8
+    int frame_x, frame_y;		/* relative to client-window */
9
     u_int frame_width, frame_height;
10
     void (*destroy_frame)(struct lisp_window *w);
11
     void (*focus_change)(struct lisp_window *w);
(-)ports/x11-wm/sawfish/files/patch-scripts_sawfish-menu.jl (-12 lines)
Removed Link Here
1
--- scripts/sawfish-menu.jl.orig	Tue May 20 11:49:42 2003
2
+++ scripts/sawfish-menu.jl	Tue May 20 11:50:54 2003
3
@@ -106,7 +106,8 @@
4
     (g-signal-connect menu "deactivate" gtk-main-quit)
5
     (setq menu-selected nil)
6
     (gtk-menu-popup-interp menu nil nil 0 (or timestamp 0) position)
7
-    (gtk-main)
8
+    (when (memq 'visible (GTK-WIDGET-FLAGS menu))
9
+      (gtk-main))
10
     menu-selected))
11
 
12
 
(-)ports/x11-wm/sawfish/files/patch-src_fonts.c (-11 lines)
Removed Link Here
1
--- src/fonts.c.orig	Sun Nov  3 22:00:36 2002
2
+++ src/fonts.c	Wed Feb  8 04:22:13 2006
3
@@ -131,7 +131,7 @@
4
 	    if (end == 0)
5
 		end = p + strlen (p);
6
 	    len = end - (p + 1);
7
-	    buf = malloc (len);
8
+	    buf = malloc (len + 1);
9
 	    memcpy (buf, p + 1, len);
10
 	    buf[len] = 0;
11
 	    return buf;

Return to bug 120053