Update to 2.3.2.

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

4 files changed, 30 insertions, 25 deletions

diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 5e494318b..d87fb34f0 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -41,6 +41,10 @@ RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
 RUN_DEPENDS+=	bzip:${PORTSDIR}/archivers/bzip
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index f8a9bf421..73102adfe 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1 +1 @@
-MD5 (gnome2/file-roller-2.3.1.tar.gz) = abd4f86d1d71b502d4c9669201081fc8
+MD5 (gnome2/file-roller-2.3.2.tar.gz) = 9ee16e49f500c3076feb27bc4ff1535d
diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c
index 6ae5fcfa3..9a0fb58a8 100644
--- a/archivers/fileroller/files/patch-src_fr-command-tar.c
+++ b/archivers/fileroller/files/patch-src_fr-command-tar.c
@@ -1,32 +1,24 @@
---- src/fr-command-tar.c.orig	Fri Aug  9 09:10:51 2002
-+++ src/fr-command-tar.c	Fri Oct 11 12:14:40 2002
-@@ -117,7 +117,7 @@
- {
- 	int   i;
- 	char *field;
--	int   n = 6;
-+	int   n = 8;
- 
- 	n--;
- 	field = eat_spaces (line);
-@@ -129,6 +129,10 @@
- 	return field;
+--- src/fr-command-tar.c.orig	Mon May 19 14:15:50 2003
++++ src/fr-command-tar.c	Tue May 20 20:43:39 2003
+@@ -83,6 +83,11 @@
+ 	return mktime (&tm);
  }
  
-+static char *months[] = { 
++static char *months[] = {
 +    "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
 +    "Nov", "Dec"
 +};
++
  
  static void
  process_line (char     *line, 
-@@ -138,15 +142,30 @@
- 	FRCommand  *comm = FR_COMMAND (data);
- 	char      **fields;
- 	char       *name_field;
-+	int        i;
-+	struct tm  tm = {0, };
-+	char      **time_fields;
+@@ -92,19 +97,34 @@
+ 	FRCommand   *comm = FR_COMMAND (data);
+ 	char       **fields;
+ 	const char  *name_field;
++	int          i;
++	struct tm    tm = {0, };
++	char       **time_fields;
  
  	g_return_if_fail (line != NULL);
  
@@ -53,3 +45,8 @@
  
  	/* Full path */
  
+-	name_field = get_last_field (line, 6);
++	name_field = get_last_field (line, 8);
+ 	fields = g_strsplit (name_field, " -> ", 2);
+ 
+ 	if (fields[1] == NULL) {
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 7de3c0a49..78e3775f1 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -43,8 +43,7 @@ share/gnome/omf/file-roller/file-roller-C.omf
 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/omf/file-roller/file-roller-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf
-2>/dev/null || /usr/bin/true
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/file-roller.png
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
@@ -64,6 +63,7 @@ share/locale/ga/LC_MESSAGES/file-roller.mo
 share/locale/he/LC_MESSAGES/file-roller.mo
 share/locale/hi/LC_MESSAGES/file-roller.mo
 share/locale/hu/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/kn/LC_MESSAGES/file-roller.mo
@@ -76,13 +76,17 @@ 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/sr/LC_MESSAGES/file-roller.mo
+share/locale/sr@Latn/LC_MESSAGES/file-roller.mo
 share/locale/sv/LC_MESSAGES/file-roller.mo
+share/locale/th/LC_MESSAGES/file-roller.mo
 share/locale/tr/LC_MESSAGES/file-roller.mo
 share/locale/uk/LC_MESSAGES/file-roller.mo
 share/locale/vi/LC_MESSAGES/file-roller.mo