diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 2a18e09780c9..51dcd4f504c8 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bugbuddy
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/bug-buddy
+MASTER_SITE_SUBDIR=	stable/sources/bug-buddy
 DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index 858e61d70425..2b16ebd2d423 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1 +1 @@
-MD5 (bug-buddy-2.0.1.tar.gz) = e70f4e0be3ee08ae34190c20d89bf16e
+MD5 (bug-buddy-2.0.3.tar.gz) = 5922354676122af194076a4a01b1fcfc
diff --git a/devel/bug-buddy/files/patch-ac b/devel/bug-buddy/files/patch-ac
index 387fe04c8431..e69de29bb2d1 100644
--- a/devel/bug-buddy/files/patch-ac
+++ b/devel/bug-buddy/files/patch-ac
@@ -1,22 +0,0 @@
---- src/GNOME.bts.orig	Tue Dec  7 21:21:12 1999
-+++ src/GNOME.bts	Wed Feb 23 13:57:54 2000
-@@ -6,17 +6,14 @@
- 		<packages-list appmap="gnome.appmap">gnome-packages</packages-list>
- 	</bts>
- 	<version-stuff>
--		<package name="C library"
--		         rpm="glibc" 
--			 deb="libc6"/>
- 		<package name="C compiler" 
- 		         pre="gcc --version || cc -V"/>
- 		<package name="glib"
--			 pre="glib-config --version"
-+			 pre="glib12-config --version"
- 			 rpm="glib"
- 			 deb="libglib1.2"/>
- 		<package name="GTK+"
--			 pre="gtk-config --version"
-+			 pre="gtk12-config --version"
- 			 rpm="gtk+"
- 			 deb="libgtk1.2"/>
- 		<package name="ORBit"
diff --git a/devel/bug-buddy/files/patch-configure b/devel/bug-buddy/files/patch-configure
new file mode 100644
index 000000000000..76e04f71c15f
--- /dev/null
+++ b/devel/bug-buddy/files/patch-configure
@@ -0,0 +1,35 @@
+--- configure.orig	Fri Jun 15 10:20:23 2001
++++ configure	Tue Jun 19 05:49:49 2001
+@@ -5679,2 +5679,19 @@
+ 
++# Actually configure libtool.  ac_aux_dir is where install-sh is found.
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
++${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
++|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++  
++# Reload cache, that may have been modified by ltconfig
++if test -r "$cache_file"; then
++  echo "loading cache $cache_file"
++  . $cache_file
++else
++  echo "creating cache $cache_file"
++  > $cache_file
++fi
+ 
+@@ -5682,3 +5699,3 @@
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+@@ -5686,2 +5703,7 @@
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
++# Redirect the config.log output again, so that the ltconfig log is not
++# clobbered by the next message.
++exec 5>>./config.log
++
+ 
diff --git a/devel/bug-buddy/files/patch-po::Makefile.in.in b/devel/bug-buddy/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..27f3358e04a0
--- /dev/null
+++ b/devel/bug-buddy/files/patch-po::Makefile.in.in
@@ -0,0 +1,12 @@
+--- po/Makefile.in.in.orig	Fri Jun 15 10:20:15 2001
++++ po/Makefile.in.in	Tue Jun 19 05:56:13 2001
+@@ -25,3 +25,3 @@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+@@ -108,3 +108,3 @@
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 308f091254e8..57ddc55b0120 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -2,23 +2,18 @@ bin/bug-buddy
 share/gnome/apps/Utilities/bug-buddy.desktop
 share/gnome/bug-buddy/bug-anim.png
 share/gnome/bug-buddy/bug-buddy.glade
+share/gnome/bug-buddy/bug-buddy.png
 share/gnome/bug-buddy/bug-core.png
 share/gnome/bug-buddy/bug-flower.png
 share/gnome/bug-buddy/bugzilla/gnome.bugzilla
 share/gnome/bug-buddy/bugzilla/gnome/config
 share/gnome/bug-buddy/bugzilla/gnome/products
-share/gnome/bug-buddy/debian-packages
+share/gnome/bug-buddy/bugzilla/ximian.bugzilla  
+share/gnome/bug-buddy/bugzilla/ximian/config
+share/gnome/bug-buddy/bugzilla/ximian/products
 share/gnome/bug-buddy/gdb-cmd
-share/gnome/bug-buddy/gnome-packages
-share/gnome/bug-buddy/gnome.appmap
 share/gnome/bug-buddy/gnome.png
-share/gnome/bug-buddy/helix-packages
-share/gnome/bug-buddy/kde-packages
-share/gnome/bug-buddy/xml/Debian.bts
-share/gnome/bug-buddy/xml/GNOME.bts
-share/gnome/bug-buddy/xml/Helix_Code.bts
-share/gnome/bug-buddy/xml/Independent_Project.bts
-share/gnome/bug-buddy/xml/KDE.bts
+share/gnome/bug-buddy/ximian.png
 share/gnome/help/bug-buddy/C/authors.html
 share/gnome/help/bug-buddy/C/bugs.html
 share/gnome/help/bug-buddy/C/component.html
@@ -95,7 +90,7 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/bug-buddy.mo
 @dirrm share/gnome/help/bug-buddy/C/figures
 @dirrm share/gnome/help/bug-buddy/C
 @dirrm share/gnome/help/bug-buddy
-@dirrm share/gnome/bug-buddy/xml
+@dirrm share/gnome/bug-buddy/bugzilla/ximian
 @dirrm share/gnome/bug-buddy/bugzilla/gnome
 @dirrm share/gnome/bug-buddy/bugzilla
 @dirrm share/gnome/bug-buddy
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index 2a18e09780c9..51dcd4f504c8 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bugbuddy
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/bug-buddy
+MASTER_SITE_SUBDIR=	stable/sources/bug-buddy
 DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo
index 858e61d70425..2b16ebd2d423 100644
--- a/devel/bugbuddy/distinfo
+++ b/devel/bugbuddy/distinfo
@@ -1 +1 @@
-MD5 (bug-buddy-2.0.1.tar.gz) = e70f4e0be3ee08ae34190c20d89bf16e
+MD5 (bug-buddy-2.0.3.tar.gz) = 5922354676122af194076a4a01b1fcfc
diff --git a/devel/bugbuddy/files/patch-ac b/devel/bugbuddy/files/patch-ac
index 387fe04c8431..e69de29bb2d1 100644
--- a/devel/bugbuddy/files/patch-ac
+++ b/devel/bugbuddy/files/patch-ac
@@ -1,22 +0,0 @@
---- src/GNOME.bts.orig	Tue Dec  7 21:21:12 1999
-+++ src/GNOME.bts	Wed Feb 23 13:57:54 2000
-@@ -6,17 +6,14 @@
- 		<packages-list appmap="gnome.appmap">gnome-packages</packages-list>
- 	</bts>
- 	<version-stuff>
--		<package name="C library"
--		         rpm="glibc" 
--			 deb="libc6"/>
- 		<package name="C compiler" 
- 		         pre="gcc --version || cc -V"/>
- 		<package name="glib"
--			 pre="glib-config --version"
-+			 pre="glib12-config --version"
- 			 rpm="glib"
- 			 deb="libglib1.2"/>
- 		<package name="GTK+"
--			 pre="gtk-config --version"
-+			 pre="gtk12-config --version"
- 			 rpm="gtk+"
- 			 deb="libgtk1.2"/>
- 		<package name="ORBit"
diff --git a/devel/bugbuddy/files/patch-configure b/devel/bugbuddy/files/patch-configure
new file mode 100644
index 000000000000..76e04f71c15f
--- /dev/null
+++ b/devel/bugbuddy/files/patch-configure
@@ -0,0 +1,35 @@
+--- configure.orig	Fri Jun 15 10:20:23 2001
++++ configure	Tue Jun 19 05:49:49 2001
+@@ -5679,2 +5679,19 @@
+ 
++# Actually configure libtool.  ac_aux_dir is where install-sh is found.
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
++${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
++|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++  
++# Reload cache, that may have been modified by ltconfig
++if test -r "$cache_file"; then
++  echo "loading cache $cache_file"
++  . $cache_file
++else
++  echo "creating cache $cache_file"
++  > $cache_file
++fi
+ 
+@@ -5682,3 +5699,3 @@
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+@@ -5686,2 +5703,7 @@
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
++# Redirect the config.log output again, so that the ltconfig log is not
++# clobbered by the next message.
++exec 5>>./config.log
++
+ 
diff --git a/devel/bugbuddy/files/patch-po::Makefile.in.in b/devel/bugbuddy/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..27f3358e04a0
--- /dev/null
+++ b/devel/bugbuddy/files/patch-po::Makefile.in.in
@@ -0,0 +1,12 @@
+--- po/Makefile.in.in.orig	Fri Jun 15 10:20:15 2001
++++ po/Makefile.in.in	Tue Jun 19 05:56:13 2001
+@@ -25,3 +25,3 @@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+@@ -108,3 +108,3 @@
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist
index 308f091254e8..57ddc55b0120 100644
--- a/devel/bugbuddy/pkg-plist
+++ b/devel/bugbuddy/pkg-plist
@@ -2,23 +2,18 @@ bin/bug-buddy
 share/gnome/apps/Utilities/bug-buddy.desktop
 share/gnome/bug-buddy/bug-anim.png
 share/gnome/bug-buddy/bug-buddy.glade
+share/gnome/bug-buddy/bug-buddy.png
 share/gnome/bug-buddy/bug-core.png
 share/gnome/bug-buddy/bug-flower.png
 share/gnome/bug-buddy/bugzilla/gnome.bugzilla
 share/gnome/bug-buddy/bugzilla/gnome/config
 share/gnome/bug-buddy/bugzilla/gnome/products
-share/gnome/bug-buddy/debian-packages
+share/gnome/bug-buddy/bugzilla/ximian.bugzilla  
+share/gnome/bug-buddy/bugzilla/ximian/config
+share/gnome/bug-buddy/bugzilla/ximian/products
 share/gnome/bug-buddy/gdb-cmd
-share/gnome/bug-buddy/gnome-packages
-share/gnome/bug-buddy/gnome.appmap
 share/gnome/bug-buddy/gnome.png
-share/gnome/bug-buddy/helix-packages
-share/gnome/bug-buddy/kde-packages
-share/gnome/bug-buddy/xml/Debian.bts
-share/gnome/bug-buddy/xml/GNOME.bts
-share/gnome/bug-buddy/xml/Helix_Code.bts
-share/gnome/bug-buddy/xml/Independent_Project.bts
-share/gnome/bug-buddy/xml/KDE.bts
+share/gnome/bug-buddy/ximian.png
 share/gnome/help/bug-buddy/C/authors.html
 share/gnome/help/bug-buddy/C/bugs.html
 share/gnome/help/bug-buddy/C/component.html
@@ -95,7 +90,7 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/bug-buddy.mo
 @dirrm share/gnome/help/bug-buddy/C/figures
 @dirrm share/gnome/help/bug-buddy/C
 @dirrm share/gnome/help/bug-buddy
-@dirrm share/gnome/bug-buddy/xml
+@dirrm share/gnome/bug-buddy/bugzilla/ximian
 @dirrm share/gnome/bug-buddy/bugzilla/gnome
 @dirrm share/gnome/bug-buddy/bugzilla
 @dirrm share/gnome/bug-buddy
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 2a18e09780c9..51dcd4f504c8 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bugbuddy
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/bug-buddy
+MASTER_SITE_SUBDIR=	stable/sources/bug-buddy
 DISTNAME=	bug-buddy-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo
index 858e61d70425..2b16ebd2d423 100644
--- a/devel/bugbuddy2/distinfo
+++ b/devel/bugbuddy2/distinfo
@@ -1 +1 @@
-MD5 (bug-buddy-2.0.1.tar.gz) = e70f4e0be3ee08ae34190c20d89bf16e
+MD5 (bug-buddy-2.0.3.tar.gz) = 5922354676122af194076a4a01b1fcfc
diff --git a/devel/bugbuddy2/files/patch-ac b/devel/bugbuddy2/files/patch-ac
index 387fe04c8431..e69de29bb2d1 100644
--- a/devel/bugbuddy2/files/patch-ac
+++ b/devel/bugbuddy2/files/patch-ac
@@ -1,22 +0,0 @@
---- src/GNOME.bts.orig	Tue Dec  7 21:21:12 1999
-+++ src/GNOME.bts	Wed Feb 23 13:57:54 2000
-@@ -6,17 +6,14 @@
- 		<packages-list appmap="gnome.appmap">gnome-packages</packages-list>
- 	</bts>
- 	<version-stuff>
--		<package name="C library"
--		         rpm="glibc" 
--			 deb="libc6"/>
- 		<package name="C compiler" 
- 		         pre="gcc --version || cc -V"/>
- 		<package name="glib"
--			 pre="glib-config --version"
-+			 pre="glib12-config --version"
- 			 rpm="glib"
- 			 deb="libglib1.2"/>
- 		<package name="GTK+"
--			 pre="gtk-config --version"
-+			 pre="gtk12-config --version"
- 			 rpm="gtk+"
- 			 deb="libgtk1.2"/>
- 		<package name="ORBit"
diff --git a/devel/bugbuddy2/files/patch-configure b/devel/bugbuddy2/files/patch-configure
new file mode 100644
index 000000000000..76e04f71c15f
--- /dev/null
+++ b/devel/bugbuddy2/files/patch-configure
@@ -0,0 +1,35 @@
+--- configure.orig	Fri Jun 15 10:20:23 2001
++++ configure	Tue Jun 19 05:49:49 2001
+@@ -5679,2 +5679,19 @@
+ 
++# Actually configure libtool.  ac_aux_dir is where install-sh is found.
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
++${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
++|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++  
++# Reload cache, that may have been modified by ltconfig
++if test -r "$cache_file"; then
++  echo "loading cache $cache_file"
++  . $cache_file
++else
++  echo "creating cache $cache_file"
++  > $cache_file
++fi
+ 
+@@ -5682,3 +5699,3 @@
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+@@ -5686,2 +5703,7 @@
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
++# Redirect the config.log output again, so that the ltconfig log is not
++# clobbered by the next message.
++exec 5>>./config.log
++
+ 
diff --git a/devel/bugbuddy2/files/patch-po::Makefile.in.in b/devel/bugbuddy2/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..27f3358e04a0
--- /dev/null
+++ b/devel/bugbuddy2/files/patch-po::Makefile.in.in
@@ -0,0 +1,12 @@
+--- po/Makefile.in.in.orig	Fri Jun 15 10:20:15 2001
++++ po/Makefile.in.in	Tue Jun 19 05:56:13 2001
+@@ -25,3 +25,3 @@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+@@ -108,3 +108,3 @@
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist
index 308f091254e8..57ddc55b0120 100644
--- a/devel/bugbuddy2/pkg-plist
+++ b/devel/bugbuddy2/pkg-plist
@@ -2,23 +2,18 @@ bin/bug-buddy
 share/gnome/apps/Utilities/bug-buddy.desktop
 share/gnome/bug-buddy/bug-anim.png
 share/gnome/bug-buddy/bug-buddy.glade
+share/gnome/bug-buddy/bug-buddy.png
 share/gnome/bug-buddy/bug-core.png
 share/gnome/bug-buddy/bug-flower.png
 share/gnome/bug-buddy/bugzilla/gnome.bugzilla
 share/gnome/bug-buddy/bugzilla/gnome/config
 share/gnome/bug-buddy/bugzilla/gnome/products
-share/gnome/bug-buddy/debian-packages
+share/gnome/bug-buddy/bugzilla/ximian.bugzilla  
+share/gnome/bug-buddy/bugzilla/ximian/config
+share/gnome/bug-buddy/bugzilla/ximian/products
 share/gnome/bug-buddy/gdb-cmd
-share/gnome/bug-buddy/gnome-packages
-share/gnome/bug-buddy/gnome.appmap
 share/gnome/bug-buddy/gnome.png
-share/gnome/bug-buddy/helix-packages
-share/gnome/bug-buddy/kde-packages
-share/gnome/bug-buddy/xml/Debian.bts
-share/gnome/bug-buddy/xml/GNOME.bts
-share/gnome/bug-buddy/xml/Helix_Code.bts
-share/gnome/bug-buddy/xml/Independent_Project.bts
-share/gnome/bug-buddy/xml/KDE.bts
+share/gnome/bug-buddy/ximian.png
 share/gnome/help/bug-buddy/C/authors.html
 share/gnome/help/bug-buddy/C/bugs.html
 share/gnome/help/bug-buddy/C/component.html
@@ -95,7 +90,7 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/bug-buddy.mo
 @dirrm share/gnome/help/bug-buddy/C/figures
 @dirrm share/gnome/help/bug-buddy/C
 @dirrm share/gnome/help/bug-buddy
-@dirrm share/gnome/bug-buddy/xml
+@dirrm share/gnome/bug-buddy/bugzilla/ximian
 @dirrm share/gnome/bug-buddy/bugzilla/gnome
 @dirrm share/gnome/bug-buddy/bugzilla
 @dirrm share/gnome/bug-buddy