6 files changed, 52 insertions, 34 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 85a84fcd2705..aa6a2611649c 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,16 +3,15 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/fileroller/Makefile,v 1.79 2005/10/03 21:14:16 mezz Exp $
+#   $MCom: ports/archivers/fileroller/Makefile,v 1.95 2006/04/18 18:52:18 ahze Exp $
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.12.3
-PORTREVISION=	1
+PORTVERSION=	2.14.2
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/2.12
+MASTER_SITE_SUBDIR=	sources/file-roller/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -25,12 +24,14 @@ COMMENT=	An archive manager for zip files, tar, etc
 RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
 		gnomedocutils
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 3872416afed8..e3f9c06aeb7f 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.12.3.tar.bz2) = a6d7fcc3417bd23556261223c4ad77ee
-SHA256 (gnome2/file-roller-2.12.3.tar.bz2) = 983f10a76fa228bcb8beb7dde7feacab4d3033357e59b4548a4bc0ba8dad0e14
-SIZE (gnome2/file-roller-2.12.3.tar.bz2) = 936371
+MD5 (gnome2/file-roller-2.14.2.tar.bz2) = 4900dc4b2e4f0f173bd88cb5e6b9bde1
+SHA256 (gnome2/file-roller-2.14.2.tar.bz2) = 24592f04632d97c33b0b2950c4fd6467217a9ff6fdbd9058f643c11ed375382a
+SIZE (gnome2/file-roller-2.14.2.tar.bz2) = 1039404
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 99f309c21ccc..f7bebfbc5434 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -1,16 +1,11 @@
 bin/file-roller
-lib/bonobo/libfile-roller-component.a
-lib/bonobo/libfile-roller-component.la
-lib/bonobo/libfile-roller-component.so
 lib/nautilus/extensions-1.0/libnautilus-fileroller.a
 lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 lib/nautilus/extensions-1.0/libnautilus-fileroller.so
-libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
 share/gnome/file-roller/glade/file-roller-extract.glade
 share/gnome/file-roller/glade/file-roller.glade
@@ -21,6 +16,12 @@ share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/C/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/C/file-roller.xml
 share/gnome/help/file-roller/C/legal.xml
+share/gnome/help/file-roller/bg/figures/file-roller_home.png
+share/gnome/help/file-roller/bg/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/bg/figures/file-roller_main_window.png
+share/gnome/help/file-roller/bg/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/bg/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/bg/file-roller.xml
 share/gnome/help/file-roller/de/figures/file-roller_home.png
 share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/de/figures/file-roller_main_window.png
@@ -93,9 +94,8 @@ share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
 share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/zh_TW/file-roller.xml
-share/gnome/mime-info/file-roller.keys
-share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
+share/gnome/omf/file-roller/file-roller-bg.omf
 share/gnome/omf/file-roller/file-roller-de.omf
 share/gnome/omf/file-roller/file-roller-es.omf
 share/gnome/omf/file-roller/file-roller-fr.omf
@@ -108,19 +108,21 @@ share/gnome/omf/file-roller/file-roller-uk.omf
 share/gnome/omf/file-roller/file-roller-zh_CN.omf
 share/gnome/omf/file-roller/file-roller-zh_HK.omf
 share/gnome/omf/file-roller/file-roller-zh_TW.omf
-share/gnome/pixmaps/file-roller.png
+share/icons/hicolor/48x48/apps/file-roller.png
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/ar/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
 share/locale/be/LC_MESSAGES/file-roller.mo
 share/locale/bg/LC_MESSAGES/file-roller.mo
 share/locale/bn/LC_MESSAGES/file-roller.mo
+share/locale/br/LC_MESSAGES/file-roller.mo
 share/locale/bs/LC_MESSAGES/file-roller.mo
 share/locale/ca/LC_MESSAGES/file-roller.mo
 share/locale/cs/LC_MESSAGES/file-roller.mo
 share/locale/cy/LC_MESSAGES/file-roller.mo
 share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
