6 files changed, 51 insertions, 21 deletions

diff --git a/net-im/pidgin-msn-pecan/Makefile b/net-im/pidgin-msn-pecan/Makefile
index f88da8d41bf4..65f491940c1d 100644
--- a/net-im/pidgin-msn-pecan/Makefile
+++ b/net-im/pidgin-msn-pecan/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	msn-pecan
-PORTVERSION=	0.0.18
+PORTVERSION=	0.0.19
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	pidgin-
diff --git a/net-im/pidgin-msn-pecan/distinfo b/net-im/pidgin-msn-pecan/distinfo
index 66a203d0cf93..7554ef975a96 100644
--- a/net-im/pidgin-msn-pecan/distinfo
+++ b/net-im/pidgin-msn-pecan/distinfo
@@ -1,3 +1,3 @@
-MD5 (msn-pecan-0.0.18.tar.bz2) = 8e8a6effbea87bad70610d14a01a4429
-SHA256 (msn-pecan-0.0.18.tar.bz2) = 0d05baa980f179645cab77e99b959ffb7f5919be7ebc427cfeb6d689e90e776d
-SIZE (msn-pecan-0.0.18.tar.bz2) = 176774
+MD5 (msn-pecan-0.0.19.tar.bz2) = c21fabd92473dc7fe80d46e8660063a7
+SHA256 (msn-pecan-0.0.19.tar.bz2) = f06bebffa4ed7eca8336437444c6fc0812499266eefe3c6afd48114442483f84
+SIZE (msn-pecan-0.0.19.tar.bz2) = 182250
diff --git a/net-im/pidgin-msn-pecan/files/patch-Makefile b/net-im/pidgin-msn-pecan/files/patch-Makefile
index 12117b12a657..d330a77f8524 100644
--- a/net-im/pidgin-msn-pecan/files/patch-Makefile
+++ b/net-im/pidgin-msn-pecan/files/patch-Makefile
@@ -1,16 +1,25 @@
-diff -Naur ./Makefile ../msn-pecan-0.0.18/Makefile
---- ./Makefile	2009-02-22 14:45:40.000000000 +0100
-+++ ../msn-pecan-0.0.18/Makefile	2009-02-22 14:46:03.000000000 +0100
-@@ -33,7 +33,7 @@
+--- Makefile.orig	2009-06-16 08:23:23.000000000 +0900
++++ Makefile	2009-06-28 01:25:58.549210758 +0900
+@@ -17,8 +17,8 @@
+ LIBSIREN := y
+ PLUS_SOUNDS := y
+ DEBUG := y
+ 
+-CFLAGS := -O2
++#CFLAGS := -O2
+ 
+ ifdef DEBUG
+   CFLAGS += -ggdb
+@@ -34,7 +34,7 @@
  OTHER_WARNINGS := -D_FORTIFY_SOURCE=2 -fstack-protector -g3 -Wdisabled-optimization \
  	-Wendif-labels -Wformat=2 -Wstack-protector -Wswitch
  
 -CFLAGS += -Wall # $(EXTRA_WARNINGS)
-+CFLAGS += -Wall -I/usr/local/include # $(EXTRA_WARNINGS)
++CFLAGS += -Wall -I$(LOCALBASE)/include # $(EXTRA_WARNINGS)
  
- override CFLAGS += -I. -D PACKAGE='"libmsn-pecan"' -DENABLE_NLS -DHAVE_LIBPURPLE -DPURPLE_DEBUG -D PLUGIN_NAME='msn-pecan'
+ override CFLAGS += -I. -D GETTEXT_PACKAGE='"libmsn-pecan"' -DENABLE_NLS -DHAVE_LIBPURPLE -DPURPLE_DEBUG -D PLUGIN_NAME='msn-pecan'
  
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@
  # For glib < 2.6 support (libpurple maniacs)
  FALLBACK_CFLAGS := -I./fix_purple
  
@@ -19,21 +28,12 @@ diff -Naur ./Makefile ../msn-pecan-0.0.18/Makefile
  
  plugin_dir := $(DESTDIR)/$(PURPLE_LIBDIR)/purple-2
  data_dir := $(DESTDIR)/$(PURPLE_DATADIR)
-@@ -131,7 +131,7 @@
- deps := $(objects:.o=.d)
- 
- PO_TEMPLATE := po/messages.pot
--CATALOGS := ar da de es fi tr hu it nb nl pt_BR pt ru sr sv tr zh_CN zh_TW
-+CATALOGS := ar da de es fi tr hu it nb nl pt_BR pt sr sv tr zh_CN zh_TW
- 
- ifeq ($(PLATFORM),Darwin)
-   SHLIBEXT := dylib
 @@ -235,7 +235,7 @@
  
  install_locales: $(foreach e,$(CATALOGS),po/libmsn-pecan-$(e).mo)
  	for x in $(CATALOGS); do \
 -	install -D po/libmsn-pecan-$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
-+	install -m 444 po/libmsn-pecan-$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
++	install -m 0444 po/libmsn-pecan-$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
  	done
  
  -include $(deps)
diff --git a/net-im/pidgin-msn-pecan/files/patch-io-pecan_http_server.h b/net-im/pidgin-msn-pecan/files/patch-io-pecan_http_server.h
new file mode 100644
index 000000000000..6dd9347f8710
--- /dev/null
+++ b/net-im/pidgin-msn-pecan/files/patch-io-pecan_http_server.h
@@ -0,0 +1,10 @@
+--- io/pecan_http_server.h.orig	2009-06-16 08:23:23.000000000 +0900
++++ io/pecan_http_server.h	2009-06-28 01:29:06.320366241 +0900
+@@ -20,6 +20,7 @@
+ #define PECAN_HTTP_SERVER_H
+ 
+ #include <glib-object.h>
++#include <libpurple/proxy.h>
+ 
+ typedef struct PecanHttpServer PecanHttpServer;
+ 
diff --git a/net-im/pidgin-msn-pecan/files/patch-io-pecan_node.h b/net-im/pidgin-msn-pecan/files/patch-io-pecan_node.h
new file mode 100644
index 000000000000..571876dcb756
--- /dev/null
+++ b/net-im/pidgin-msn-pecan/files/patch-io-pecan_node.h
@@ -0,0 +1,10 @@
+--- io/pecan_node.h.orig	2009-06-16 08:23:23.000000000 +0900
++++ io/pecan_node.h	2009-06-28 01:28:58.352985730 +0900
+@@ -20,6 +20,7 @@
+ #define PECAN_NODE_H
+ 
+ #include <glib-object.h>
++#include <libpurple/proxy.h>
+ 
+ typedef struct PecanNode PecanNode;
+ 
diff --git a/net-im/pidgin-msn-pecan/files/patch-io-pecan_ssl_conn.h b/net-im/pidgin-msn-pecan/files/patch-io-pecan_ssl_conn.h
new file mode 100644
index 000000000000..837b29d889ac
--- /dev/null
+++ b/net-im/pidgin-msn-pecan/files/patch-io-pecan_ssl_conn.h
@@ -0,0 +1,10 @@
+--- io/pecan_ssl_conn.h.orig	2009-06-16 08:23:23.000000000 +0900
++++ io/pecan_ssl_conn.h	2009-06-28 01:25:04.495846164 +0900
+@@ -20,6 +20,7 @@
+ #define PECAN_SSL_CONN_H
+ 
+ #include <glib-object.h>
++#include <libpurple/sslconn.h>
+ 
+ #include "io/pecan_node.h"
+