4 files changed, 30 insertions, 20 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index cc476664cc1b..9b755c3a2989 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/Makefile,v 1.110 2007/10/17 21:36:13 mezz Exp $
+#   $MCom: ports/x11/libgnome/Makefile,v 1.115 2008/03/10 15:39:00 ahze Exp $
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.20.1.1
-PORTREVISION?=	1
+PORTVERSION=	2.22.0
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +17,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libraries for GNOME, a GNU desktop environment
 
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
@@ -25,12 +25,11 @@ BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_GETTEXT=	yes
-USE_XPM=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack esound \
-		gnomevfs2 libxslt ltverhack referencehack
+USE_GNOME=	gnomeprefix gnomehack intlhack esound libbonobo \
+		gnomevfs2 ltverhack referencehack
 USE_BISON=	build
-USE_XLIB=	yes
+USE_XORG=	xpm
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -42,19 +41,21 @@ MAN7=		gnome-options.7
 
 GCONF_SCHEMAS=	desktop_gnome_accessibility_keyboard.schemas \
 		desktop_gnome_accessibility_startup.schemas \
+		desktop_gnome_applications_at_mobility.schemas \
+		desktop_gnome_applications_at_visual.schemas \
 		desktop_gnome_applications_browser.schemas \
-		desktop_gnome_applications_help_viewer.schemas \
+		desktop_gnome_applications_office.schemas \
 		desktop_gnome_applications_terminal.schemas \
 		desktop_gnome_applications_window_manager.schemas \
 		desktop_gnome_background.schemas \
 		desktop_gnome_file_views.schemas \
-		desktop_gnome_interface.schemas desktop_gnome_lockdown.schemas \
+		desktop_gnome_interface.schemas \
+		desktop_gnome_lockdown.schemas \
 		desktop_gnome_peripherals_keyboard.schemas \
 		desktop_gnome_peripherals_mouse.schemas \
-		desktop_gnome_sound.schemas desktop_gnome_thumbnailers.schemas \
-		desktop_gnome_typing_break.schemas \
-		desktop_gnome_applications_at_mobility.schemas \
-		desktop_gnome_applications_at_visual.schemas
+		desktop_gnome_sound.schemas \
+		desktop_gnome_thumbnailers.schemas \
+		desktop_gnome_typing_break.schemas
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 0d26b855320a..24ddd0fdd860 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnome-2.20.1.1.tar.bz2) = cfab025a8b9a19cdae1c64f8b005c513
-SHA256 (gnome2/libgnome-2.20.1.1.tar.bz2) = d5b66f1beeefe3b61b654fa4d9c35b642fd73e310da1dd241e0ccb99dc93adec
-SIZE (gnome2/libgnome-2.20.1.1.tar.bz2) = 1370144
+MD5 (gnome2/libgnome-2.22.0.tar.gz) = 556dea8d920cb0a20a852ea36c28b58b
+SHA256 (gnome2/libgnome-2.22.0.tar.gz) = 5992dcdc6fc0f5385c9b1e6254b7a9c1fb14dc6c53f24a029c818d6519407085
+SIZE (gnome2/libgnome-2.22.0.tar.gz) = 1954010
diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in
index 37c981693b8b..7d848a121482 100644
--- a/x11/libgnome/files/pkg-deinstall.in
+++ b/x11/libgnome/files/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.12 2007/04/26 14:17:52 ahze Exp $
+#   $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.14 2008/01/28 17:41:05 mezz Exp $
 #
 # Restore gconf keys of gnomevfs2.
 
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 47b38ad06555..cd55ecea0376 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -51,6 +51,7 @@ share/locale/eu/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
+share/locale/fur/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ga/LC_MESSAGES/libgnome-2.0.mo
 share/locale/gl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/gu/LC_MESSAGES/libgnome-2.0.mo
@@ -71,6 +72,7 @@ share/locale/mg/LC_MESSAGES/libgnome-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ml/LC_MESSAGES/libgnome-2.0.mo
 share/locale/mn/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mr/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nb/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ne/LC_MESSAGES/libgnome-2.0.mo
@@ -85,6 +87,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ro/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnome-2.0.mo
 share/locale/rw/LC_MESSAGES/libgnome-2.0.mo
+share/locale/si/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sq/LC_MESSAGES/libgnome-2.0.mo
@@ -105,8 +108,8 @@ share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 share/pixmaps/backgrounds/gnome/background-default.jpg
-@dirrm share/pixmaps/backgrounds/gnome
-@dirrm share/pixmaps/backgrounds
+@dirrmtry share/pixmaps/backgrounds/gnome
+@dirrmtry share/pixmaps/backgrounds
 @dirrmtry share/gnome-background-properties
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
@@ -120,14 +123,20 @@ share/pixmaps/backgrounds/gnome/background-default.jpg
 @dirrmtry share/locale/tt
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES