4 files changed, 81 insertions, 41 deletions

diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index d220c6e9dc84..5f8d94f87fe3 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bugbuddy/Makefile,v 1.29 2006/04/13 07:52:31 bland Exp $
+#   $MCom: ports/devel/bug-buddy/Makefile,v 1.38 2006/09/20 06:35:57 marcus Exp $
 #
 
 PORTNAME=	bug-buddy
-PORTVERSION=	2.14.0
+PORTVERSION=	2.16.0
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,21 +17,27 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A bug reporting tool for GNOME 2
 
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+		soup-2.2.8:${PORTSDIR}/devel/libsoup
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
+USE_XLIB=	yes
+INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \
-		desktopfileutils gnomedocutils
+		desktopfileutils gnomedocutils evolutiondataserver
 GNOME_DESKTOP_VERSION=2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=		bug-buddy.1
 GCONF_SCHEMAS=	bug-buddy.schemas
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
+		${WRKSRC}/src/bugzilla.c
+
 post-install:
 	@-update-desktop-database
 
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index 4e73e147c587..aa6bbc1b0657 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.14.0.tar.bz2) = 4fb288adc8f67cbfb8886ddf7b400530
-SHA256 (gnome2/bug-buddy-2.14.0.tar.bz2) = f091ca6c55b2f76011d2c7f6c3c60069070e894ee455483bc8f77edc7f0eaaf6
-SIZE (gnome2/bug-buddy-2.14.0.tar.bz2) = 577253
+MD5 (gnome2/bug-buddy-2.16.0.tar.bz2) = 199b8fe6454096b1c8e514eaa925caa3
+SHA256 (gnome2/bug-buddy-2.16.0.tar.bz2) = 7c2d178a4539044654654acbe8365f925f34f312799e98f7cc1ddb09ff141c22
+SIZE (gnome2/bug-buddy-2.16.0.tar.bz2) = 511355
diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
new file mode 100644
index 000000000000..5093e3e9a0b5
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
@@ -0,0 +1,11 @@
+--- src/bug-buddy.menu.in.orig	Wed Sep 20 02:28:05 2006
++++ src/bug-buddy.menu.in	Wed Sep 20 02:28:12 2006
+@@ -6,7 +6,7 @@
+   <Name>Bug Buddy programs</Name>
+ 
+   <!-- Read only files in default .desktop file location -->
+-  <LegacyDir>@prefix@/@DATADIRNAME@/applications</LegacyDir>
++  <LegacyDir>@prefix@/@DATADIRNAME@/gnome/applications</LegacyDir>
+ 
+   <!-- we want to process all desktop files; Unfortunately,
+        files with NoDisplay=true won't be returned by the 
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index d785341759a3..8a283a99abc4 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -1,8 +1,7 @@
 bin/bug-buddy
-share/gnome/application-registry/bug-buddy.applications
-share/gnome/applications/bug-buddy-core.desktop
 share/gnome/applications/bug-buddy.desktop
 share/gnome/bug-buddy/bug-buddy.glade
+share/gnome/bug-buddy/bug-buddy.menu
 share/gnome/bug-buddy/bug-buddy.png
 share/gnome/bug-buddy/bugzilla/gnome.bugzilla
 share/gnome/bug-buddy/bugzilla/gnome/config
@@ -15,33 +14,21 @@ share/gnome/bug-buddy/bugzilla/ximian/products
 share/gnome/bug-buddy/gdb-cmd
 share/gnome/bug-buddy/gnome.png
 share/gnome/bug-buddy/ximian.png
