Update to 0.6.3.

16 files changed, 224 insertions, 256 deletions

diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 3958fe5e4b48..1cd16285ede5 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	glade
-PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTVERSION=	0.6.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/glade
@@ -16,17 +15,18 @@ MAINTAINER=	gnome@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bonobo --enable-gnome-db
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/libs"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/devel/glade/distinfo b/devel/glade/distinfo
index 2c8c82ce8f60..1e0ec8816b61 100644
--- a/devel/glade/distinfo
+++ b/devel/glade/distinfo
@@ -1 +1 @@
-MD5 (glade-0.6.2.tar.gz) = 261c9a48441d2a884654b11a79c220ee
+MD5 (glade-0.6.3.tar.gz) = 662247a959c37892acaceceb341b2e76
diff --git a/devel/glade/files/patch-glade::gnome-db::gnomedberror.c b/devel/glade/files/patch-glade::gnome-db::gnomedberror.c
deleted file mode 100644
index 7c8503f1bf44..000000000000
--- a/devel/glade/files/patch-glade::gnome-db::gnomedberror.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- glade/gnome-db/gnomedberror.c	2001/08/13 09:43:59	1.1
-+++ glade/gnome-db/gnomedberror.c	2001/08/13 09:44:25
-@@ -46,7 +46,7 @@
- static GtkWidget*
- gb_gnome_db_error_new (GbWidgetNewData *data)
- {
--  return gnome_db_error_new (NULL);
-+  return gnome_db_error_new ();
- }
- 
- 
diff --git a/devel/glade/files/patch-glade::gnome-db::gnomedberrordlg.c b/devel/glade/files/patch-glade::gnome-db::gnomedberrordlg.c
index 30a626b9ccec..11dbae3da729 100644
--- a/devel/glade/files/patch-glade::gnome-db::gnomedberrordlg.c
+++ b/devel/glade/files/patch-glade::gnome-db::gnomedberrordlg.c
@@ -1,32 +1,14 @@
 
 $FreeBSD$
 
---- glade/gnome-db/gnomedberrordlg.c	2001/08/13 09:48:33	1.1
-+++ glade/gnome-db/gnomedberrordlg.c	2001/08/13 09:52:31
-@@ -60,7 +60,7 @@
-   GtkWidget *widget;
-   GList *elem;
- 
--  widget = gnome_db_errordlg_new (NULL, _("Error"));
-+  widget = gnome_db_error_dialog_new (_("Error"));
- 
-   /* Stop the normal dismiss operation since it can cause a crash. */
-   elem = g_list_nth (GNOME_DIALOG (widget)->buttons, 2);
+--- glade/gnome-db/gnomedberrordlg.c	2002/01/28 13:15:07	1.1
++++ glade/gnome-db/gnomedberrordlg.c	2002/01/28 13:14:41
 @@ -155,7 +155,7 @@
        gchar *title;
  
        title = GTK_WINDOW (widget)->title;
