- Update to 2.1.3-9

PR:		ports/147273
Submitted by:	Ivan Klymenko <fidaj@ukr.net> (maintainer)

4 files changed, 44 insertions, 11 deletions

diff --git a/deskutils/cairo-dock/files/patch-Makefile.am b/deskutils/cairo-dock/files/patch-Makefile.am
index 3b6bbfd36a00..715162000fa8 100644
--- a/deskutils/cairo-dock/files/patch-Makefile.am
+++ b/deskutils/cairo-dock/files/patch-Makefile.am
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2010-02-03 23:18:44.000000000 +0200
-+++ src/Makefile.am	2010-02-03 23:18:54.000000000 +0200
-@@ -45,8 +45,6 @@
+--- src/Makefile.am.orig	2010-05-05 18:34:05.000000000 +0300
++++ src/Makefile.am	2010-05-05 18:34:23.000000000 +0300
+@@ -46,8 +46,6 @@
  	-DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\
  	-DGL_GLEXT_PROTOTYPES=\""1"\"\
  	-std=c99\
diff --git a/deskutils/cairo-dock/files/patch-Makefile.in b/deskutils/cairo-dock/files/patch-Makefile.in
index 52e04094b06f..56ff353cec8a 100644
--- a/deskutils/cairo-dock/files/patch-Makefile.in
+++ b/deskutils/cairo-dock/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2010-02-03 23:18:44.000000000 +0200
-+++ src/Makefile.in	2010-02-03 23:19:01.000000000 +0200
-@@ -350,8 +350,6 @@
+--- src/Makefile.in.orig	2010-05-05 18:34:41.000000000 +0300
++++ src/Makefile.in	2010-05-05 18:34:46.000000000 +0300
+@@ -378,8 +378,6 @@
  	-DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\
  	-DGL_GLEXT_PROTOTYPES=\""1"\"\
  	-std=c99\
diff --git a/deskutils/cairo-dock/files/patch-configure b/deskutils/cairo-dock/files/patch-configure
index e1b5d81ed79d..280ae877ecd5 100644
--- a/deskutils/cairo-dock/files/patch-configure
+++ b/deskutils/cairo-dock/files/patch-configure
@@ -1,9 +1,9 @@
---- configure.orig	2010-01-31 18:18:42.000000000 +0200
-+++ configure	2010-01-31 18:18:52.000000000 +0200
-@@ -15044,8 +15044,8 @@
+--- configure.orig	2010-05-05 18:36:30.000000000 +0300
++++ configure	2010-05-05 18:36:48.000000000 +0300
+@@ -13091,8 +13091,8 @@
+ fi
  
- 
- if test "$LIBCRYPT_LIBS" != "" ; then
+  if test "$LIBCRYPT_LIBS" != "" ; then
 -  HAVE_LIBCRYPT_TRUE=
 -  HAVE_LIBCRYPT_FALSE='#'
 +  HAVE_LIBCRYPT_TRUE='#'
diff --git a/deskutils/cairo-dock/files/patch-fetch b/deskutils/cairo-dock/files/patch-fetch
new file mode 100644
index 000000000000..a2c10bc50702
--- /dev/null
+++ b/deskutils/cairo-dock/files/patch-fetch
@@ -0,0 +1,33 @@
+--- cairo-dock-package-theme	2010-02-13 11:55:45.000000000 +0100
++++ cairo-dock-package-theme	2010-06-28 18:48:36.000000000 +0200
+@@ -1,3 +1,3 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # Packager for Cairo-Dock
+@@ -126,5 +126,5 @@
+ 		#\__________ On cherche si ce theme est un theme officiel ou non.
+ 		echo "un theme est present ($theme)"
+-		wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30
++		fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
+ 		if test -f "liste.tmp" ; then
+ 			grep "^\[${theme}\]" "liste.tmp"
+--- src/cairo-dock-themes-manager.c	2010-04-03 14:32:50.000000000 +0200
++++ src/cairo-dock-themes-manager.c	2010-06-28 18:47:19.000000000 +0200
+@@ -143,8 +143,16 @@
+ 	//\_______________ On lance le download.
+ 	//gchar *cCommand = g_strdup_printf ("%s wget \"%s/%s/%s\" -O \"%s\" -t %d -T %d%s", (iShowActivity == 2 ? "$TERM -e '" : ""), cServerAdress, cDistantFilePath, cDistantFileName, cTmpFilePath, CAIRO_DOCK_DL_NB_RETRY, CAIRO_DOCK_DL_TIMEOUT, (iShowActivity == 2 ? "'" : ""));
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__)
++	gchar *cCommand = g_strdup_printf ("/usr/bin/fetch -qo \"%s\" -T %d \"%s/%s/%s\"",
++		cTmpFilePath,
++		cServerAdress, cDistantFilePath, cDistantFileName,
++		mySystem.iConnectionTimeout);
++	cd_debug ("download with 'MaxTime' and 'NbRetries' parameters ignored with fetch(1)");
++#else
+ 	gchar *cCommand = g_strdup_printf ("curl -s \"%s/%s/%s\" --output \"%s\" --connect-timeout %d --max-time %d --retry %d",
+ 		cServerAdress, cDistantFilePath, cDistantFileName,
+ 		cTmpFilePath,
+ 		mySystem.iConnectionTimeout, mySystem.iConnectiontMaxTime, mySystem.iConnectiontNbRetries);
++#endif
+ 	cd_debug ("download with '%s'", cCommand);
+ 	int r = system (cCommand);