update to 2.4

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@4116 d073be05-634f-4543-b044-5fe20cf6d1d6
macports · Dec 5, 2003 · fd3be0f · fd3be0f
1 parent fcef0db
commit fd3be0f
Show file tree

Hide file tree

Showing 23 changed files with 176 additions and 106 deletions.
diff --git a/gnome/acme/Portfile b/gnome/acme/Portfile
@@ -1,7 +1,7 @@
-# $Id: Portfile,v 1.1 2003/11/05 20:13:27 olegb Exp $
+# $Id: Portfile,v 1.2 2003/12/05 23:11:23 olegb Exp $
 PortSystem 1.0
 name		acme
-version		2.0.4
+version		2.4.1
 description	Tool to make multimedia keys work on laptops
 long_description  	This is ACME, a small tool for your laptops. \
 			It makes the small multimedia buttons on these \
@@ -12,8 +12,8 @@ maintainers	olegb@opendarwin.org
 categories	gnome
 platforms	darwin 
 homepage	http://www.gnome.org/
-master_sites    gnome:sources/acme/2.0/
-checksums	md5 fd8814ca889858eac6b97bd8ce942b18
+master_sites    gnome:sources/acme/2.4/
+checksums	md5 0e4b240662a706d529757a86fe4bf0c5
 depends_lib	lib:libgnome-window-settings:control-center
 use_bzip2 	yes
 configure.env   CPPFLAGS="-I${prefix}/include -L${prefix}/lib" \

diff --git a/gnome/control-center/Portfile b/gnome/control-center/Portfile
@@ -1,16 +1,16 @@
-# $Id: Portfile,v 1.2 2003/10/20 18:37:27 olegb Exp $
+# $Id: Portfile,v 1.3 2003/12/05 23:10:27 olegb Exp $
 PortSystem 1.0
 name		control-center
-version		2.2.2
+version		2.4.0
 description	Control center for GNOME 2.0 project.
 long_description        Control center for GNOME 2.0 project
 maintainers	olegb@opendarwin.org
 categories	gnome
 platforms	darwin 
 homepage	http://www.gnome.org/
-master_sites    gnome:sources/control-center/2.2/
-checksums	md5 d5288d0e4249a5afdef494d5c59cb1bc
-depends_lib	lib:metacity:metacity
+master_sites    gnome:sources/control-center/2.4/
+checksums	md5 44115d3174d2f603f34a336ada562bae
+depends_lib	lib:libnautilus:nautilus
 use_bzip2 	yes
 configure.args  --mandir=${prefix}/share/man
 configure.env   CPPFLAGS="-L${prefix}/lib -I${prefix}/include"  \

diff --git a/gnome/eel/Portfile b/gnome/eel/Portfile
@@ -1,7 +1,7 @@
-# $Id: Portfile,v 1.3 2003/10/20 18:38:10 olegb Exp $
+# $Id: Portfile,v 1.4 2003/12/05 22:58:23 olegb Exp $
 PortSystem 1.0
 name		eel
-version		2.2.4
+version		2.4.1
 description	Generally useful classes and extensions to GNOME
 long_description        The eel library contains a number of generally \
 			useful classes and functions. Many of them are \
@@ -13,8 +13,9 @@ maintainers	olegb@opendarwin.org
 categories	gnome
 platforms	darwin 
 homepage	http://www.gnome.org/
-master_sites    gnome:sources/eel/2.2/
-checksums	md5 39d3ff28fbadd7341521644269d467b5
+master_sites    gnome:sources/eel/2.4/
+checksums	md5 5ddfee20c3ad53ebbbb8c8e9517e8304
+patchfiles	patch_eel-glib-extensions.c patch_egg-screen-exec.c
 depends_lib	lib:libgail:gail
 use_bzip2 	yes
 configure.args  --mandir=${prefix}/share/man

