4 files changed, 14 insertions, 30 deletions

diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index e025fd4692a7..b7591930937d 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -6,26 +6,21 @@
 #
 
 PORTNAME=	glade2
-PORTVERSION=	1.1.3
-PORTREVISION=	2
+PORTVERSION=	2.0.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.1
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
 DISTNAME=	glade-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A user interface builder for GTK+/GNOME
 
-LIB_DEPENDS=	gnomedb-2.2:${PORTSDIR}/databases/libgnomedb \
-		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
-USE_GNOMENG=	ues
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gnomedb libgnomeui
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo
index 18f2492724c7..7e7e36312a32 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/glade-1.1.3.tar.bz2) = ceb1fb626e4fa676b8b458aa422c7d22
+MD5 (gnome2/glade-2.0.0.tar.bz2) = 16b685dca1064a950d9f506b669cf859
diff --git a/devel/glade2/files/patch-glade_gnome-db_gnomedbsqleditor.c b/devel/glade2/files/patch-glade_gnome-db_gnomedbsqleditor.c
deleted file mode 100644
index ecec2b4b7765..000000000000
--- a/devel/glade2/files/patch-glade_gnome-db_gnomedbsqleditor.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- glade/gnome-db/gnomedbsqleditor.c.orig	Sun Feb  9 15:13:09 2003
-+++ glade/gnome-db/gnomedbsqleditor.c	Sun Feb  9 15:17:23 2003
-@@ -19,7 +19,8 @@
- #include <config.h>
- 
- #include <gtk/gtk.h>
--#include <libgnomedb/gnome-db-sql-editor.h>
-+#include <libgnomedb/gnome-db-editor.h>
-+
- #include "../gb.h"
- 
- /* Include the 21x21 icon pixmap for this widget, to be used in the palette */
-@@ -137,7 +138,7 @@
- {
-   /* Initialise the GTK type */
-   volatile GtkType type;
--  type = gnome_db_sql_editor_get_type();
-+  type = gnome_db_editor_get_type();
- 
-   /* Initialize the GbWidget structure */
-   gb_widget_init_struct(&gbwidget);
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index fb501c40d0dd..64ac686a72c7 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -21,15 +21,21 @@ share/gnome/help/glade-2/C/glade-faq.xml
 share/gnome/help/glade-2/C/glade-turbo-start.xml
 share/gnome/help/glade-2/C/glade-user-guide.xml
 share/gnome/help/glade-2/C/legal.xml
+share/gnome/help/glade-2/ro/glade-faq.xml
+share/gnome/help/glade-2/ro/legal.xml
 share/gnome/omf/glade-2/glade-faq-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/glade-2/glade-faq-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/glade-2/glade-faq-ro.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/glade-2/glade-faq-ro.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/glade-2/glade-turbo-start-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/glade-2/glade-turbo-start-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/glade-2/glade-user-guide-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/glade-2/glade-user-guide-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/glade-2.png
 share/gnome/pixmaps/glade-2/glade_logo.png
+share/locale/am/LC_MESSAGES/glade-2.0.mo
 share/locale/az/LC_MESSAGES/glade-2.0.mo
+share/locale/be/LC_MESSAGES/glade-2.0.mo
 share/locale/ca/LC_MESSAGES/glade-2.0.mo
 share/locale/cs/LC_MESSAGES/glade-2.0.mo
 share/locale/da/LC_MESSAGES/glade-2.0.mo
@@ -45,6 +51,7 @@ share/locale/it/LC_MESSAGES/glade-2.0.mo
 share/locale/ja/LC_MESSAGES/glade-2.0.mo
 share/locale/ko/LC_MESSAGES/glade-2.0.mo
 share/locale/lv/LC_MESSAGES/glade-2.0.mo
+share/locale/nl/LC_MESSAGES/glade-2.0.mo
 share/locale/nn/LC_MESSAGES/glade-2.0.mo
 share/locale/no/LC_MESSAGES/glade-2.0.mo
 share/locale/pl/LC_MESSAGES/glade-2.0.mo
@@ -57,11 +64,14 @@ share/locale/sv/LC_MESSAGES/glade-2.0.mo
 share/locale/tr/LC_MESSAGES/glade-2.0.mo
 share/locale/uk/LC_MESSAGES/glade-2.0.mo
 share/locale/vi/LC_MESSAGES/glade-2.0.mo
+share/locale/yi/LC_MESSAGES/glade-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/glade-2.0.mo
 @dirrm share/gnome/pixmaps/glade-2
 @dirrm share/gnome/omf/glade-2
 @dirrm share/gnome/help/glade-2/C/figures
 @dirrm share/gnome/help/glade-2/C
+@dirrm share/gnome/help/glade-2/ro/figures
+@dirrm share/gnome/help/glade-2/ro
 @dirrm share/gnome/help/glade-2
 @dirrm share/gnome/glade-2/gtk
 @dirrm share/gnome/glade-2