Update to GNOME 2.2.

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

8 files changed, 100 insertions, 32 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 9c69cdcabc10..804b2c5656ee 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -6,30 +6,37 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/file-roller/2.2
 DISTNAME=	file-roller-${PORTVERSION}
+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
 RUN_DEPENDS=	bzip:${PORTSDIR}/archivers/bzip \
 		lha:${PORTSDIR}/archivers/lha \
-		rar:${PORTSDIR}/archivers/rar \
 		lzop:${PORTSDIR}/archivers/lzop
 
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_RAR) || exists(${LOCALBASE}/bin/rar)
+RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -38,4 +45,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index b6e3c02cab40..48bf924a04cf 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1 +1 @@
-MD5 (file-roller-2.0.4.tar.gz) = 533e4ad3f8d5c9a1ba550de7c4a1d2d0
+MD5 (gnome2/file-roller-2.2.1.tar.gz) = 2b8e07829a65ce5e34cd008dabf1e63c
diff --git a/archivers/file-roller/files/patch-configure b/archivers/file-roller/files/patch-configure
new file mode 100644
index 000000000000..53e3c887712a
--- /dev/null
+++ b/archivers/file-roller/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Dec 10 23:18:40 2002
++++ configure	Tue Dec 10 23:18:59 2002
+@@ -6403,6 +6403,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 6139ada58184..198b20035aed 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -8,19 +8,16 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml
 etc/gconf/schemas/file-roller.schemas
+lib/bonobo/libfile-roller-component.so
+libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%share/doc/fileroller/AUTHORS
 %%PORTDOCS%%share/doc/fileroller/NEWS
 %%PORTDOCS%%share/doc/fileroller/README
 %%PORTDOCS%%share/doc/fileroller/TODO
 share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
-share/gnome/file-roller/glade/file_roller.glade2
-share/gnome/file-roller/glade/file_roller_prop.glade2
-share/gnome/file-roller/scripts/Add_to_archive
-share/gnome/file-roller/scripts/Extract_here
-share/gnome/file-roller/scripts/Extract_in_a_subfolder
-share/gnome/file-roller/scripts/Extract_to
-share/gnome/file-roller/scripts/README
+share/gnome/file-roller/glade/file_roller.glade
+share/gnome/file-roller/glade/file_roller_prop.glade
 share/gnome/help/file-roller/C/figures/fr-add-dialog.png
 share/gnome/help/file-roller/C/figures/fr-extract.png
 share/gnome/help/file-roller/C/figures/fr-mainwindow.png
@@ -36,32 +33,50 @@ share/gnome/help/file-roller/ru/legal.xml
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ru.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/file-roller.png
+share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/bg/LC_MESSAGES/file-roller.mo
 share/locale/ca/LC_MESSAGES/file-roller.mo
+share/locale/cs/LC_MESSAGES/file-roller.mo
+share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
+share/locale/el/LC_MESSAGES/file-roller.mo
 share/locale/es/LC_MESSAGES/file-roller.mo
+share/locale/et/LC_MESSAGES/file-roller.mo
+share/locale/fi/LC_MESSAGES/file-roller.mo
 share/locale/fr/LC_MESSAGES/file-roller.mo
+share/locale/hi/LC_MESSAGES/file-roller.mo
+share/locale/hu/LC_MESSAGES/file-roller.mo
 share/locale/it/LC_MESSAGES/file-roller.mo
 share/locale/ja/LC_MESSAGES/file-roller.mo
 share/locale/ko/LC_MESSAGES/file-roller.mo
+share/locale/lv/LC_MESSAGES/file-roller.mo
+share/locale/mk/LC_MESSAGES/file-roller.mo
+share/locale/mn/LC_MESSAGES/file-roller.mo
 share/locale/ms/LC_MESSAGES/file-roller.mo
 share/locale/nl/LC_MESSAGES/file-roller.mo
 share/locale/no/LC_MESSAGES/file-roller.mo
 share/locale/pl/LC_MESSAGES/file-roller.mo
+share/locale/pt/LC_MESSAGES/file-roller.mo
 share/locale/pt_BR/LC_MESSAGES/file-roller.mo
 share/locale/ro/LC_MESSAGES/file-roller.mo
 share/locale/ru/LC_MESSAGES/file-roller.mo
+share/locale/sk/LC_MESSAGES/file-roller.mo
+share/locale/sl/LC_MESSAGES/file-roller.mo
+share/locale/sq/LC_MESSAGES/file-roller.mo
 share/locale/sv/LC_MESSAGES/file-roller.mo
+share/locale/uk/LC_MESSAGES/file-roller.mo
 share/locale/vi/LC_MESSAGES/file-roller.mo
+share/locale/zh_CN/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/omf/file-roller
 @dirrm share/gnome/help/file-roller/ru/figures
 @dirrm share/gnome/help/file-roller/ru
 @dirrm share/gnome/help/file-roller/C/figures
 @dirrm share/gnome/help/file-roller/C
 @dirrm share/gnome/help/file-roller
-@dirrm share/gnome/file-roller/scripts
 @dirrm share/gnome/file-roller/glade
 @dirrm share/gnome/file-roller
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui
@@ -72,3 +87,5 @@ share/locale/vi/LC_MESSAGES/file-roller.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 9c69cdcabc10..804b2c5656ee 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -6,30 +6,37 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/file-roller/2.2
 DISTNAME=	file-roller-${PORTVERSION}
