aboutsummaryrefslogtreecommitdiffstats
path: root/net-im
diff options
context:
space:
mode:
authormandree <mandree@FreeBSD.org>2010-12-22 07:49:09 +0800
committermandree <mandree@FreeBSD.org>2010-12-22 07:49:09 +0800
commitb49c5db60eecf6cb7d19e2268862552aff9163d9 (patch)
tree7fd405e09d0ea8c23f1c90053ea4b9cf03ba55ef /net-im
parente7866b08f43f5a621d664ce2e0032d15c98b84d9 (diff)
downloadfreebsd-ports-gnome-b49c5db60eecf6cb7d19e2268862552aff9163d9.tar.gz
freebsd-ports-gnome-b49c5db60eecf6cb7d19e2268862552aff9163d9.tar.zst
freebsd-ports-gnome-b49c5db60eecf6cb7d19e2268862552aff9163d9.zip
Update to upstream SVN rev 605, removing patch.
Fix build-tarball Makefile target, adding missing ${DISTFILES}: target.
Diffstat (limited to 'net-im')
-rw-r--r--net-im/pidgin-skype/Makefile3
-rw-r--r--net-im/pidgin-skype/distinfo4
-rw-r--r--net-im/pidgin-skype/files/patch-skype_messaging.c32
3 files changed, 4 insertions, 35 deletions
diff --git a/net-im/pidgin-skype/Makefile b/net-im/pidgin-skype/Makefile
index 720a8949f51a..a9674d22ede0 100644
--- a/net-im/pidgin-skype/Makefile
+++ b/net-im/pidgin-skype/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= pidgin-skype
-PORTVERSION= 0.0.0.604
+PORTVERSION= 0.0.0.605
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mandree
@@ -28,6 +28,7 @@ USE_XZ= yes
# this is a local target to build a tarball
build-tarball: ${DISTFILES}
+${DISTFILES}:
${RM} -rf ${WRKSRC}
svn export -r${PORTVERSION:E} \
http://skype4pidgin.googlecode.com/svn/trunk/ ${WRKSRC}
diff --git a/net-im/pidgin-skype/distinfo b/net-im/pidgin-skype/distinfo
index 3eeff73ff5ac..c7707472d680 100644
--- a/net-im/pidgin-skype/distinfo
+++ b/net-im/pidgin-skype/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pidgin-skype-svn-r604.tar.xz) = c32da346e2baf4105dc5e52be89243fbe8a14e04c5414afaed73d7d6475bc75b
-SIZE (pidgin-skype-svn-r604.tar.xz) = 113888
+SHA256 (pidgin-skype-svn-r605.tar.xz) = 9ae6e905653b9b7cfe8529c144566d0a5090bfca257d4746b1a52050f2a688c0
+SIZE (pidgin-skype-svn-r605.tar.xz) = 113900
diff --git a/net-im/pidgin-skype/files/patch-skype_messaging.c b/net-im/pidgin-skype/files/patch-skype_messaging.c
deleted file mode 100644
index 43ac79c0c36e..000000000000
--- a/net-im/pidgin-skype/files/patch-skype_messaging.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./skype_messaging.c.orig 2010-01-28 02:22:49.000000000 +0100
-+++ ./skype_messaging.c 2010-12-20 02:20:23.000000000 +0100
-@@ -176,7 +176,7 @@
- #ifdef __APPLE__
- guint timeout = 0;
- #else
--#ifdef _WIN32
-+#if _WIN32 || __FreeBSD__
- guint timeout = 0;
- #else
- gboolean condition_result;
-@@ -223,6 +223,12 @@
-
- if (timeout++ == 10000)
- #else
-+#ifdef __FreeBSD__
-+ usleep(1000);
-+ g_static_mutex_lock2(&mutex);
-+
-+ if (timeout++ == 10000)
-+#else
-
- //wait for message for a maximum of 10 seconds
- g_get_current_time(&endtime);
-@@ -235,6 +241,7 @@
- if(!condition_result)
- #endif
- #endif
-+#endif
- {
- //we timed out while waiting
- g_hash_table_remove(message_queue, &cur_message_num);