4 files changed, 35 insertions, 68 deletions

diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 8ae160c83395..e25f33c070e9 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.4
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -26,12 +26,10 @@ USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=	gnome-about.1
 
-post-patch:
-	@${REINPLACE_CMD} -E -e 's|GNOME_VENDOR=.*$$|GNOME_VENDOR="FreeBSD GNOME Project"|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 1ef3d1c22b0e..9c50bf9f39fb 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.2.2.tar.bz2) = 335e6109abc5a04e69ab574464af1900
+MD5 (gnome2/gnome-desktop-2.4.0.tar.bz2) = 183c14d192bdd41bd34578e8e7dc55f1
diff --git a/x11/gnomedesktop/files/patch-configure b/x11/gnomedesktop/files/patch-configure
index 943558a25604..caf5b493a9eb 100644
--- a/x11/gnomedesktop/files/patch-configure
+++ b/x11/gnomedesktop/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Mar 10 16:54:58 2003
-+++ configure	Sun Apr  6 16:11:00 2003
-@@ -7987,6 +7987,7 @@
+--- configure.orig	Sun May  4 06:56:20 2003
++++ configure	Sun May  4 19:20:27 2003
+@@ -8374,6 +8374,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index 2cd64cb14824..ac57d75634de 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -6,61 +6,46 @@ lib/libgnome-desktop-2.a
 lib/libgnome-desktop-2.so
 lib/libgnome-desktop-2.so.3
 libdata/pkgconfig/gnome-desktop-2.0.pc
-share/gnome/gnome-about/contributors.dat
+share/gnome/gnome-about/gnome-64.gif
 share/gnome/gnome-about/gnome-version.xml
+share/gnome/gnome-about/headers/header-bg-ancient01a.png
+share/gnome/gnome-about/headers/header-bg-city01.png
+share/gnome/gnome-about/headers/header-bg-clouds01.png
+share/gnome/gnome-about/headers/header-bg-clouds02.png
+share/gnome/gnome-about/headers/header-bg-hills01.png
+share/gnome/gnome-about/headers/header-bg-landscape01.png
+share/gnome/gnome-about/headers/header-bg-mountains01.png
+share/gnome/gnome-about/headers/header-bg-snow01.png
+share/gnome/gnome-about/headers/header-bg-sunset01.png
 share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
 share/gnome/help/lgpl/C/lgpl.xml
-share/gnome/vfolders/Accessories.directory
-share/gnome/vfolders/Applications.directory
-share/gnome/vfolders/Development.directory
-share/gnome/vfolders/Games.directory
-share/gnome/vfolders/Graphics.directory
-share/gnome/vfolders/Internet.directory
-share/gnome/vfolders/Multimedia.directory
-share/gnome/vfolders/Office.directory
-share/gnome/vfolders/Root.directory
-share/gnome/vfolders/Settings.directory
-share/gnome/vfolders/System.directory
 share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
-share/gnome/pixmaps/cdeappmenu.png
-share/gnome/pixmaps/gnome-amusements.png
 share/gnome/pixmaps/gnome-aorta.png
 share/gnome/pixmaps/gnome-applets.png
 share/gnome/pixmaps/gnome-applications.png
-share/gnome/pixmaps/gnome-audio2.png
+share/gnome/pixmaps/gnome-background-image.png
+share/gnome/pixmaps/gnome-background-pattern.png
 share/gnome/pixmaps/gnome-background.png
 share/gnome/pixmaps/gnome-calc2.png
 share/gnome/pixmaps/gnome-calc3.png
 share/gnome/pixmaps/gnome-calendar.png
-share/gnome/pixmaps/gnome-cardgame.png
 share/gnome/pixmaps/gnome-ccbackground.png
 share/gnome/pixmaps/gnome-ccdesktop.png
 share/gnome/pixmaps/gnome-ccdialog.png
-share/gnome/pixmaps/gnome-cckeyboard-bell.png
-share/gnome/pixmaps/gnome-cckeyboard.png
 share/gnome/pixmaps/gnome-ccmime.png
 share/gnome/pixmaps/gnome-ccperiph.png
 share/gnome/pixmaps/gnome-ccscreensaver.png
-share/gnome/pixmaps/gnome-ccthemes.png
 share/gnome/pixmaps/gnome-ccwindowmanager.png
-share/gnome/pixmaps/gnome-clock.png
 share/gnome/pixmaps/gnome-color-browser.png
 share/gnome/pixmaps/gnome-color-xterm.png
 share/gnome/pixmaps/gnome-computer.png
 share/gnome/pixmaps/gnome-cromagnon.png
 share/gnome/pixmaps/gnome-day.png
 share/gnome/pixmaps/gnome-debian.png
-share/gnome/pixmaps/gnome-devel.png
-share/gnome/pixmaps/gnome-die1.png
-share/gnome/pixmaps/gnome-die2.png
-share/gnome/pixmaps/gnome-die3.png
-share/gnome/pixmaps/gnome-die4.png
-share/gnome/pixmaps/gnome-die5.png
-share/gnome/pixmaps/gnome-die6.png
 share/gnome/pixmaps/gnome-diskfree.png
 share/gnome/pixmaps/gnome-emacs.png
 share/gnome/pixmaps/gnome-eterm.png