+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
 RUN_DEPENDS=	bzip:${PORTSDIR}/archivers/bzip \
 		lha:${PORTSDIR}/archivers/lha \
-		rar:${PORTSDIR}/archivers/rar \
 		lzop:${PORTSDIR}/archivers/lzop
 
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_RAR) || exists(${LOCALBASE}/bin/rar)
+RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -38,4 +45,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index b6e3c02cab40..48bf924a04cf 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1 +1 @@
-MD5 (file-roller-2.0.4.tar.gz) = 533e4ad3f8d5c9a1ba550de7c4a1d2d0
+MD5 (gnome2/file-roller-2.2.1.tar.gz) = 2b8e07829a65ce5e34cd008dabf1e63c
diff --git a/archivers/fileroller/files/patch-configure b/archivers/fileroller/files/patch-configure
new file mode 100644
index 000000000000..53e3c887712a
--- /dev/null
+++ b/archivers/fileroller/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Dec 10 23:18:40 2002
++++ configure	Tue Dec 10 23:18:59 2002
+@@ -6403,6 +6403,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 6139ada58184..198b20035aed 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -8,19 +8,16 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml
 etc/gconf/schemas/file-roller.schemas
+lib/bonobo/libfile-roller-component.so
+libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%share/doc/fileroller/AUTHORS
 %%PORTDOCS%%share/doc/fileroller/NEWS
 %%PORTDOCS%%share/doc/fileroller/README
 %%PORTDOCS%%share/doc/fileroller/TODO
 share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
-share/gnome/file-roller/glade/file_roller.glade2
-share/gnome/file-roller/glade/file_roller_prop.glade2
-share/gnome/file-roller/scripts/Add_to_archive
-share/gnome/file-roller/scripts/Extract_here
-share/gnome/file-roller/scripts/Extract_in_a_subfolder
-share/gnome/file-roller/scripts/Extract_to
-share/gnome/file-roller/scripts/README
+share/gnome/file-roller/glade/file_roller.glade
+share/gnome/file-roller/glade/file_roller_prop.glade
 share/gnome/help/file-roller/C/figures/fr-add-dialog.png
 share/gnome/help/file-roller/C/figures/fr-extract.png
 share/gnome/help/file-roller/C/figures/fr-mainwindow.png
@@ -36,32 +33,50 @@ share/gnome/help/file-roller/ru/legal.xml
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ru.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/file-roller.png
+share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/bg/LC_MESSAGES/file-roller.mo
 share/locale/ca/LC_MESSAGES/file-roller.mo
+share/locale/cs/LC_MESSAGES/file-roller.mo
+share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
+share/locale/el/LC_MESSAGES/file-roller.mo
 share/locale/es/LC_MESSAGES/file-roller.mo
+share/locale/et/LC_MESSAGES/file-roller.mo
+share/locale/fi/LC_MESSAGES/file-roller.mo
 share/locale/fr/LC_MESSAGES/file-roller.mo
+share/locale/hi/LC_MESSAGES/file-roller.mo
+share/locale/hu/LC_MESSAGES/file-roller.mo
 share/locale/it/LC_MESSAGES/file-roller.mo
 share/locale/ja/LC_MESSAGES/file-roller.mo
 share/locale/ko/LC_MESSAGES/file-roller.mo
+share/locale/lv/LC_MESSAGES/file-roller.mo
+share/locale/mk/LC_MESSAGES/file-roller.mo
+share/locale/mn/LC_MESSAGES/file-roller.mo
 share/locale/ms/LC_MESSAGES/file-roller.mo
 share/locale/nl/LC_MESSAGES/file-roller.mo
 share/locale/no/LC_MESSAGES/file-roller.mo
 share/locale/pl/LC_MESSAGES/file-roller.mo
+share/locale/pt/LC_MESSAGES/file-roller.mo
 share/locale/pt_BR/LC_MESSAGES/file-roller.mo
 share/locale/ro/LC_MESSAGES/file-roller.mo
 share/locale/ru/LC_MESSAGES/file-roller.mo
+share/locale/sk/LC_MESSAGES/file-roller.mo
+share/locale/sl/LC_MESSAGES/file-roller.mo
+share/locale/sq/LC_MESSAGES/file-roller.mo
 share/locale/sv/LC_MESSAGES/file-roller.mo
+share/locale/uk/LC_MESSAGES/file-roller.mo
 share/locale/vi/LC_MESSAGES/file-roller.mo
+share/locale/zh_CN/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/omf/file-roller
 @dirrm share/gnome/help/file-roller/ru/figures
 @dirrm share/gnome/help/file-roller/ru
 @dirrm share/gnome/help/file-roller/C/figures
 @dirrm share/gnome/help/file-roller/C
 @dirrm share/gnome/help/file-roller
-@dirrm share/gnome/file-roller/scripts
 @dirrm share/gnome/file-roller/glade
 @dirrm share/gnome/file-roller
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui
@@ -72,3 +87,5 @@ share/locale/vi/LC_MESSAGES/file-roller.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true