--      source_add (data, "  %s = gnome_db_errordlg_new (NULL, %s);\n",
+-      source_add (data, "  %s = gnome_db_error_dialog_new (NULL, %s);\n",
 +      source_add (data, "  %s = gnome_db_error_dialog_new (%s);\n",
  		  data->wname,
  		  title ? source_make_string (title, data->use_gettext)
  		        : "NULL");
-@@ -182,7 +182,7 @@
- gb_gnome_db_errordlg_init ()
- {
-   /* Initialise the GTK type */
--  gnome_db_errordlg_get_type();
-+  gnome_db_error_dialog_get_type();
- 
-   /* Initialize the GbWidget structure */
-   gb_widget_init_struct(&gbwidget);
diff --git a/devel/glade/files/patch-glade::gnome-db::gnomedblogin.c b/devel/glade/files/patch-glade::gnome-db::gnomedblogin.c
index 43a32241cd25..cc0b6d892603 100644
--- a/devel/glade/files/patch-glade::gnome-db::gnomedblogin.c
+++ b/devel/glade/files/patch-glade::gnome-db::gnomedblogin.c
@@ -1,12 +1,14 @@
---- glade/gnome-db/gnomedblogin.c.orig	Sat Aug  5 06:37:50 2000
-+++ glade/gnome-db/gnomedblogin.c	Tue Jun 19 06:06:48 2001
-@@ -48,3 +48,3 @@
+
+$FreeBSD$
+
+--- glade/gnome-db/gnomedblogin.c	2002/01/28 13:18:44	1.1
++++ glade/gnome-db/gnomedblogin.c	2002/01/28 13:19:07
+@@ -117,7 +117,7 @@
  {
--  return gnome_db_login_new (NULL, NULL, NULL);
-+  return gnome_db_login_new (NULL);
- }
-@@ -119,3 +119,3 @@
+   if (data->create_widget)
      {
 -      source_add (data, "  %s = gnome_db_login_new (NULL, NULL, NULL);\n",
 +      source_add (data, "  %s = gnome_db_login_new (NULL);\n",
  		  data->wname);
+     }
+   gb_widget_write_standard_source (widget, data);
diff --git a/devel/glade/files/patch-glade::gnome-db::gnomedblogindlg.c b/devel/glade/files/patch-glade::gnome-db::gnomedblogindlg.c
deleted file mode 100644
index 3d8bc414dd82..000000000000
--- a/devel/glade/files/patch-glade::gnome-db::gnomedblogindlg.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- glade/gnome-db/gnomedblogindlg.c.orig	Sat Aug  5 06:37:50 2000
-+++ glade/gnome-db/gnomedblogindlg.c	Tue Jun 19 06:08:28 2001
-@@ -62,3 +62,3 @@
- 
--  login = gnome_db_login_new (NULL, NULL, NULL);
-+  login = gnome_db_login_new (NULL);
- 
-@@ -159,3 +159,3 @@
-       title = GTK_WINDOW (widget)->title;
--      source_add (data, "  %s = gnome_db_logindlg_new (GNOME_DB_LOGIN (gnome_db_login_new (NULL, NULL, NULL)), %s);\n",
-+      source_add (data, "  %s = gnome_db_logindlg_new (GNOME_DB_LOGIN (gnome_db_login_new (NULL)), %s);\n",
- 		  data->wname,
diff --git a/devel/glade/files/patch-ltmain.sh b/devel/glade/files/patch-ltmain.sh
new file mode 100644
index 000000000000..3284d88e43f0
--- /dev/null
+++ b/devel/glade/files/patch-ltmain.sh
@@ -0,0 +1,42 @@
+
+$FreeBSD$
+
+--- ltmain.sh.orig	Sun Jan 20 16:11:07 2002
++++ ltmain.sh	Thu Jan 24 17:07:06 2002
+@@ -1058,8 +1058,13 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compiler_flags="$compiler_flags -pthread"
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2442,6 +2447,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4208,10 +4216,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist
index c022bb36d2cd..faf92e19355f 100644
--- a/devel/glade/pkg-plist
+++ b/devel/glade/pkg-plist
@@ -27,41 +27,8 @@ share/gnome/glade/gnome/gperf-check.m4
 share/gnome/glade/gnome/linger.m4
 share/gnome/glade/gnome/need-declaration.m4
 share/gnome/glade/gtk/autogen.sh
-share/gnome/help/glade/C/faq/docbook.css
-share/gnome/help/glade/C/faq/index.html
-share/gnome/help/glade/C/faq/faq.sgml
-share/gnome/help/glade/C/faq/ln7.html
-share/gnome/help/glade/C/faq/stylesheet-images/caution.gif
-share/gnome/help/glade/C/faq/stylesheet-images/home.gif
-share/gnome/help/glade/C/faq/stylesheet-images/important.gif
-share/gnome/help/glade/C/faq/stylesheet-images/next.gif
-share/gnome/help/glade/C/faq/stylesheet-images/note.gif
-share/gnome/help/glade/C/faq/stylesheet-images/prev.gif
-share/gnome/help/glade/C/faq/stylesheet-images/tip.gif
-share/gnome/help/glade/C/faq/stylesheet-images/toc-blank.gif
-share/gnome/help/glade/C/faq/stylesheet-images/toc-minus.gif
-share/gnome/help/glade/C/faq/stylesheet-images/toc-plus.gif
-share/gnome/help/glade/C/faq/stylesheet-images/up.gif
-share/gnome/help/glade/C/faq/stylesheet-images/warning.gif
 share/gnome/help/glade/C/topic.dat
-share/gnome/help/glade/C/turbo-start/docbook.css
-share/gnome/help/glade/C/turbo-start/index.html
-share/gnome/help/glade/C/turbo-start/ln7.html
-share/gnome/help/glade/C/turbo-start/stylesheet-images/caution.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/home.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/important.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/next.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/note.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/prev.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/tip.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-blank.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-minus.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-plus.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/up.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/warning.gif
-share/gnome/help/glade/C/turbo-start/turbo-start.sgml
 share/gnome/help/glade/C/user-guide/authors.html
-share/gnome/help/glade/C/user-guide/docbook.css
 share/gnome/help/glade/C/user-guide/edit-menu.html
 share/gnome/help/glade/C/user-guide/helloworld.html
 share/gnome/help/glade/C/user-guide/help-menu.html
@@ -74,20 +41,7 @@ share/gnome/help/glade/C/user-guide/output.html
 share/gnome/help/glade/C/user-guide/project-options.html
 share/gnome/help/glade/C/user-guide/quickstart.html
 share/gnome/help/glade/C/user-guide/settings-menu.html
-share/gnome/help/glade/C/user-guide/stylesheet-images/caution.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/home.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/important.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/next.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/note.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/prev.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/tip.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/toc-blank.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/toc-minus.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/toc-plus.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/up.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/warning.gif
 share/gnome/help/glade/C/user-guide/toolbar.html
-share/gnome/help/glade/C/user-guide/user-guide.sgml
 share/gnome/help/glade/C/user-guide/user-guide-images/edit-menu.png
 share/gnome/help/glade/C/user-guide/user-guide-images/file-menu.png
 share/gnome/help/glade/C/user-guide/user-guide-images/grid-options.png
@@ -104,6 +58,7 @@ share/gnome/help/glade/C/user-guide/user-guide-images/window-main.png
 share/gnome/help/glade/C/user-guide/user-guide-images/window-palette-add.png
 share/gnome/help/glade/C/user-guide/user-guide-images/window-palette-basic.png
 share/gnome/help/glade/C/user-guide/user-guide-images/window-palette-gnome.png
+share/gnome/help/glade/C/user-guide/user-guide.sgml
 share/gnome/help/glade/C/user-guide/using.html
 share/gnome/help/glade/C/user-guide/view-menu.html
 share/gnome/help/glade/C/user-guide/windows-clipboard.html
@@ -113,25 +68,53 @@ share/gnome/help/glade/C/user-guide/windows-tree.html
 share/gnome/help/glade/C/user-guide/windows.html
 share/gnome/help/glade/C/user-guide/x225.html
 share/gnome/help/glade/C/user-guide/x324.html
-share/gnome/help/glade/it/faq/docbook.css            
-share/gnome/help/glade/it/faq/index.html            
-share/gnome/help/glade/it/faq/ln10.html            
-share/gnome/help/glade/it/faq/stylesheet-images/caution.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/home.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/important.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/next.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/note.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/prev.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/tip.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/toc-blank.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/toc-minus.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/toc-plus.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/up.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/warning.gif            
 share/gnome/help/glade/it/topic.dat
+share/gnome/help/glade/it/user-guide/authors.html
+share/gnome/help/glade/it/user-guide/edit-menu.html
+share/gnome/help/glade/it/user-guide/helloworld.html
+share/gnome/help/glade/it/user-guide/help-menu.html
+share/gnome/help/glade/it/user-guide/index.html
+share/gnome/help/glade/it/user-guide/introduction.html
+share/gnome/help/glade/it/user-guide/libglade.html
+share/gnome/help/glade/it/user-guide/ln7.html
+share/gnome/help/glade/it/user-guide/menus.html
+share/gnome/help/glade/it/user-guide/output.html
+share/gnome/help/glade/it/user-guide/project-options.html
+share/gnome/help/glade/it/user-guide/quickstart.html
+share/gnome/help/glade/it/user-guide/settings-menu.html
+share/gnome/help/glade/it/user-guide/toolbar.html
+share/gnome/help/glade/it/user-guide/user-guide-images/edit-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/file-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/grid-options.png
+share/gnome/help/glade/it/user-guide/user-guide-images/help-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/options-c.png
+share/gnome/help/glade/it/user-guide/user-guide-images/options-general.png
+share/gnome/help/glade/it/user-guide/user-guide-images/options-libglade.png
+share/gnome/help/glade/it/user-guide/user-guide-images/settings-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/snap-options.png
+share/gnome/help/glade/it/user-guide/user-guide-images/toolbar.png
+share/gnome/help/glade/it/user-guide/user-guide-images/view-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/window-main.png
+share/gnome/help/glade/it/user-guide/user-guide-images/window-palette-add.png
+share/gnome/help/glade/it/user-guide/user-guide-images/window-palette-basic.png
+share/gnome/help/glade/it/user-guide/user-guide-images/window-palette-gnome.png
+share/gnome/help/glade/it/user-guide/user-guide.sgml
+share/gnome/help/glade/it/user-guide/using.html
+share/gnome/help/glade/it/user-guide/view-menu.html
+share/gnome/help/glade/it/user-guide/windows-clipboard.html
+share/gnome/help/glade/it/user-guide/windows-editor.html
+share/gnome/help/glade/it/user-guide/windows-palette.html
+share/gnome/help/glade/it/user-guide/windows-tree.html
+share/gnome/help/glade/it/user-guide/windows.html
+share/gnome/help/glade/it/user-guide/x225.html
+share/gnome/help/glade/it/user-guide/x324.html
 share/gnome/omf/glade/faq-C.omf
+share/gnome/omf/glade/faq-it.omf
 share/gnome/omf/glade/turbo-start-C.omf
+share/gnome/omf/glade/turbo-start-it.omf
 share/gnome/omf/glade/user-guide-C.omf
+share/gnome/omf/glade/user-guide-it.omf
 share/gnome/pixmaps/glade.png
 share/gnome/pixmaps/glade/glade_logo.png
 share/locale/az/LC_MESSAGES/glade.mo
@@ -149,26 +132,27 @@ share/locale/hu/LC_MESSAGES/glade.mo
 share/locale/it/LC_MESSAGES/glade.mo
 share/locale/ja/LC_MESSAGES/glade.mo
 share/locale/ko/LC_MESSAGES/glade.mo
+share/locale/lv/LC_MESSAGES/glade.mo
+share/locale/nl/LC_MESSAGES/glade.mo
+share/locale/nn/LC_MESSAGES/glade.mo
 share/locale/no/LC_MESSAGES/glade.mo
 share/locale/pl/LC_MESSAGES/glade.mo
+share/locale/pt/LC_MESSAGES/glade.mo
 share/locale/pt_BR/LC_MESSAGES/glade.mo
+share/locale/ro/LC_MESSAGES/glade.mo
 share/locale/ru/LC_MESSAGES/glade.mo
 share/locale/sk/LC_MESSAGES/glade.mo
 share/locale/sv/LC_MESSAGES/glade.mo
 share/locale/tr/LC_MESSAGES/glade.mo
 share/locale/uk/LC_MESSAGES/glade.mo
+share/locale/zh_CN/LC_MESSAGES/glade.mo
 @dirrm share/gnome/pixmaps/glade
 @dirrm share/gnome/omf/glade
+@dirrm share/gnome/help/glade/it/user-guide/user-guide-images
+@dirrm share/gnome/help/glade/it/user-guide
+@dirrm share/gnome/help/glade/it
 @dirrm share/gnome/help/glade/C/user-guide/user-guide-images
-@dirrm share/gnome/help/glade/C/user-guide/stylesheet-images
 @dirrm share/gnome/help/glade/C/user-guide
-@dirrm share/gnome/help/glade/C/turbo-start/stylesheet-images
-@dirrm share/gnome/help/glade/C/turbo-start
-@dirrm share/gnome/help/glade/it/faq/stylesheet-images
-@dirrm share/gnome/help/glade/it/faq
-@dirrm share/gnome/help/glade/it
-@dirrm share/gnome/help/glade/C/faq/stylesheet-images
-@dirrm share/gnome/help/glade/C/faq
 @dirrm share/gnome/help/glade/C
 @dirrm share/gnome/help/glade
 @dirrm share/gnome/glade/gtk
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 3958fe5e4b48..1cd16285ede5 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	glade
-PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTVERSION=	0.6.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/glade
@@ -16,17 +15,18 @@ MAINTAINER=	gnome@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bonobo --enable-gnome-db
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/libs"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo
index 2c8c82ce8f60..1e0ec8816b61 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1 +1 @@
-MD5 (glade-0.6.2.tar.gz) = 261c9a48441d2a884654b11a79c220ee
+MD5 (glade-0.6.3.tar.gz) = 662247a959c37892acaceceb341b2e76
diff --git a/devel/glade2/files/patch-glade::gnome-db::gnomedberror.c b/devel/glade2/files/patch-glade::gnome-db::gnomedberror.c
deleted file mode 100644
index 7c8503f1bf44..000000000000
--- a/devel/glade2/files/patch-glade::gnome-db::gnomedberror.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- glade/gnome-db/gnomedberror.c	2001/08/13 09:43:59	1.1
-+++ glade/gnome-db/gnomedberror.c	2001/08/13 09:44:25
-@@ -46,7 +46,7 @@
- static GtkWidget*
- gb_gnome_db_error_new (GbWidgetNewData *data)
- {
--  return gnome_db_error_new (NULL);
-+  return gnome_db_error_new ();
- }
- 
- 
diff --git a/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c b/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c
index 30a626b9ccec..11dbae3da729 100644
--- a/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c
+++ b/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c
@@ -1,32 +1,14 @@
 
 $FreeBSD$
 
---- glade/gnome-db/gnomedberrordlg.c	2001/08/13 09:48:33	1.1
-+++ glade/gnome-db/gnomedberrordlg.c	2001/08/13 09:52:31
-@@ -60,7 +60,7 @@
-   GtkWidget *widget;
-   GList *elem;
- 
--  widget = gnome_db_errordlg_new (NULL, _("Error"));
-+  widget = gnome_db_error_dialog_new (_("Error"));
- 
-   /* Stop the normal dismiss operation since it can cause a crash. */
-   elem = g_list_nth (GNOME_DIALOG (widget)->buttons, 2);
+--- glade/gnome-db/gnomedberrordlg.c	2002/01/28 13:15:07	1.1
++++ glade/gnome-db/gnomedberrordlg.c	2002/01/28 13:14:41
 @@ -155,7 +155,7 @@
        gchar *title;
  
        title = GTK_WINDOW (widget)->title;
--      source_add (data, "  %s = gnome_db_errordlg_new (NULL, %s);\n",
+-      source_add (data, "  %s = gnome_db_error_dialog_new (NULL, %s);\n",
 +      source_add (data, "  %s = gnome_db_error_dialog_new (%s);\n",
  		  data->wname,
  		  title ? source_make_string (title, data->use_gettext)
  		        : "NULL");
-@@ -182,7 +182,7 @@
- gb_gnome_db_errordlg_init ()
- {
-   /* Initialise the GTK type */
--  gnome_db_errordlg_get_type();
-+  gnome_db_error_dialog_get_type();
- 
-   /* Initialize the GbWidget structure */
-   gb_widget_init_struct(&gbwidget);
diff --git a/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c b/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c
index 43a32241cd25..cc0b6d892603 100644
--- a/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c
+++ b/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c
@@ -1,12 +1,14 @@
---- glade/gnome-db/gnomedblogin.c.orig	Sat Aug  5 06:37:50 2000
-+++ glade/gnome-db/gnomedblogin.c	Tue Jun 19 06:06:48 2001
-@@ -48,3 +48,3 @@
+
+$FreeBSD$
+
+--- glade/gnome-db/gnomedblogin.c	2002/01/28 13:18:44	1.1
++++ glade/gnome-db/gnomedblogin.c	2002/01/28 13:19:07
+@@ -117,7 +117,7 @@
  {
--  return gnome_db_login_new (NULL, NULL, NULL);
-+  return gnome_db_login_new (NULL);
- }
-@@ -119,3 +119,3 @@
+   if (data->create_widget)
      {
 -      source_add (data, "  %s = gnome_db_login_new (NULL, NULL, NULL);\n",
 +      source_add (data, "  %s = gnome_db_login_new (NULL);\n",
  		  data->wname);
+     }
+   gb_widget_write_standard_source (widget, data);
diff --git a/devel/glade2/files/patch-glade::gnome-db::gnomedblogindlg.c b/devel/glade2/files/patch-glade::gnome-db::gnomedblogindlg.c
deleted file mode 100644
index 3d8bc414dd82..000000000000
--- a/devel/glade2/files/patch-glade::gnome-db::gnomedblogindlg.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- glade/gnome-db/gnomedblogindlg.c.orig	Sat Aug  5 06:37:50 2000
-+++ glade/gnome-db/gnomedblogindlg.c	Tue Jun 19 06:08:28 2001
-@@ -62,3 +62,3 @@
- 
--  login = gnome_db_login_new (NULL, NULL, NULL);
-+  login = gnome_db_login_new (NULL);
- 
-@@ -159,3 +159,3 @@
-       title = GTK_WINDOW (widget)->title;
--      source_add (data, "  %s = gnome_db_logindlg_new (GNOME_DB_LOGIN (gnome_db_login_new (NULL, NULL, NULL)), %s);\n",
-+      source_add (data, "  %s = gnome_db_logindlg_new (GNOME_DB_LOGIN (gnome_db_login_new (NULL)), %s);\n",
- 		  data->wname,
diff --git a/devel/glade2/files/patch-ltmain.sh b/devel/glade2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..3284d88e43f0
--- /dev/null
+++ b/devel/glade2/files/patch-ltmain.sh
@@ -0,0 +1,42 @@
+
+$FreeBSD$
+
+--- ltmain.sh.orig	Sun Jan 20 16:11:07 2002
++++ ltmain.sh	Thu Jan 24 17:07:06 2002
+@@ -1058,8 +1058,13 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compiler_flags="$compiler_flags -pthread"
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2442,6 +2447,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4208,10 +4216,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index c022bb36d2cd..faf92e19355f 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -27,41 +27,8 @@ share/gnome/glade/gnome/gperf-check.m4
 share/gnome/glade/gnome/linger.m4
 share/gnome/glade/gnome/need-declaration.m4
 share/gnome/glade/gtk/autogen.sh
-share/gnome/help/glade/C/faq/docbook.css
-share/gnome/help/glade/C/faq/index.html
-share/gnome/help/glade/C/faq/faq.sgml
-share/gnome/help/glade/C/faq/ln7.html
-share/gnome/help/glade/C/faq/stylesheet-images/caution.gif
-share/gnome/help/glade/C/faq/stylesheet-images/home.gif
-share/gnome/help/glade/C/faq/stylesheet-images/important.gif
-share/gnome/help/glade/C/faq/stylesheet-images/next.gif
-share/gnome/help/glade/C/faq/stylesheet-images/note.gif
-share/gnome/help/glade/C/faq/stylesheet-images/prev.gif
-share/gnome/help/glade/C/faq/stylesheet-images/tip.gif
-share/gnome/help/glade/C/faq/stylesheet-images/toc-blank.gif
-share/gnome/help/glade/C/faq/stylesheet-images/toc-minus.gif
-share/gnome/help/glade/C/faq/stylesheet-images/toc-plus.gif
-share/gnome/help/glade/C/faq/stylesheet-images/up.gif
-share/gnome/help/glade/C/faq/stylesheet-images/warning.gif
 share/gnome/help/glade/C/topic.dat
-share/gnome/help/glade/C/turbo-start/docbook.css
-share/gnome/help/glade/C/turbo-start/index.html
-share/gnome/help/glade/C/turbo-start/ln7.html
-share/gnome/help/glade/C/turbo-start/stylesheet-images/caution.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/home.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/important.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/next.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/note.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/prev.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/tip.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-blank.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-minus.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-plus.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/up.gif
-share/gnome/help/glade/C/turbo-start/stylesheet-images/warning.gif
-share/gnome/help/glade/C/turbo-start/turbo-start.sgml
 share/gnome/help/glade/C/user-guide/authors.html
-share/gnome/help/glade/C/user-guide/docbook.css
 share/gnome/help/glade/C/user-guide/edit-menu.html
 share/gnome/help/glade/C/user-guide/helloworld.html
 share/gnome/help/glade/C/user-guide/help-menu.html
@@ -74,20 +41,7 @@ share/gnome/help/glade/C/user-guide/output.html
 share/gnome/help/glade/C/user-guide/project-options.html
 share/gnome/help/glade/C/user-guide/quickstart.html
 share/gnome/help/glade/C/user-guide/settings-menu.html
-share/gnome/help/glade/C/user-guide/stylesheet-images/caution.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/home.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/important.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/next.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/note.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/prev.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/tip.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/toc-blank.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/toc-minus.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/toc-plus.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/up.gif
-share/gnome/help/glade/C/user-guide/stylesheet-images/warning.gif
 share/gnome/help/glade/C/user-guide/toolbar.html
-share/gnome/help/glade/C/user-guide/user-guide.sgml
 share/gnome/help/glade/C/user-guide/user-guide-images/edit-menu.png
 share/gnome/help/glade/C/user-guide/user-guide-images/file-menu.png
 share/gnome/help/glade/C/user-guide/user-guide-images/grid-options.png
@@ -104,6 +58,7 @@ share/gnome/help/glade/C/user-guide/user-guide-images/window-main.png
 share/gnome/help/glade/C/user-guide/user-guide-images/window-palette-add.png
 share/gnome/help/glade/C/user-guide/user-guide-images/window-palette-basic.png
 share/gnome/help/glade/C/user-guide/user-guide-images/window-palette-gnome.png
+share/gnome/help/glade/C/user-guide/user-guide.sgml
 share/gnome/help/glade/C/user-guide/using.html
 share/gnome/help/glade/C/user-guide/view-menu.html
 share/gnome/help/glade/C/user-guide/windows-clipboard.html
@@ -113,25 +68,53 @@ share/gnome/help/glade/C/user-guide/windows-tree.html
 share/gnome/help/glade/C/user-guide/windows.html
 share/gnome/help/glade/C/user-guide/x225.html
 share/gnome/help/glade/C/user-guide/x324.html
-share/gnome/help/glade/it/faq/docbook.css            
-share/gnome/help/glade/it/faq/index.html            
-share/gnome/help/glade/it/faq/ln10.html            
-share/gnome/help/glade/it/faq/stylesheet-images/caution.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/home.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/important.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/next.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/note.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/prev.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/tip.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/toc-blank.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/toc-minus.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/toc-plus.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/up.gif            
-share/gnome/help/glade/it/faq/stylesheet-images/warning.gif            
 share/gnome/help/glade/it/topic.dat
+share/gnome/help/glade/it/user-guide/authors.html
+share/gnome/help/glade/it/user-guide/edit-menu.html
+share/gnome/help/glade/it/user-guide/helloworld.html
+share/gnome/help/glade/it/user-guide/help-menu.html
+share/gnome/help/glade/it/user-guide/index.html
+share/gnome/help/glade/it/user-guide/introduction.html
+share/gnome/help/glade/it/user-guide/libglade.html
+share/gnome/help/glade/it/user-guide/ln7.html
+share/gnome/help/glade/it/user-guide/menus.html
+share/gnome/help/glade/it/user-guide/output.html
+share/gnome/help/glade/it/user-guide/project-options.html
+share/gnome/help/glade/it/user-guide/quickstart.html
+share/gnome/help/glade/it/user-guide/settings-menu.html
+share/gnome/help/glade/it/user-guide/toolbar.html
+share/gnome/help/glade/it/user-guide/user-guide-images/edit-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/file-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/grid-options.png
+share/gnome/help/glade/it/user-guide/user-guide-images/help-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/options-c.png
+share/gnome/help/glade/it/user-guide/user-guide-images/options-general.png
+share/gnome/help/glade/it/user-guide/user-guide-images/options-libglade.png
+share/gnome/help/glade/it/user-guide/user-guide-images/settings-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/snap-options.png
+share/gnome/help/glade/it/user-guide/user-guide-images/toolbar.png
+share/gnome/help/glade/it/user-guide/user-guide-images/view-menu.png
+share/gnome/help/glade/it/user-guide/user-guide-images/window-main.png
+share/gnome/help/glade/it/user-guide/user-guide-images/window-palette-add.png
+share/gnome/help/glade/it/user-guide/user-guide-images/window-palette-basic.png
+share/gnome/help/glade/it/user-guide/user-guide-images/window-palette-gnome.png
+share/gnome/help/glade/it/user-guide/user-guide.sgml
+share/gnome/help/glade/it/user-guide/using.html
+share/gnome/help/glade/it/user-guide/view-menu.html
+share/gnome/help/glade/it/user-guide/windows-clipboard.html
+share/gnome/help/glade/it/user-guide/windows-editor.html
+share/gnome/help/glade/it/user-guide/windows-palette.html
+share/gnome/help/glade/it/user-guide/windows-tree.html
+share/gnome/help/glade/it/user-guide/windows.html
+share/gnome/help/glade/it/user-guide/x225.html
+share/gnome/help/glade/it/user-guide/x324.html
 share/gnome/omf/glade/faq-C.omf
+share/gnome/omf/glade/faq-it.omf
 share/gnome/omf/glade/turbo-start-C.omf
+share/gnome/omf/glade/turbo-start-it.omf
 share/gnome/omf/glade/user-guide-C.omf
+share/gnome/omf/glade/user-guide-it.omf
 share/gnome/pixmaps/glade.png
 share/gnome/pixmaps/glade/glade_logo.png
 share/locale/az/LC_MESSAGES/glade.mo
@@ -149,26 +132,27 @@ share/locale/hu/LC_MESSAGES/glade.mo
 share/locale/it/LC_MESSAGES/glade.mo
 share/locale/ja/LC_MESSAGES/glade.mo
 share/locale/ko/LC_MESSAGES/glade.mo
+share/locale/lv/LC_MESSAGES/glade.mo
+share/locale/nl/LC_MESSAGES/glade.mo
+share/locale/nn/LC_MESSAGES/glade.mo
 share/locale/no/LC_MESSAGES/glade.mo
 share/locale/pl/LC_MESSAGES/glade.mo
+share/locale/pt/LC_MESSAGES/glade.mo
 share/locale/pt_BR/LC_MESSAGES/glade.mo
+share/locale/ro/LC_MESSAGES/glade.mo
 share/locale/ru/LC_MESSAGES/glade.mo
 share/locale/sk/LC_MESSAGES/glade.mo
 share/locale/sv/LC_MESSAGES/glade.mo
 share/locale/tr/LC_MESSAGES/glade.mo
 share/locale/uk/LC_MESSAGES/glade.mo
+share/locale/zh_CN/LC_MESSAGES/glade.mo
 @dirrm share/gnome/pixmaps/glade
 @dirrm share/gnome/omf/glade
+@dirrm share/gnome/help/glade/it/user-guide/user-guide-images
+@dirrm share/gnome/help/glade/it/user-guide
+@dirrm share/gnome/help/glade/it
 @dirrm share/gnome/help/glade/C/user-guide/user-guide-images
-@dirrm share/gnome/help/glade/C/user-guide/stylesheet-images
 @dirrm share/gnome/help/glade/C/user-guide
-@dirrm share/gnome/help/glade/C/turbo-start/stylesheet-images
-@dirrm share/gnome/help/glade/C/turbo-start
-@dirrm share/gnome/help/glade/it/faq/stylesheet-images
-@dirrm share/gnome/help/glade/it/faq
-@dirrm share/gnome/help/glade/it
-@dirrm share/gnome/help/glade/C/faq/stylesheet-images
-@dirrm share/gnome/help/glade/C/faq
 @dirrm share/gnome/help/glade/C
 @dirrm share/gnome/help/glade
 @dirrm share/gnome/glade/gtk