-share/gnome/help/bug-buddy/C/bug-buddy.xml
-share/gnome/help/bug-buddy/C/legal.xml
-share/gnome/help/bug-buddy/es/bug-buddy.xml
-share/gnome/help/bug-buddy/pa/bug-buddy.xml
-share/gnome/help/bug-buddy/sr/bug-buddy.xml
-share/gnome/help/bug-buddy/uk/bug-buddy.xml
-share/gnome/help/bug-buddy/vi/bug-buddy.xml
-share/gnome/mime-info/bug-buddy.keys
-share/gnome/omf/bug-buddy/bug-buddy-C.omf
-share/gnome/omf/bug-buddy/bug-buddy-es.omf
-share/gnome/omf/bug-buddy/bug-buddy-pa.omf
-share/gnome/omf/bug-buddy/bug-buddy-sr.omf
-share/gnome/omf/bug-buddy/bug-buddy-uk.omf
-share/gnome/omf/bug-buddy/bug-buddy-vi.omf
-share/gnome/pixmaps/bug-buddy.png
+share/icons/hicolor/48x48/apps/bug-buddy.png
 share/locale/am/LC_MESSAGES/bug-buddy.mo
 share/locale/ar/LC_MESSAGES/bug-buddy.mo
 share/locale/az/LC_MESSAGES/bug-buddy.mo
 share/locale/be/LC_MESSAGES/bug-buddy.mo
 share/locale/bg/LC_MESSAGES/bug-buddy.mo
 share/locale/bn/LC_MESSAGES/bug-buddy.mo
+share/locale/bn_IN/LC_MESSAGES/bug-buddy.mo
 share/locale/bs/LC_MESSAGES/bug-buddy.mo
 share/locale/ca/LC_MESSAGES/bug-buddy.mo
 share/locale/cs/LC_MESSAGES/bug-buddy.mo
 share/locale/cy/LC_MESSAGES/bug-buddy.mo
 share/locale/da/LC_MESSAGES/bug-buddy.mo
 share/locale/de/LC_MESSAGES/bug-buddy.mo
+share/locale/dz/LC_MESSAGES/bug-buddy.mo
 share/locale/el/LC_MESSAGES/bug-buddy.mo
 share/locale/en_CA/LC_MESSAGES/bug-buddy.mo
 share/locale/en_GB/LC_MESSAGES/bug-buddy.mo
@@ -62,11 +49,13 @@ share/locale/id/LC_MESSAGES/bug-buddy.mo
 share/locale/is/LC_MESSAGES/bug-buddy.mo
 share/locale/it/LC_MESSAGES/bug-buddy.mo
 share/locale/ja/LC_MESSAGES/bug-buddy.mo
+share/locale/ka/LC_MESSAGES/bug-buddy.mo
 share/locale/ko/LC_MESSAGES/bug-buddy.mo
 share/locale/ku/LC_MESSAGES/bug-buddy.mo
 share/locale/ky/LC_MESSAGES/bug-buddy.mo
 share/locale/lt/LC_MESSAGES/bug-buddy.mo
 share/locale/lv/LC_MESSAGES/bug-buddy.mo
+share/locale/mg/LC_MESSAGES/bug-buddy.mo
 share/locale/mk/LC_MESSAGES/bug-buddy.mo
 share/locale/ml/LC_MESSAGES/bug-buddy.mo
 share/locale/mn/LC_MESSAGES/bug-buddy.mo
@@ -76,7 +65,6 @@ share/locale/nb/LC_MESSAGES/bug-buddy.mo
 share/locale/ne/LC_MESSAGES/bug-buddy.mo
 share/locale/nl/LC_MESSAGES/bug-buddy.mo
 share/locale/nn/LC_MESSAGES/bug-buddy.mo
-share/locale/no/LC_MESSAGES/bug-buddy.mo
 share/locale/or/LC_MESSAGES/bug-buddy.mo
 share/locale/pa/LC_MESSAGES/bug-buddy.mo
 share/locale/pl/LC_MESSAGES/bug-buddy.mo
@@ -102,31 +90,65 @@ share/locale/xh/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
+@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
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrm share/gnome/omf/bug-buddy
-@dirrm share/gnome/help/bug-buddy/vi
-@dirrm share/gnome/help/bug-buddy/uk
-@dirrm share/gnome/help/bug-buddy/sr
-@dirrm share/gnome/help/bug-buddy/pa
-@dirrm share/gnome/help/bug-buddy/es
-@dirrm share/gnome/help/bug-buddy/C
-@dirrm share/gnome/help/bug-buddy
-@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
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be