@@ -68,27 +53,17 @@ share/gnome/pixmaps/gnome-favorites.png
 share/gnome/pixmaps/gnome-file-c.png
 share/gnome/pixmaps/gnome-file-h.png
 share/gnome/pixmaps/gnome-folder.png
-share/gnome/pixmaps/gnome-gegl.png
-share/gnome/pixmaps/gnome-gegl2-2.png
-share/gnome/pixmaps/gnome-gegl2.png
 share/gnome/pixmaps/gnome-gemvt.png
 share/gnome/pixmaps/gnome-gimp.png
-share/gnome/pixmaps/gnome-globe.png
 share/gnome/pixmaps/gnome-gmenu.png
 share/gnome/pixmaps/gnome-gmush.png
-share/gnome/pixmaps/gnome-gnomine.png
 share/gnome/pixmaps/gnome-gnomoku.png
-share/gnome/pixmaps/gnome-graphics.png
-share/gnome/pixmaps/gnome-gsame.png
-share/gnome/pixmaps/gnome-help.png
 share/gnome/pixmaps/gnome-home.png
 share/gnome/pixmaps/gnome-html.png
 share/gnome/pixmaps/gnome-image-gif.png
 share/gnome/pixmaps/gnome-image-jpeg.png
 share/gnome/pixmaps/gnome-irc.png
-share/gnome/pixmaps/gnome-joystick.png
 share/gnome/pixmaps/gnome-laptop.png
-share/gnome/pixmaps/gnome-lockscreen.png
 share/gnome/pixmaps/gnome-log.png
 share/gnome/pixmaps/gnome-logo-icon-transparent.png
 share/gnome/pixmaps/gnome-logo-icon.png
@@ -101,26 +76,15 @@ share/gnome/pixmaps/gnome-money.png
 share/gnome/pixmaps/gnome-monitor.png
 share/gnome/pixmaps/gnome-month.png
 share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-multimedia.png
 share/gnome/pixmaps/gnome-networktool.png
 share/gnome/pixmaps/gnome-news.png
 share/gnome/pixmaps/gnome-note.png
-share/gnome/pixmaps/gnome-panel-type-corner.png
-share/gnome/pixmaps/gnome-panel-type-edge.png
-share/gnome/pixmaps/gnome-panel-type-floating.png
-share/gnome/pixmaps/gnome-panel-type-menu.png
-share/gnome/pixmaps/gnome-panel-type-sliding.png
-share/gnome/pixmaps/gnome-panel.png
 share/gnome/pixmaps/gnome-qeye.png
-share/gnome/pixmaps/gnome-run.png
-share/gnome/pixmaps/gnome-screenshot.png
 share/gnome/pixmaps/gnome-session.png
 share/gnome/pixmaps/gnome-set-time.png
-share/gnome/pixmaps/gnome-settings.png
 share/gnome/pixmaps/gnome-spider.png
 share/gnome/pixmaps/gnome-squeak.png
 share/gnome/pixmaps/gnome-suse.png
-share/gnome/pixmaps/gnome-system.png
 share/gnome/pixmaps/gnome-talk.png
 share/gnome/pixmaps/gnome-term-linux.png
 share/gnome/pixmaps/gnome-term-linux2.png
@@ -129,7 +93,6 @@ share/gnome/pixmaps/gnome-term-tiger.png
 share/gnome/pixmaps/gnome-term.png
 share/gnome/pixmaps/gnome-tigert.png
 share/gnome/pixmaps/gnome-touristinfo.png
-share/gnome/pixmaps/gnome-unknown.png
 share/gnome/pixmaps/gnome-user-interface.png
 share/gnome/pixmaps/gnome-util.png
 share/gnome/pixmaps/gnome-week.png
@@ -141,17 +104,19 @@ share/gnome/pixmaps/gtkvim.png
 share/gnome/pixmaps/kterm.xpm
 share/gnome/pixmaps/launcher-program.png
 share/gnome/pixmaps/monitor.png
-share/gnome/pixmaps/panel-arrow-down.png
-share/gnome/pixmaps/panel-arrow-left.png
-share/gnome/pixmaps/panel-arrow-right.png
-share/gnome/pixmaps/panel-arrow-up.png
-share/gnome/pixmaps/panel-corner-left.png
-share/gnome/pixmaps/panel-corner-right.png
-share/gnome/pixmaps/panel-drawer.png
-share/gnome/pixmaps/panel-folder.png
-share/gnome/pixmaps/panel-knob.png
-share/gnome/pixmaps/panel-menu-main.png
 share/gnome/pixmaps/vnterm.xpm
+share/gnome/vfolders/Accessories.directory
+share/gnome/vfolders/Applications.directory
+share/gnome/vfolders/Development.directory
+share/gnome/vfolders/Games.directory
+share/gnome/vfolders/Graphics.directory
+share/gnome/vfolders/Internet.directory
+share/gnome/vfolders/Multimedia.directory
+share/gnome/vfolders/Office.directory
+share/gnome/vfolders/Other.directory
+share/gnome/vfolders/Root.directory
+share/gnome/vfolders/Settings.directory
+share/gnome/vfolders/System.directory
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -161,6 +126,7 @@ share/locale/bn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -183,12 +149,14 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -218,6 +186,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
 @dirrm share/gnome/help/fdl/C/figures
+@dirrm share/gnome/gnome-about/headers
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0