diff --git a/gnome/eel/files/patch_eel-glib-extensions.c b/gnome/eel/files/patch_eel-glib-extensions.c
@@ -0,0 +1,15 @@
+--- eel/eel-glib-extensions.c.org	Wed Nov 26 18:21:37 2003
++++ eel/eel-glib-extensions.c	Wed Nov 26 18:23:51 2003
+@@ -54,7 +54,12 @@
+
+ /* We will need this for eel_unsetenv if there is no unsetenv. */
+ #if !defined (HAVE_SETENV)
++#ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++#elif
+ extern char **environ;
++#endif
+ #endif
+
+ /**
diff --git a/gnome/eel/files/patch_egg-screen-exec.c b/gnome/eel/files/patch_egg-screen-exec.c
@@ -0,0 +1,15 @@
+--- eel/egg-screen-exec.c.org	Wed Nov 26 18:20:55 2003
++++ eel/egg-screen-exec.c	Wed Nov 26 18:22:17 2003
+@@ -31,7 +31,12 @@
+ #include <gdk/gdkx.h>
+ #endif
+
++#ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++#elif
+ extern char **environ;
++#endif
+
+ /**
+  * egg_screen_exec_display_string:
diff --git a/gnome/gail/Portfile b/gnome/gail/Portfile
@@ -1,7 +1,7 @@
-# $Id: Portfile,v 1.5 2003/10/20 18:40:25 olegb Exp $
+# $Id: Portfile,v 1.6 2003/12/05 22:54:43 olegb Exp $
 PortSystem 1.0
 name		gail
-version		1.2.2
+version		1.4.1
 description	An implementation of the ATK interfaces for GTK+ widgets.
 long_description        Gail, the Gnome Accessibility Implementation \
 			library, is implementation of the ATK interfaces \
@@ -10,10 +10,9 @@ maintainers	olegb@opendarwin.org
 categories	gnome
 platforms	darwin 
 homepage	http://www.gnome.org/
-master_sites    gnome:sources/gail/1.2/
-checksums	md5 cace76d052501c10f57c145618205509
-patchfiles	patch_ferret.c
-depends_lib	lib:libgnomeui:libgnomeui
+master_sites    gnome:sources/gail/1.4/
+checksums	md5 ea970bd1f6ce5da13e7d872ad9d27869
+depends_lib	lib:gnome-session:gnome-session
 use_bzip2	yes
 configure.args  --mandir=${prefix}/share/man
 configure.env   CPPFLAGS="-L${prefix}/lib -I${prefix}/include" \

diff --git a/gnome/gail/files/patch_ferret.c b/gnome/gail/files/patch_ferret.c
diff --git a/gnome/gedit/Portfile b/gnome/gedit/Portfile
@@ -1,16 +1,16 @@
-# $Id: Portfile,v 1.2 2003/10/20 18:42:59 olegb Exp $
+# $Id: Portfile,v 1.3 2003/12/05 23:07:22 olegb Exp $
 PortSystem 1.0
 name		gedit
-version		2.2.2
+version		2.4.1
 description	Gnome editor
 long_description        Gnome editor
 maintainers	olegb@opendarwin.org
 categories	editors
 platforms	darwin 
 homepage	http://www.artofcode.com/libart.html
-master_sites    gnome:sources/gedit/2.2/
-checksums	md5 9cd866f6e331fb3e5c65ed8200d9d154
-depends_lib	lib:libgnomeprintui:libgnomeprintui
+master_sites    gnome:sources/gedit/2.4/
+checksums	md5 ebc37dbf48451dcacb04313bcdf2e3a6
+depends_lib	lib:libgtksourceview-1:gtksourceview
 use_bzip2 	yes
 configure.args  --mandir=${prefix}/share/man
 configure.env   CPPFLAGS="-L${prefix}/lib -I${prefix}/include" \

diff --git a/gnome/glade/Portfile b/gnome/glade/Portfile
@@ -1,7 +1,7 @@
-# $Id: Portfile,v 1.1 2003/11/05 20:11:12 olegb Exp $
+# $Id: Portfile,v 1.2 2003/12/05 23:03:30 olegb Exp $
 PortSystem 1.0
 name		glade
-version		1.1.3
+version		2.0.1
 description	Glade is a free user interface builder for GTK+ and GNOME.
 long_description        Glade is a free user interface builder for GTK+ \
 			and GNOME. It is released under the GNU General \
@@ -10,9 +10,9 @@ maintainers	olegb@opendarwin.org
 categories	gnome devel
 platforms	darwin 
 homepage	http://glade.gnome.org/
-master_sites    gnome:fifth-toe/2.2/2.2.0/sources
+master_sites	gnome:sources/glade/2.0/
 use_bzip2	yes
-checksums	md5 ceb1fb626e4fa676b8b458aa422c7d22
+checksums	md5 83fae1cdebb37461450906f212c1bc76
 depends_lib     lib:gnome-session:gnome-session
 configure.env   CPPFLAGS="-L${prefix}/lib -I${prefix}/include" \
                 CFLAGS="-no-cpp-precomp -flat_namespace -undefined suppress" 
diff --git a/gnome/gnome-desktop/Portfile b/gnome/gnome-desktop/Portfile
@@ -1,7 +1,7 @@
-# $Id: Portfile,v 1.7 2003/10/20 18:43:34 olegb Exp $
+# $Id: Portfile,v 1.8 2003/12/05 22:46:38 olegb Exp $
 PortSystem 1.0
 name		gnome-desktop
-version		2.2.2
+version		2.4.1.1
 description	Additional UI API for GNOME 2
 long_description        This is a collection of APIs not included in \
 			libgnomeui as they have not undergone sufficient \
@@ -10,9 +10,10 @@ maintainers	ole_gb@opendarwin.org
 categories	gnome
 platforms	darwin 
 homepage	http://www.gnome.org/
-master_sites    gnome:sources/gnome-desktop/2.2/
-checksums	md5 335e6109abc5a04e69ab574464af1900
-depends_lib	lib:libwnck:libwnck
+master_sites    gnome:sources/gnome-desktop/2.4/
+checksums	md5 c85489c7befc79b5cc9bda1b2006cacc
+patchfiles	patch_egg-spawn.c patch_gnome-desktop-item.c
+depends_lib	lib:libgnomeui:libgnomeui
 depends_build	bin:scrollkeeper-extract:scrollkeeper
 use_bzip2 	yes
 configure.args  --mandir=${prefix}/share/man

diff --git a/gnome/gnome-desktop/files/patch_egg-spawn.c b/gnome/gnome-desktop/files/patch_egg-spawn.c
@@ -0,0 +1,23 @@
+--- libgnome-desktop/egg-spawn.c.org	Tue Nov 25 20:59:45 2003
++++ libgnome-desktop/egg-spawn.c	Tue Nov 25 21:01:11 2003
+@@ -20,6 +20,11 @@
+  * Authors: Mark McLoughlin <mark@skynet.ie>
+  */
+
++#ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++#endif
++
+ #include <config.h>
+ #include <string.h>
+
+@@ -27,8 +32,6 @@
+
+ #include <glib.h>
+ #include <gdk/gdk.h>
+-
+-extern char **environ;
+
+ /**
+  * egg_make_spawn_environment_for_screen:
diff --git a/gnome/gnome-desktop/files/patch_gnome-desktop-item.c b/gnome/gnome-desktop/files/patch_gnome-desktop-item.c
@@ -0,0 +1,23 @@
+--- libgnome-desktop/gnome-desktop-item.c.org	Tue Nov 25 20:59:15 2003
++++ libgnome-desktop/gnome-desktop-item.c	Tue Nov 25 21:00:05 2003
+@@ -27,6 +27,11 @@
+   @NOTATION@
+  */
+
++#ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++#endif
++
+ #include "config.h"
+
+ #include <limits.h>
+@@ -1482,8 +1487,6 @@
+ {
+ 	gdk_error_trap_pop ();
+ }
+-
+-extern char **environ;
+
+ static char **
+ make_spawn_environment_for_sn_context (SnLauncherContext *sn_context,
diff --git a/gnome/gnome-panel/Portfile b/gnome/gnome-panel/Portfile
@@ -1,18 +1,17 @@
-# $Id: Portfile,v 1.10 2003/10/20 18:45:33 olegb Exp $
+# $Id: Portfile,v 1.11 2003/12/05 22:50:27 olegb Exp $
 PortSystem 1.0
 name		gnome-panel
-version		2.2.2.2
+version		2.4.1
 description	Panel component for the GNOME 2 Desktop.
 long_description        Panel component for the GNOME 2 Desktop.
 maintainers	olegb@opendarwin.org
 categories	gnome
 platforms	darwin 
 homepage	http://www.gnome.org/
-master_sites    gnome:sources/gnome-panel/2.2/
-checksums	md5 0fffc658f22e367ba33997dcf180ef17
-patchfiles	patch_clock.c 
-depends_lib	lib:libpoll:poll-emulator lib:libgnome-desktop-2:gnome-desktop \
-		lib:libgdk_pixbuf:gdk-pixbuf
+master_sites    gnome:sources/gnome-panel/2.4/
+checksums	md5 bdef7c238e1d1eb7976f2bca3b0c8aca
+patchfiles	patch_egg-screen-exec.c patch2_egg-screen-exec.c
+depends_lib	lib:libpoll:poll-emulator lib:libwnck:libwnck 
 use_bzip2 	yes
 configure.args  --mandir=${prefix}/share/man
 configure.env   CPPFLAGS="-L${prefix}/lib -I${prefix}/include" \

diff --git a/gnome/gnome-panel/files/patch2_egg-screen-exec.c b/gnome/gnome-panel/files/patch2_egg-screen-exec.c
@@ -0,0 +1,15 @@
+--- applets/clock/egg-screen-exec.c.org	Wed Nov 26 16:09:48 2003
++++ applets/clock/egg-screen-exec.c	Wed Nov 26 16:10:16 2003
+@@ -31,7 +31,12 @@
+ #include <gdk/gdkx.h>
+ #endif
+
++#ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++#elif
+ extern char **environ;
++#endif
+
+ /**
+  * egg_screen_exec_display_string:
diff --git a/gnome/gnome-panel/files/patch_clock.c b/gnome/gnome-panel/files/patch_clock.c
diff --git a/gnome/gnome-panel/files/patch_egg-screen-exec.c b/gnome/gnome-panel/files/patch_egg-screen-exec.c
@@ -0,0 +1,15 @@
+--- gnome-panel/egg-screen-exec.c.org	Wed Nov 26 07:53:16 2003
++++ gnome-panel/egg-screen-exec.c	Wed Nov 26 07:54:06 2003
+@@ -31,7 +31,12 @@
+ #include <gdk/gdkx.h>
+ #endif
+
++#ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++#elif
+ extern char **environ;
++#endif
+
+ /**
+  * egg_screen_exec_display_string:
diff --git a/gnome/gnome-session/Portfile b/gnome/gnome-session/Portfile
@@ -1,7 +1,7 @@
-# $Id: Portfile,v 1.7 2003/10/20 18:46:17 olegb Exp $
+# $Id: Portfile,v 1.8 2003/12/05 22:51:32 olegb Exp $
 PortSystem 1.0
 name		gnome-session
-version		2.2.2
+version		2.4.1
 description	Session component for the GNOME 2 desktop
 long_description        Session component for the GNOME 2.0 desktop. \
 			This package contains the commands needed to \
@@ -10,8 +10,8 @@ maintainers	olegb@opendarwin.org
 categories	gnome
 platforms	darwin 
 homepage	http://www.gnome.org/
-master_sites    gnome:sources/gnome-session/2.2/
-checksums	md5 7dcfea0d925ddecb7c9700ddf597b17c
+master_sites    gnome:sources/gnome-session/2.4/
+checksums	md5 da92740dd8a7f316b2bc4a295fd94136
 depends_lib	lib:gnome-panel:gnome-panel
 use_bzip2 	yes
 configure.args  --mandir=${prefix}/share/man

diff --git a/gnome/gnome-utils/Portfile b/gnome/gnome-utils/Portfile
@@ -1,16 +1,16 @@
-# $Id: Portfile,v 1.8 2003/10/20 18:46:56 olegb Exp $
+# $Id: Portfile,v 1.9 2003/12/05 22:52:55 olegb Exp $
 PortSystem 1.0
 name		gnome-utils
-version		2.2.3
+version		2.4.1
 description	Session component for the GNOME 2 desktop
 long_description        Session component for the GNOME 2.0 desktop.
 maintainers	olegb@opendarwin.org
 categories	gnome
 platforms	darwin 
 homepage	http://www.gnome.org/
-master_sites    gnome:sources/gnome-utils/2.2/
-checksums	md5 2bde68d39e135a99dfd308a7ec7b6c4a
-depends_lib     lib:libgnome-desktop-2:gnome-desktop
+master_sites    gnome:sources/gnome-utils/2.4/
+checksums	md5 8512eed7ce0d291d4d8a9ddabceaa23b
+depends_lib     lib:gnome-session:gnome-session
 patchfiles	patch_logrtns.h patch_log_repaint.c patch_logrtns.c
 use_bzip2 	yes
 configure.args  --mandir=${prefix}/share/man

diff --git a/gnome/libgnomeprint/Portfile b/gnome/libgnomeprint/Portfile
@@ -1,16 +1,16 @@
-# $Id: Portfile,v 1.3 2003/10/20 18:52:40 olegb Exp $
+# $Id: Portfile,v 1.4 2003/12/05 23:01:28 olegb Exp $
 PortSystem 1.0
 name		libgnomeprint
-version		2.2.1.3
+version		2.4.0
 description	This is an implementation of the Gnome Printing Architecture
 long_description       	This is an implementation of the Gnome Printing \
 			Architecture
 maintainers	olegb@opendarwin.org
 categories	gnome
 platforms	darwin 
 homepage	http://www.levien.com/gnome/print-arch.html
-master_sites    gnome:sources/libgnomeprint/2.2/
-checksums	md5 36c7db0cd889767a327f118430a13317
+master_sites    gnome:sources/libgnomeprint/2.4/
+checksums	md5 05e1b57696507b9d69375f4de262e24e
 patchfiles	patch_gnome-print.c
 depends_lib	lib:libeel:eel lib:cups:cups-headers
 use_bzip2 	yes