Update to 2.3.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@785 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 17 insertions, 58 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index bfea0d821..57f6d6ec1 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.3
@@ -27,12 +27,13 @@ USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=	gnome-about.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|GNOME_DISTRIBUTOR=.*$$|GNOME_DISTRIBUTOR="FreeBSD GNOME Project"| ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index cd019840a..8e4e2b8f9 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.3.1.tar.bz2) = 54d402502143a613f3c6bdc9a07a6875
+MD5 (gnome2/gnome-desktop-2.3.2.tar.bz2) = 33c0aa6ea720f83ba9dc709b2870613c
diff --git a/x11/gnome-desktop/files/patch-configure b/x11/gnome-desktop/files/patch-configure
index 2e964601d..caf5b493a 100644
--- a/x11/gnome-desktop/files/patch-configure
+++ b/x11/gnome-desktop/files/patch-configure
@@ -8,12 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8559,7 +8560,7 @@
- GNOME_PLATFORM=2
- GNOME_MINOR=3
- GNOME_MICRO=1
--GNOME_DISTRIBUTOR="GNOME.Org"
-+GNOME_DISTRIBUTOR="FreeBSD GNOME Project"
- GNOME_DATE="4th May,2003"
- 
- 
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 477f5df91..d3cfb7b67 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -12,22 +12,9 @@ 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
@@ -36,7 +23,6 @@ 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
@@ -47,7 +33,6 @@ 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
@@ -55,12 +40,6 @@ 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,18 +47,13 @@ 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
@@ -88,7 +62,6 @@ 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
@@ -105,15 +78,7 @@ 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
@@ -141,17 +106,18 @@ 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/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 +127,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
@@ -199,9 +166,9 @@ share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/sp/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo