6 files changed, 35 insertions, 20 deletions

diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index f06ccc438678..ae4b62d0e793 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -6,32 +6,36 @@
 #
 
 PORTNAME=	bugbuddy
-PORTVERSION=	2.8.0
-PORTREVISION=	3
+PORTVERSION=	2.10.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/bug-buddy/2.8
+MASTER_SITE_SUBDIR=	sources/bug-buddy/2.10
 DISTNAME=	bug-buddy-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A bug reporting tool for GNOME 2
 
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \
+		desktopfileutils
 GNOME_DESKTOP_VERSION=2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help
 
 MAN1=		bug-buddy.1
 GCONF_SCHEMAS=	bug-buddy.schemas
 
 post-install:
-	@-update-desktop-database > /dev/null
+	@-update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo
index 0b776637feb8..d7003e3d31ca 100644
--- a/devel/bugbuddy/distinfo
+++ b/devel/bugbuddy/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea
-SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303
+MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac
+SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182
diff --git a/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf b/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf
deleted file mode 100644
index 1388788efaf5..000000000000
--- a/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf
+++ /dev/null
@@ -1,12 +0,0 @@
---- docs/C/bug-buddy-C.omf.orig	Tue Nov  9 21:19:52 2004
-+++ docs/C/bug-buddy-C.omf	Tue Nov  9 21:19:57 2004
-@@ -3,8 +3,8 @@
-   <resource>
-     <creator>baudais@kkpsi.org (Eric Baudais)</creator>
-     <creator>telsa@linuxchix.org (Telsa Gwynne)</creator>
--    <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor>
-     <maintainer>docs@gnome.org (GNOME Documentation Project)</maintainer>
-+    <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor>
-     <title>Bug Buddy Manual</title>
-     <date>September 11, 2004</date>
-     <version identifier="2.8" date="2004-09-11" description="Updated to bug buddy 2.8"/>
diff --git a/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in
new file mode 100644
index 000000000000..1074dd7520d2
--- /dev/null
+++ b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in
@@ -0,0 +1,12 @@
+--- docs/bug-buddy.omf.in.orig	Fri Feb 11 14:23:02 2005
++++ docs/bug-buddy.omf.in	Fri Feb 11 14:22:48 2005
+@@ -0,0 +1,9 @@
++<?xml version="1.0" standalone="no"?>
++<omf>
++  <resource>
++    <subject category="GNOME|Development"/>
++    <type>user's guide</type>
++    <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/>
++    <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/>
++  </resource>
++</omf>
diff --git a/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c
new file mode 100644
index 000000000000..bc0a6ba22c2f
--- /dev/null
+++ b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c
@@ -0,0 +1,10 @@
+--- src/united-states-of-bug-buddy.c.orig	Tue Nov 30 18:21:10 2004
++++ src/united-states-of-bug-buddy.c	Tue Nov 30 18:21:15 2004
+@@ -36,6 +36,7 @@
+ #include <sys/types.h>
+ #include <sysexits.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ 
+ #if 0
+ static char *help_pages[] = {
diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist
index cd4e2b3e301c..16d22f537467 100644
--- a/devel/bugbuddy/pkg-plist
+++ b/devel/bugbuddy/pkg-plist
@@ -1,8 +1,8 @@
 bin/bug-buddy
 share/gnome/application-registry/bug-buddy.applications
 share/gnome/applications/bug-buddy-core.desktop
-share/gnome/applications/bug-buddy.desktop
 @exec update-desktop-database > /dev/null || /usr/bin/true
+share/gnome/applications/bug-buddy.desktop
 share/gnome/bug-buddy/bug-buddy.glade
 share/gnome/bug-buddy/bug-buddy.png
 share/gnome/bug-buddy/bugzilla/gnome.bugzilla
@@ -61,6 +61,7 @@ share/locale/ml/LC_MESSAGES/bug-buddy.mo
 share/locale/mn/LC_MESSAGES/bug-buddy.mo
 share/locale/ms/LC_MESSAGES/bug-buddy.mo
 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