3 files changed, 23 insertions, 36 deletions

diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile
index 7504f0b1ad25..187c62862eaa 100644
--- a/sysutils/bubblemon2/Makefile
+++ b/sysutils/bubblemon2/Makefile
@@ -5,39 +5,35 @@
 # $FreeBSD$
 
 PORTNAME=	bubblemon2
-PORTVERSION=	2.0.1
-PORTREVISION=	3
+PORTVERSION=	2.0.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	bubblemon
 DISTNAME=	bubblemon-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Bubblemon2 is a system CPU and memory load monitor for GNOME2
+COMMENT=	A system CPU and memory load monitor for GNOME2
 
 LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop2
 
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomepanel gnomeprefix gnometarget intlhack
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
-USE_GNOME=      gnomehack gnomeprefix gnomepanel
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		bubblemon-gnome2.1
 MANLANG=	"" hu sv
 
-DOCS=		AUTHORS COPYING ChangeLog FAQ PROFILING TRANSLATIONS NEWS README TODO
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ;' ${WRKSRC}/configure
+PORTDOCS=	AUTHORS COPYING ChangeLog FAQ PROFILING TRANSLATIONS NEWS README TODO
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/sysutils/bubblemon2/distinfo b/sysutils/bubblemon2/distinfo
index 2adacd7e4784..30fe3e1398dd 100644
--- a/sysutils/bubblemon2/distinfo
+++ b/sysutils/bubblemon2/distinfo
@@ -1,2 +1,2 @@
-MD5 (bubblemon-2.0.1.tar.gz) = 8153a682551fcc73344420c4857ea198
-SIZE (bubblemon-2.0.1.tar.gz) = 112655
+MD5 (bubblemon-2.0.3.tar.gz) = 053ebe6fd72c225de1f5972a1ae01dd2
+SIZE (bubblemon-2.0.3.tar.gz) = 321322
diff --git a/sysutils/bubblemon2/pkg-plist b/sysutils/bubblemon2/pkg-plist
index b7bb50b0ffd1..9cc50f78374d 100644
--- a/sysutils/bubblemon2/pkg-plist
+++ b/sysutils/bubblemon2/pkg-plist
@@ -2,31 +2,22 @@ libdata/bonobo/servers/GNOME_BubblemonApplet.server
 libexec/bubblemon-gnome2
 share/gnome/gnome-2.0/ui/GNOME_BubblemonApplet.xml
 share/gnome/pixmaps/bubblemon.png
-share/locale/sv/LC_MESSAGES/bubblemon.mo
-share/locale/fr/LC_MESSAGES/bubblemon.mo
-share/locale/pl/LC_MESSAGES/bubblemon.mo
-share/locale/de/LC_MESSAGES/bubblemon.mo
-share/locale/ko/LC_MESSAGES/bubblemon.mo
-share/locale/fi/LC_MESSAGES/bubblemon.mo
+share/locale/ca/LC_MESSAGES/bubblemon.mo
 share/locale/da/LC_MESSAGES/bubblemon.mo
-share/locale/sh/LC_MESSAGES/bubblemon.mo
-share/locale/pt/LC_MESSAGES/bubblemon.mo
-share/locale/ro/LC_MESSAGES/bubblemon.mo
+share/locale/de/LC_MESSAGES/bubblemon.mo
 share/locale/es/LC_MESSAGES/bubblemon.mo
-share/locale/no/LC_MESSAGES/bubblemon.mo
+share/locale/fi/LC_MESSAGES/bubblemon.mo
+share/locale/fr/LC_MESSAGES/bubblemon.mo
 share/locale/hu/LC_MESSAGES/bubblemon.mo
-share/locale/it/LC_MESSAGES/bubblemon.mo
 share/locale/is/LC_MESSAGES/bubblemon.mo
+share/locale/it/LC_MESSAGES/bubblemon.mo
+share/locale/ko/LC_MESSAGES/bubblemon.mo
+share/locale/no/LC_MESSAGES/bubblemon.mo
+share/locale/pl/LC_MESSAGES/bubblemon.mo
+share/locale/pt/LC_MESSAGES/bubblemon.mo
+share/locale/ro/LC_MESSAGES/bubblemon.mo
 share/locale/ru/LC_MESSAGES/bubblemon.mo
-%%PORTDOCS%%share/doc/bubblemon2/AUTHORS
-%%PORTDOCS%%share/doc/bubblemon2/COPYING
-%%PORTDOCS%%share/doc/bubblemon2/ChangeLog
-%%PORTDOCS%%share/doc/bubblemon2/FAQ
-%%PORTDOCS%%share/doc/bubblemon2/NEWS
-%%PORTDOCS%%share/doc/bubblemon2/PROFILING
-%%PORTDOCS%%share/doc/bubblemon2/README
-%%PORTDOCS%%share/doc/bubblemon2/TODO
-%%PORTDOCS%%share/doc/bubblemon2/TRANSLATIONS
-%%PORTDOCS%%@dirrm share/doc/bubblemon2
+share/locale/sh/LC_MESSAGES/bubblemon.mo
+share/locale/sv/LC_MESSAGES/bubblemon.mo
 @unexec rmdir %D/share/locale/sh/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/sh 2> /dev/null || true