7 files changed, 18 insertions, 56 deletions

diff --git a/net-im/pidgin-msn-pecan/Makefile b/net-im/pidgin-msn-pecan/Makefile
index 0fc3471cc4e6..49d6972c68e5 100644
--- a/net-im/pidgin-msn-pecan/Makefile
+++ b/net-im/pidgin-msn-pecan/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	msn-pecan
-PORTVERSION=	0.0.19
-PORTREVISION=	1
+PORTVERSION=	0.1.0.r1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	pidgin-
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 
 MAINTAINER=	hrkfdn@gmail.com
 COMMENT=	Alternative MSN protocol plugin for libpurple
diff --git a/net-im/pidgin-msn-pecan/distinfo b/net-im/pidgin-msn-pecan/distinfo
index 7554ef975a96..f64570bedb46 100644
--- a/net-im/pidgin-msn-pecan/distinfo
+++ b/net-im/pidgin-msn-pecan/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (msn-pecan-0.1.0-rc1.tar.bz2) = 67686d16ff1cb7410a374c231931512d
+SHA256 (msn-pecan-0.1.0-rc1.tar.bz2) = c788fab679c0151103c430de96268e8414c59a0b5416b67484cdadf939712bba
+SIZE (msn-pecan-0.1.0-rc1.tar.bz2) = 235687
diff --git a/net-im/pidgin-msn-pecan/files/patch-Makefile b/net-im/pidgin-msn-pecan/files/patch-Makefile
index d330a77f8524..abb8d36a702b 100644
--- a/net-im/pidgin-msn-pecan/files/patch-Makefile
+++ b/net-im/pidgin-msn-pecan/files/patch-Makefile
@@ -1,25 +1,16 @@
---- 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 @@
+diff -Naur ./Makefile ../msn-pecan-0.1.0-rc1/Makefile
+--- ./Makefile	2009-09-08 22:14:07.000000000 +0200
++++ ../msn-pecan-0.1.0-rc1/Makefile	2009-09-08 22:17:43.000000000 +0200
+@@ -41,7 +41,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$(LOCALBASE)/include # $(EXTRA_WARNINGS)
- 
- override CFLAGS += -I. -D GETTEXT_PACKAGE='"libmsn-pecan"' -DENABLE_NLS -DHAVE_LIBPURPLE -DPURPLE_DEBUG -D PLUGIN_NAME='msn-pecan'
++CFLAGS += -Wall -I${LOCALBASE}/include # $(EXTRA_WARNINGS)
  
-@@ -61,7 +61,7 @@
+ override CFLAGS += -D_XOPEN_SOURCE
+ override CFLAGS += -I. -DENABLE_NLS -DHAVE_LIBPURPLE -DPURPLE_DEBUG
+@@ -74,7 +74,7 @@
  # For glib < 2.6 support (libpurple maniacs)
  FALLBACK_CFLAGS := -I./fix_purple
  
@@ -28,12 +19,12 @@
  
  plugin_dir := $(DESTDIR)/$(PURPLE_LIBDIR)/purple-2
  data_dir := $(DESTDIR)/$(PURPLE_DATADIR)
-@@ -235,7 +235,7 @@
+@@ -263,7 +263,7 @@
  
- install_locales: $(foreach e,$(CATALOGS),po/libmsn-pecan-$(e).mo)
+ install_locales: $(foreach e,$(CATALOGS),po/$(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 0444 po/libmsn-pecan-$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
+-	install -D po/$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
++	install -m 0444 po/$$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
deleted file mode 100644
index 6dd9347f8710..000000000000
--- a/net-im/pidgin-msn-pecan/files/patch-io-pecan_http_server.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 571876dcb756..000000000000
--- a/net-im/pidgin-msn-pecan/files/patch-io-pecan_node.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 837b29d889ac..000000000000
--- a/net-im/pidgin-msn-pecan/files/patch-io-pecan_ssl_conn.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
- 
diff --git a/net-im/pidgin-msn-pecan/pkg-plist b/net-im/pidgin-msn-pecan/pkg-plist
index 4d10c061c737..e8cea0179c57 100644
--- a/net-im/pidgin-msn-pecan/pkg-plist
+++ b/net-im/pidgin-msn-pecan/pkg-plist
@@ -4,6 +4,7 @@ share/locale/da/LC_MESSAGES/libmsn-pecan.mo
 share/locale/de/LC_MESSAGES/libmsn-pecan.mo
 share/locale/es/LC_MESSAGES/libmsn-pecan.mo
 share/locale/fi/LC_MESSAGES/libmsn-pecan.mo
+share/locale/fr/LC_MESSAGES/libmsn-pecan.mo
 share/locale/hu/LC_MESSAGES/libmsn-pecan.mo
 share/locale/it/LC_MESSAGES/libmsn-pecan.mo
 share/locale/nb/LC_MESSAGES/libmsn-pecan.mo