+share/locale/dz/LC_MESSAGES/file-roller.mo
 share/locale/el/LC_MESSAGES/file-roller.mo
 share/locale/en_CA/LC_MESSAGES/file-roller.mo
 share/locale/en_GB/LC_MESSAGES/file-roller.mo
@@ -142,6 +144,7 @@ share/locale/id/LC_MESSAGES/file-roller.mo
 share/locale/is/LC_MESSAGES/file-roller.mo
 share/locale/it/LC_MESSAGES/file-roller.mo
 share/locale/ja/LC_MESSAGES/file-roller.mo
+share/locale/ka/LC_MESSAGES/file-roller.mo
 share/locale/kn/LC_MESSAGES/file-roller.mo
 share/locale/ko/LC_MESSAGES/file-roller.mo
 share/locale/ku/LC_MESSAGES/file-roller.mo
@@ -155,7 +158,6 @@ share/locale/nb/LC_MESSAGES/file-roller.mo
 share/locale/ne/LC_MESSAGES/file-roller.mo
 share/locale/nl/LC_MESSAGES/file-roller.mo
 share/locale/nn/LC_MESSAGES/file-roller.mo
-share/locale/no/LC_MESSAGES/file-roller.mo
 share/locale/pa/LC_MESSAGES/file-roller.mo
 share/locale/pl/LC_MESSAGES/file-roller.mo
 share/locale/pt/LC_MESSAGES/file-roller.mo
@@ -195,6 +197,10 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
 @dirrm share/gnome/omf/file-roller
 @dirrm share/gnome/help/file-roller/zh_TW/figures
 @dirrm share/gnome/help/file-roller/zh_TW
@@ -220,6 +226,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/help/file-roller/es
 @dirrm share/gnome/help/file-roller/de/figures
 @dirrm share/gnome/help/file-roller/de
+@dirrm share/gnome/help/file-roller/bg/figures
+@dirrm share/gnome/help/file-roller/bg
 @dirrm share/gnome/help/file-roller/C/figures
 @dirrm share/gnome/help/file-roller/C
 @dirrm share/gnome/help/file-roller
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 85a84fcd2705..aa6a2611649c 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -3,16 +3,15 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/fileroller/Makefile,v 1.79 2005/10/03 21:14:16 mezz Exp $
+#   $MCom: ports/archivers/fileroller/Makefile,v 1.95 2006/04/18 18:52:18 ahze Exp $
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.12.3
-PORTREVISION=	1
+PORTVERSION=	2.14.2
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/2.12
+MASTER_SITE_SUBDIR=	sources/file-roller/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -25,12 +24,14 @@ COMMENT=	An archive manager for zip files, tar, etc
 RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
 		gnomedocutils
-GNU_CONFIGURE=  yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index 3872416afed8..e3f9c06aeb7f 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.12.3.tar.bz2) = a6d7fcc3417bd23556261223c4ad77ee
-SHA256 (gnome2/file-roller-2.12.3.tar.bz2) = 983f10a76fa228bcb8beb7dde7feacab4d3033357e59b4548a4bc0ba8dad0e14
-SIZE (gnome2/file-roller-2.12.3.tar.bz2) = 936371
+MD5 (gnome2/file-roller-2.14.2.tar.bz2) = 4900dc4b2e4f0f173bd88cb5e6b9bde1
+SHA256 (gnome2/file-roller-2.14.2.tar.bz2) = 24592f04632d97c33b0b2950c4fd6467217a9ff6fdbd9058f643c11ed375382a
+SIZE (gnome2/file-roller-2.14.2.tar.bz2) = 1039404
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 99f309c21ccc..f7bebfbc5434 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -1,16 +1,11 @@
 bin/file-roller
-lib/bonobo/libfile-roller-component.a
-lib/bonobo/libfile-roller-component.la
-lib/bonobo/libfile-roller-component.so
 lib/nautilus/extensions-1.0/libnautilus-fileroller.a
 lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 lib/nautilus/extensions-1.0/libnautilus-fileroller.so
-libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
 share/gnome/file-roller/glade/file-roller-extract.glade
 share/gnome/file-roller/glade/file-roller.glade
