Add glade2 and GNOME DB 2 to the tree. These are still beta versions of the

software, but it gives GNOME 2 testers some more stuff to play with.

7 files changed, 101 insertions, 263 deletions

diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index d8e10f056cac..e90b5fa35bd5 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,31 +1,36 @@
-# New ports collection makefile for:	glade
-# Date created:		29 June 1998
-# Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
+# New ports collection makefile for:	glade2
+# Date created:		02 June 2002
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	glade
-PORTVERSION=	0.6.4
+PORTNAME=	glade2
+PORTVERSION=	1.1.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/glade
+MASTER_SITE_SUBDIR=	pre-gnome2/sources/glade
+DISTNAME=	glade-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
+LIB_DEPENDS=	gnomedb-2.1:${PORTSDIR}/databases/libgnomedb \
+		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
+
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-bonobo --enable-gnome-db
+USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/libs"
+		LIBS="-L${LOCALBASE}/lib"
 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
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@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 aab36fd0f1d8..236b46d56191 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1 +1 @@
-MD5 (glade-0.6.4.tar.gz) = 6bae18e2fd323d64168992e126e27efb
+MD5 (gnome2/glade-1.1.0.tar.bz2) = da40a2c2a55e2e25dcc7f893cc896dd4
diff --git a/devel/glade2/files/patch-configure b/devel/glade2/files/patch-configure
new file mode 100644
index 000000000000..886a0a57d1ce
--- /dev/null
+++ b/devel/glade2/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun Jun  2 22:01:19 2002
++++ configure	Sun Jun  2 22:01:34 2002
+@@ -7089,6 +7089,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c b/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c
deleted file mode 100644
index 11dbae3da729..000000000000
--- a/devel/glade2/files/patch-glade::gnome-db::gnomedberrordlg.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- 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_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");
diff --git a/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c b/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c
deleted file mode 100644
index cc0b6d892603..000000000000
--- a/devel/glade2/files/patch-glade::gnome-db::gnomedblogin.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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 @@
- {
-   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-ltmain.sh b/devel/glade2/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/devel/glade2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,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 ea2c051362cf..a96a950811dc 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -1,176 +1,72 @@
-bin/glade
-share/gnome/apps/Development/glade.desktop
-share/gnome/glade/gnome/Makefile.am
-share/gnome/glade/gnome/aclocal-include.m4
-share/gnome/glade/gnome/autogen.sh
-share/gnome/glade/gnome/compiler-flags.m4
-share/gnome/glade/gnome/curses.m4
-share/gnome/glade/gnome/gnome-bonobo-check.m4
-share/gnome/glade/gnome/gnome-common.m4
-share/gnome/glade/gnome/gnome-fileutils.m4
-share/gnome/glade/gnome/gnome-gettext.m4
-share/gnome/glade/gnome/gnome-ghttp-check.m4
-share/gnome/glade/gnome/gnome-gnorba-check.m4
-share/gnome/glade/gnome/gnome-guile-checks.m4
-share/gnome/glade/gnome/gnome-libgtop-check.m4
-share/gnome/glade/gnome/gnome-objc-checks.m4
-share/gnome/glade/gnome/gnome-orbit-check.m4
-share/gnome/glade/gnome/gnome-print-check.m4
-share/gnome/glade/gnome/gnome-pthread-check.m4
-share/gnome/glade/gnome/gnome-support.m4
-share/gnome/glade/gnome/gnome-undelfs.m4
-share/gnome/glade/gnome/gnome-vfs.m4
-share/gnome/glade/gnome/gnome-x-checks.m4
-share/gnome/glade/gnome/gnome-xml-check.m4
-share/gnome/glade/gnome/gnome.m4
-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/faq.sgml
-share/gnome/help/glade/C/faq/index.html
-share/gnome/help/glade/C/faq/ln7.html
-share/gnome/help/glade/C/topic.dat
-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/turbo-start.sgml
-share/gnome/help/glade/C/user-guide/authors.html
-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
-share/gnome/help/glade/C/user-guide/index.html
-share/gnome/help/glade/C/user-guide/introduction.html
-share/gnome/help/glade/C/user-guide/libglade.html
-share/gnome/help/glade/C/user-guide/ln7.html
-share/gnome/help/glade/C/user-guide/menus.html
-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/toolbar.html
-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
-share/gnome/help/glade/C/user-guide/user-guide-images/help-menu.png
-share/gnome/help/glade/C/user-guide/user-guide-images/menu.png
-share/gnome/help/glade/C/user-guide/user-guide-images/options-c.png
-share/gnome/help/glade/C/user-guide/user-guide-images/options-general.png
-share/gnome/help/glade/C/user-guide/user-guide-images/options-libglade.png
-share/gnome/help/glade/C/user-guide/user-guide-images/settings-menu.png
-share/gnome/help/glade/C/user-guide/user-guide-images/snap-options.png
-share/gnome/help/glade/C/user-guide/user-guide-images/toolbar.png
-share/gnome/help/glade/C/user-guide/user-guide-images/view-menu.png
-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
-share/gnome/help/glade/C/user-guide/windows-editor.html
-share/gnome/help/glade/C/user-guide/windows-palette.html
-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/faq.sgml
-share/gnome/help/glade/it/faq/index.html
-share/gnome/help/glade/it/faq/ln10.html
-share/gnome/help/glade/it/topic.dat
-share/gnome/help/glade/it/turbo-start/index.html
-share/gnome/help/glade/it/turbo-start/ln10.html
-share/gnome/help/glade/it/turbo-start/turbo-start.sgml
-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
-share/locale/ca/LC_MESSAGES/glade.mo
-share/locale/cs/LC_MESSAGES/glade.mo
-share/locale/da/LC_MESSAGES/glade.mo
-share/locale/de/LC_MESSAGES/glade.mo
-share/locale/el/LC_MESSAGES/glade.mo
-share/locale/en_GB/LC_MESSAGES/glade.mo
-share/locale/es/LC_MESSAGES/glade.mo
-share/locale/fr/LC_MESSAGES/glade.mo
-share/locale/ga/LC_MESSAGES/glade.mo
-share/locale/gl/LC_MESSAGES/glade.mo
-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/turbo-start
-@dirrm share/gnome/help/glade/it/faq
-@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
-@dirrm share/gnome/help/glade/C/turbo-start
-@dirrm share/gnome/help/glade/C/faq
-@dirrm share/gnome/help/glade/C
-@dirrm share/gnome/help/glade
-@dirrm share/gnome/glade/gtk
-@dirrm share/gnome/glade/gnome
-@dirrm share/gnome/glade
+bin/glade-2
+share/gnome/applications/glade-2.desktop
+share/gnome/glade-2/gtk/autogen.sh
+share/gnome/help/glade-faq/C/glade-faq.xml
+share/gnome/help/glade-faq/C/legal.xml
+share/gnome/help/glade-turbo-start/C/glade-turbo-start.xml
+share/gnome/help/glade-turbo-start/C/legal.xml
+share/gnome/help/glade-user-guide/C/figures/edit-menu.png
+share/gnome/help/glade-user-guide/C/figures/file-menu.png
+share/gnome/help/glade-user-guide/C/figures/grid-options.png
+share/gnome/help/glade-user-guide/C/figures/help-menu.png
+share/gnome/help/glade-user-guide/C/figures/menu.png
+share/gnome/help/glade-user-guide/C/figures/options-c.png
+share/gnome/help/glade-user-guide/C/figures/options-general.png
+share/gnome/help/glade-user-guide/C/figures/options-libglade.png
+share/gnome/help/glade-user-guide/C/figures/settings-menu.png
+share/gnome/help/glade-user-guide/C/figures/snap-options.png
+share/gnome/help/glade-user-guide/C/figures/toolbar.png
+share/gnome/help/glade-user-guide/C/figures/view-menu.png
+share/gnome/help/glade-user-guide/C/figures/window-main.png
+share/gnome/help/glade-user-guide/C/figures/window-palette-add.png
+share/gnome/help/glade-user-guide/C/figures/window-palette-basic.png
+share/gnome/help/glade-user-guide/C/figures/window-palette-gnome.png
+share/gnome/help/glade-user-guide/C/glade-user-guide.xml
+share/gnome/help/glade-user-guide/C/legal.xml
+share/gnome/omf/glade-2/glade-faq-C.omf
+share/gnome/omf/glade-2/glade-turbo-start-C.omf
+share/gnome/omf/glade-2/glade-user-guide-C.omf
+share/gnome/pixmaps/glade-2.png
+share/gnome/pixmaps/glade-2/glade_logo.png
+share/locale/az/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
+share/locale/de/LC_MESSAGES/glade-2.0.mo
+share/locale/el/LC_MESSAGES/glade-2.0.mo
+share/locale/en_GB/LC_MESSAGES/glade-2.0.mo
+share/locale/es/LC_MESSAGES/glade-2.0.mo
+share/locale/fr/LC_MESSAGES/glade-2.0.mo
+share/locale/ga/LC_MESSAGES/glade-2.0.mo
+share/locale/gl/LC_MESSAGES/glade-2.0.mo
+share/locale/hu/LC_MESSAGES/glade-2.0.mo
+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/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
+share/locale/pt/LC_MESSAGES/glade-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/glade-2.0.mo
+share/locale/ro/LC_MESSAGES/glade-2.0.mo
+share/locale/ru/LC_MESSAGES/glade-2.0.mo
+share/locale/sk/LC_MESSAGES/glade-2.0.mo
+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/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-user-guide/C/figures
+@dirrm share/gnome/help/glade-user-guide/C
+@dirrm share/gnome/help/glade-user-guide
+@dirrm share/gnome/help/glade-turbo-start/C/figures
+@dirrm share/gnome/help/glade-turbo-start/C
+@dirrm share/gnome/help/glade-turbo-start
+@dirrm share/gnome/help/glade-faq/C/figures
+@dirrm share/gnome/help/glade-faq/C
+@dirrm share/gnome/help/glade-faq
+@dirrm share/gnome/glade-2/gtk
+@dirrm share/gnome/glade-2