Update to 2.1.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@271 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 50 insertions, 28 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index e5d29a28f..2f0fba559 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.1.2
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 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.1
 DISTNAME=	file-roller-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -26,7 +26,7 @@ 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"
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index e50711399..b79d2adbe 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1 +1 @@
-MD5 (file-roller-2.1.2.tar.gz) = e7efa7584eca4bd6e1b3563f54cf980c
+MD5 (gnome2/file-roller-2.1.4.tar.gz) = e7fb2868bea8807c594f36369551bf13
diff --git a/archivers/file-roller/files/patch-configure b/archivers/file-roller/files/patch-configure
new file mode 100644
index 000000000..53e3c8877
--- /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 0f49c9ab9..856a60476 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
@@ -38,12 +35,17 @@ share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
 share/gnome/omf/file-roller/file-roller-ru.omf
 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/fr/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
@@ -63,7 +65,6 @@ share/locale/vi/LC_MESSAGES/file-roller.mo
 @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
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index e5d29a28f..2f0fba559 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.1.2
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 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.1
 DISTNAME=	file-roller-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -26,7 +26,7 @@ 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"
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index e50711399..b79d2adbe 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1 +1 @@
-MD5 (file-roller-2.1.2.tar.gz) = e7efa7584eca4bd6e1b3563f54cf980c
+MD5 (gnome2/file-roller-2.1.4.tar.gz) = e7fb2868bea8807c594f36369551bf13
diff --git a/archivers/fileroller/files/patch-configure b/archivers/fileroller/files/patch-configure
new file mode 100644
index 000000000..53e3c8877
--- /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 0f49c9ab9..856a60476 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
@@ -38,12 +35,17 @@ share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
 share/gnome/omf/file-roller/file-roller-ru.omf
 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/fr/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
@@ -63,7 +65,6 @@ share/locale/vi/LC_MESSAGES/file-roller.mo
 @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