Attachment #99552 for bug #138641

View | Details | Raw Unified | Return to bug 138641
Collapse All | Expand All




#

PORTNAME=	msn-pecan
PORTVERSION=	0.1.0.r1
PORTREVISION=	1
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

Lines 1-3 Link Here

(-)../pidgin-msn-pecan/distinfo (-3 / +3 lines)
1	MD5 (msn-pecan-0.0.19.tar.bz2) = c21fabd92473dc7fe80d46e8660063a7	1	MD5 (msn-pecan-0.1.0-rc1.tar.bz2) = 67686d16ff1cb7410a374c231931512d
2	SHA256 (msn-pecan-0.0.19.tar.bz2) = f06bebffa4ed7eca8336437444c6fc0812499266eefe3c6afd48114442483f84	2	SHA256 (msn-pecan-0.1.0-rc1.tar.bz2) = c788fab679c0151103c430de96268e8414c59a0b5416b67484cdadf939712bba
3	SIZE (msn-pecan-0.0.19.tar.bz2) = 182250	3	SIZE (msn-pecan-0.1.0-rc1.tar.bz2) = 235687




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 @@
 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${LOCALBASE}/include # $(EXTRA_WARNINGS)
 
 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
 

 
 plugin_dir := $(DESTDIR)/$(PURPLE_LIBDIR)/purple-2
 data_dir := $(DESTDIR)/$(PURPLE_DATADIR)
@@ -263,7 +263,7 @@
 
 install_locales: $(foreach e,$(CATALOGS),po/$(e).mo)
 	for x in $(CATALOGS); do \
-	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)

Lines 1-10 Link Here

(-)../pidgin-msn-pecan/files/patch-io-pecan_http_server.h (-10 lines)
1	--- io/pecan_http_server.h.orig 2009-06-16 08:23:23.000000000 +0900
2	+++ io/pecan_http_server.h 2009-06-28 01:29:06.320366241 +0900
3	@@ -20,6 +20,7 @@
4	#define PECAN_HTTP_SERVER_H
5
6	#include <glib-object.h>
7	+#include <libpurple/proxy.h>
8
9	typedef struct PecanHttpServer PecanHttpServer;
10

Lines 1-10 Link Here

(-)../pidgin-msn-pecan/files/patch-io-pecan_node.h (-10 lines)
1	--- io/pecan_node.h.orig 2009-06-16 08:23:23.000000000 +0900
2	+++ io/pecan_node.h 2009-06-28 01:28:58.352985730 +0900
3	@@ -20,6 +20,7 @@
4	#define PECAN_NODE_H
5
6	#include <glib-object.h>
7	+#include <libpurple/proxy.h>
8
9	typedef struct PecanNode PecanNode;
10

Lines 1-10 Link Here

(-)../pidgin-msn-pecan/files/patch-io-pecan_ssl_conn.h (-10 lines)
1	--- io/pecan_ssl_conn.h.orig 2009-06-16 08:23:23.000000000 +0900
2	+++ io/pecan_ssl_conn.h 2009-06-28 01:25:04.495846164 +0900
3	@@ -20,6 +20,7 @@
4	#define PECAN_SSL_CONN_H
5
6	#include <glib-object.h>
7	+#include <libpurple/sslconn.h>
8
9	#include "io/pecan_node.h"
10

Lines 4-9 Link Here

(-)../pidgin-msn-pecan/pkg-plist (+1 lines)
4	share/locale/de/LC_MESSAGES/libmsn-pecan.mo	4	share/locale/de/LC_MESSAGES/libmsn-pecan.mo
5	share/locale/es/LC_MESSAGES/libmsn-pecan.mo	5	share/locale/es/LC_MESSAGES/libmsn-pecan.mo
6	share/locale/fi/LC_MESSAGES/libmsn-pecan.mo	6	share/locale/fi/LC_MESSAGES/libmsn-pecan.mo
		7	share/locale/fr/LC_MESSAGES/libmsn-pecan.mo
7	share/locale/hu/LC_MESSAGES/libmsn-pecan.mo	8	share/locale/hu/LC_MESSAGES/libmsn-pecan.mo
8	share/locale/it/LC_MESSAGES/libmsn-pecan.mo	9	share/locale/it/LC_MESSAGES/libmsn-pecan.mo
9	share/locale/nb/LC_MESSAGES/libmsn-pecan.mo	10	share/locale/nb/LC_MESSAGES/libmsn-pecan.mo

