From 736b93e6a645f1287251c5c0e97dab28cb1afef1 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Sat, 10 Oct 2009 14:12:38 +0000
Subject: [PATCH] update to 1.61

---
 net/pidgin-facebookchat/Makefile               |  6 +++---
 net/pidgin-facebookchat/distinfo               | 10 +++++-----
 net/pidgin-facebookchat/patches/patch-Makefile | 14 ++++++++------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/net/pidgin-facebookchat/Makefile b/net/pidgin-facebookchat/Makefile
index 585908b67ce..6406f60b8a4 100644
--- a/net/pidgin-facebookchat/Makefile
+++ b/net/pidgin-facebookchat/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2009/07/27 20:44:20 steven Exp $
+# $OpenBSD: Makefile,v 1.4 2009/10/10 14:12:38 steven Exp $
 
 SHARED_ONLY =	Yes
 
 COMMENT =	Facebook plugin for Pidgin
 
-V =		1.60
+V =		1.61
 DISTNAME =	pidgin-facebookchat-source-${V}
 PKGNAME =	pidgin-facebookchat-${V}
 CATEGORIES =	net
@@ -26,7 +26,7 @@ WRKDIST =	${WRKDIR}/pidgin-facebookchat
 
 BUILD_DEPENDS =	${RUN_DEPENDS}
 RUN_DEPENDS =	:libpurple->=2.0.0:net/pidgin
-LIB_DEPENDS =	json-glib-1.0::devel/json-glib
+LIB_DEPENDS =	json-glib-1.0.>=1.0:json-glib->=0.7.6:devel/json-glib
 
 MAKE_FLAGS =	LINUX32_COMPILER="${CC}" LOCALBASE=${LOCALBASE}
 ALL_TARGET =	libfacebook.so
diff --git a/net/pidgin-facebookchat/distinfo b/net/pidgin-facebookchat/distinfo
index aaf347dcd11..13228a738f9 100644
--- a/net/pidgin-facebookchat/distinfo
+++ b/net/pidgin-facebookchat/distinfo
@@ -1,5 +1,5 @@
-MD5 (pidgin-facebookchat-source-1.60.tar.bz2) = xKRxXlWFjFFGskE1wVOhqA==
-RMD160 (pidgin-facebookchat-source-1.60.tar.bz2) = fD4GJVMmujWI2EAKkVd4Gh9mfTw=
-SHA1 (pidgin-facebookchat-source-1.60.tar.bz2) = KYO+O88ru8q22R1UPaSngYLSaZA=
-SHA256 (pidgin-facebookchat-source-1.60.tar.bz2) = qxEzHOhyxJAFUZrAeJZ/0JnAuMNQ71S+RsDoAZIS/hk=
-SIZE (pidgin-facebookchat-source-1.60.tar.bz2) = 45795
+MD5 (pidgin-facebookchat-source-1.61.tar.bz2) = nnjyAHENLcgTTU6eXyN2GA==
+RMD160 (pidgin-facebookchat-source-1.61.tar.bz2) = G6oBDboXGGTlkGuXEcHsJklw9tI=
+SHA1 (pidgin-facebookchat-source-1.61.tar.bz2) = IhYaSeSbbo3fji0DjCSVUoH3gHE=
+SHA256 (pidgin-facebookchat-source-1.61.tar.bz2) = xw/u7QXFXano/dJXCUdySZdd0OA69dSdvFeg630Cfic=
+SIZE (pidgin-facebookchat-source-1.61.tar.bz2) = 46966
diff --git a/net/pidgin-facebookchat/patches/patch-Makefile b/net/pidgin-facebookchat/patches/patch-Makefile
index 20298fe65a1..cb6cb425cbd 100644
--- a/net/pidgin-facebookchat/patches/patch-Makefile
+++ b/net/pidgin-facebookchat/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.2 2009/07/27 20:44:20 steven Exp $
---- Makefile.orig	Thu Jul  9 04:18:48 2009
-+++ Makefile	Sun Jul 26 23:38:03 2009
+$OpenBSD: patch-Makefile,v 1.3 2009/10/10 14:12:38 steven Exp $
+--- Makefile.orig	Sun Aug 30 02:18:52 2009
++++ Makefile	Sat Oct 10 14:42:12 2009
 @@ -9,8 +9,8 @@ LINUX_PPC_COMPILER = powerpc-unknown-linux-gnu-gcc
  FREEBSD60_COMPILER = i686-pc-freebsd6.0-gcc
  MACPORT_COMPILER = i686-apple-darwin9-gcc-4.0.1
@@ -11,8 +11,8 @@ $OpenBSD: patch-Makefile,v 1.2 2009/07/27 20:44:20 steven Exp $
 +GLIB_CFLAGS = -I${LOCALBASE}/include `pkg-config --cflags json-glib-1.0` -L${LOCALBASE}/lib -ljson-glib-1.0
  WIN32_DEV_DIR = /root/pidgin/win32-dev
  WIN32_PIDGIN_DIR = /root/pidgin/pidgin-2.3.0_win32
- WIN32_CFLAGS = -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_PIDGIN_DIR}/libpurple/win32 -I${WIN32_DEV_DIR}/gtk_2_0/include -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_DEV_DIR}/gtk_2_0/lib/glib-2.0/include -I/usr/include/json-glib-1.0
-@@ -20,27 +20,16 @@ MACPORT_CFLAGS = -I/opt/local/include/libpurple -DPURP
+ WIN32_CFLAGS = -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_PIDGIN_DIR}/libpurple/win32 -I${WIN32_DEV_DIR}/gtk_2_0/include -I${WIN32_DEV_DIR}/gtk_2_0/include/glib-2.0 -I${WIN32_DEV_DIR}/gtk_2_0/lib/glib-2.0/include -I/usr/include/json-glib-1.0 -Wno-format
+@@ -20,29 +20,17 @@ MACPORT_CFLAGS = -I/opt/local/include/libpurple -DPURP
  DEB_PACKAGE_DIR = ./debdir
  
  FACEBOOK_SOURCES = \
@@ -37,6 +37,8 @@ $OpenBSD: patch-Makefile,v 1.2 2009/07/27 20:44:20 steven Exp $
 -	fb_util.h \
  	fb_util.c \
 -	fb_friendlist.h \
- 	fb_friendlist.c
+ 	fb_friendlist.c \
+-	fb_json.h \
+ 	fb_json.c
  
  #Standard stuff here