@@ -21,6 +16,12 @@ share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/C/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/C/file-roller.xml
 share/gnome/help/file-roller/C/legal.xml
+share/gnome/help/file-roller/bg/figures/file-roller_home.png
+share/gnome/help/file-roller/bg/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/bg/figures/file-roller_main_window.png
+share/gnome/help/file-roller/bg/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/bg/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/bg/file-roller.xml
 share/gnome/help/file-roller/de/figures/file-roller_home.png
 share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/de/figures/file-roller_main_window.png
@@ -93,9 +94,8 @@ share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
 share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/zh_TW/file-roller.xml
-share/gnome/mime-info/file-roller.keys
-share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
+share/gnome/omf/file-roller/file-roller-bg.omf
 share/gnome/omf/file-roller/file-roller-de.omf
 share/gnome/omf/file-roller/file-roller-es.omf
 share/gnome/omf/file-roller/file-roller-fr.omf
@@ -108,19 +108,21 @@ share/gnome/omf/file-roller/file-roller-uk.omf
 share/gnome/omf/file-roller/file-roller-zh_CN.omf
 share/gnome/omf/file-roller/file-roller-zh_HK.omf
 share/gnome/omf/file-roller/file-roller-zh_TW.omf
-share/gnome/pixmaps/file-roller.png
+share/icons/hicolor/48x48/apps/file-roller.png
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/ar/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
 share/locale/be/LC_MESSAGES/file-roller.mo
 share/locale/bg/LC_MESSAGES/file-roller.mo
 share/locale/bn/LC_MESSAGES/file-roller.mo
+share/locale/br/LC_MESSAGES/file-roller.mo
 share/locale/bs/LC_MESSAGES/file-roller.mo
 share/locale/ca/LC_MESSAGES/file-roller.mo
 share/locale/cs/LC_MESSAGES/file-roller.mo
 share/locale/cy/LC_MESSAGES/file-roller.mo
 share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
+share/locale/dz/LC_MESSAGES/file-roller.mo
 share/locale/el/LC_MESSAGES/file-roller.mo
 share/locale/en_CA/LC_MESSAGES/file-roller.mo
 share/locale/en_GB/LC_MESSAGES/file-roller.mo
@@ -142,6 +144,7 @@ share/locale/id/LC_MESSAGES/file-roller.mo
 share/locale/is/LC_MESSAGES/file-roller.mo
 share/locale/it/LC_MESSAGES/file-roller.mo
 share/locale/ja/LC_MESSAGES/file-roller.mo
+share/locale/ka/LC_MESSAGES/file-roller.mo
 share/locale/kn/LC_MESSAGES/file-roller.mo
 share/locale/ko/LC_MESSAGES/file-roller.mo
 share/locale/ku/LC_MESSAGES/file-roller.mo
@@ -155,7 +158,6 @@ share/locale/nb/LC_MESSAGES/file-roller.mo
 share/locale/ne/LC_MESSAGES/file-roller.mo
 share/locale/nl/LC_MESSAGES/file-roller.mo
 share/locale/nn/LC_MESSAGES/file-roller.mo
-share/locale/no/LC_MESSAGES/file-roller.mo
 share/locale/pa/LC_MESSAGES/file-roller.mo
 share/locale/pl/LC_MESSAGES/file-roller.mo
 share/locale/pt/LC_MESSAGES/file-roller.mo
@@ -195,6 +197,10 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
 @dirrm share/gnome/omf/file-roller
 @dirrm share/gnome/help/file-roller/zh_TW/figures
 @dirrm share/gnome/help/file-roller/zh_TW
@@ -220,6 +226,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/help/file-roller/es
 @dirrm share/gnome/help/file-roller/de/figures
 @dirrm share/gnome/help/file-roller/de
+@dirrm share/gnome/help/file-roller/bg/figures
+@dirrm share/gnome/help/file-roller/bg
 @dirrm share/gnome/help/file-roller/C/figures
 @dirrm share/gnome/help/file-roller/C
 @dirrm share/gnome/help/file-roller