Return to bug 138641

Lines 6-16 Link Here

(-)../pidgin-msn-pecan/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= msn-pecan	8	PORTNAME= msn-pecan
9	PORTVERSION= 0.0.19	9	PORTVERSION= 0.1.0.r1
10	PORTREVISION= 1
11	CATEGORIES= net-im	10	CATEGORIES= net-im
12	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	11	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
13	PKGNAMEPREFIX= pidgin-	12	PKGNAMEPREFIX= pidgin-
		13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
14		14
15	MAINTAINER= hrkfdn@gmail.com	15	MAINTAINER= hrkfdn@gmail.com
16	COMMENT= Alternative MSN protocol plugin for libpurple	16	COMMENT= Alternative MSN protocol plugin for libpurple

Lines 1-25 Link Here

(-)../pidgin-msn-pecan/files/patch-Makefile (-21 / +12 lines)
1	--- Makefile.orig 2009-06-16 08:23:23.000000000 +0900	1	diff -Naur ./Makefile ../msn-pecan-0.1.0-rc1/Makefile
2	+++ Makefile 2009-06-28 01:25:58.549210758 +0900	2	--- ./Makefile 2009-09-08 22:14:07.000000000 +0200
3	@@ -17,8 +17,8 @@	3	+++ ../msn-pecan-0.1.0-rc1/Makefile 2009-09-08 22:17:43.000000000 +0200
4	LIBSIREN := y	4	@@ -41,7 +41,7 @@
5	PLUS_SOUNDS := y
6	DEBUG := y
7
8	-CFLAGS := -O2
9	+#CFLAGS := -O2
10
11	ifdef DEBUG
12	CFLAGS += -ggdb
13	@@ -34,7 +34,7 @@
14	OTHER_WARNINGS := -D_FORTIFY_SOURCE=2 -fstack-protector -g3 -Wdisabled-optimization \	5	OTHER_WARNINGS := -D_FORTIFY_SOURCE=2 -fstack-protector -g3 -Wdisabled-optimization \
15	-Wendif-labels -Wformat=2 -Wstack-protector -Wswitch	6	-Wendif-labels -Wformat=2 -Wstack-protector -Wswitch
16		7
17	-CFLAGS += -Wall # $(EXTRA_WARNINGS)	8	-CFLAGS += -Wall # $(EXTRA_WARNINGS)
18	+CFLAGS += -Wall -I$(LOCALBASE)/include # $(EXTRA_WARNINGS)	9	+CFLAGS += -Wall -I${LOCALBASE}/include # $(EXTRA_WARNINGS)
19		10
20	override CFLAGS += -I. -D GETTEXT_PACKAGE='"libmsn-pecan"' -DENABLE_NLS -DHAVE_LIBPURPLE -DPURPLE_DEBUG -D PLUGIN_NAME='msn-pecan'	11	override CFLAGS += -D_XOPEN_SOURCE
21		12	override CFLAGS += -I. -DENABLE_NLS -DHAVE_LIBPURPLE -DPURPLE_DEBUG
22	@@ -61,7 +61,7 @@	13	@@ -74,7 +74,7 @@
23	# For glib < 2.6 support (libpurple maniacs)	14	# For glib < 2.6 support (libpurple maniacs)
24	FALLBACK_CFLAGS := -I./fix_purple	15	FALLBACK_CFLAGS := -I./fix_purple
25		16
Lines 28-39 Link Here
28		19
29	plugin_dir := $(DESTDIR)/$(PURPLE_LIBDIR)/purple-2	20	plugin_dir := $(DESTDIR)/$(PURPLE_LIBDIR)/purple-2
30	data_dir := $(DESTDIR)/$(PURPLE_DATADIR)	21	data_dir := $(DESTDIR)/$(PURPLE_DATADIR)
31	@@ -235,7 +235,7 @@	22	@@ -263,7 +263,7 @@
32		23
33	install_locales: $(foreach e,$(CATALOGS),po/libmsn-pecan-$(e).mo)	24	install_locales: $(foreach e,$(CATALOGS),po/$(e).mo)
34	for x in $(CATALOGS); do \	25	for x in $(CATALOGS); do \
35	- install -D po/libmsn-pecan-$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \	26	- install -D po/$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
36	+ install -m 0444 po/libmsn-pecan-$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \	27	+ install -m 0444 po/$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
37	done	28	done
38		29
39	-include $(deps)	30	-include $(deps)