Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

3 files changed, 14 insertions, 9 deletions

diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 5b71060c82cb..3c08f1d4d82a 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bugbuddy2
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.102
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/bug-buddy/2.2
@@ -15,26 +15,23 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	bug-buddy.1
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo
index 872361f759c0..c258a0ca130d 100644
--- a/devel/bugbuddy2/distinfo
+++ b/devel/bugbuddy2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bug-buddy-2.2.0.tar.bz2) = c98a12f48a1f0c8697a7937a4a7d08a1
+MD5 (gnome2/bug-buddy-2.2.102.tar.bz2) = 154ecb6e924cf25aebf0610cc3e38be2
diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist
index d21dc8b68f19..7636bb7796c7 100644
--- a/devel/bugbuddy2/pkg-plist
+++ b/devel/bugbuddy2/pkg-plist
@@ -19,9 +19,12 @@ share/gnome/help/bug-buddy/C/legal.xml
 share/gnome/mime-info/bug-buddy.keys
 share/gnome/mime-info/bug-buddy.mime
 share/gnome/omf/bug-buddy/bug-buddy-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/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/ca/LC_MESSAGES/bug-buddy.mo
 share/locale/cs/LC_MESSAGES/bug-buddy.mo
@@ -36,12 +39,15 @@ share/locale/fi/LC_MESSAGES/bug-buddy.mo
 share/locale/fr/LC_MESSAGES/bug-buddy.mo
 share/locale/ga/LC_MESSAGES/bug-buddy.mo
 share/locale/gl/LC_MESSAGES/bug-buddy.mo
+share/locale/he/LC_MESSAGES/bug-buddy.mo
 share/locale/hu/LC_MESSAGES/bug-buddy.mo
 share/locale/it/LC_MESSAGES/bug-buddy.mo
 share/locale/ja/LC_MESSAGES/bug-buddy.mo
 share/locale/ko/LC_MESSAGES/bug-buddy.mo
 share/locale/lt/LC_MESSAGES/bug-buddy.mo
 share/locale/lv/LC_MESSAGES/bug-buddy.mo
+share/locale/mk/LC_MESSAGES/bug-buddy.mo
+share/locale/mn/LC_MESSAGES/bug-buddy.mo
 share/locale/ms/LC_MESSAGES/bug-buddy.mo
 share/locale/nl/LC_MESSAGES/bug-buddy.mo
 share/locale/nn/LC_MESSAGES/bug-buddy.mo
@@ -53,6 +59,7 @@ share/locale/ro/LC_MESSAGES/bug-buddy.mo
 share/locale/ru/LC_MESSAGES/bug-buddy.mo
 share/locale/sk/LC_MESSAGES/bug-buddy.mo
 share/locale/sl/LC_MESSAGES/bug-buddy.mo
+share/locale/sq/LC_MESSAGES/bug-buddy.mo
 share/locale/sv/LC_MESSAGES/bug-buddy.mo
 share/locale/tr/LC_MESSAGES/bug-buddy.mo
 share/locale/uk/LC_MESSAGES/bug-buddy.mo
@@ -67,3 +74,4 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
 @dirrm share/gnome/bug-buddy/bugzilla/gnome
 @dirrm share/gnome/bug-buddy/bugzilla
 @dirrm share/gnome/bug-buddy
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true