* Not depend on GTK2+, depend on zlib.

* Honor CFLAGS and LDFLAGS (and rpath issue will be resolved).

Bump PKGREVISION.

3 files changed, 16 insertions, 13 deletions

diff --git a/chat/pidgin-facebookchat/Makefile b/chat/pidgin-facebookchat/Makefile
index 3f909c434e1..e9150a231b8 100644
--- a/chat/pidgin-facebookchat/Makefile
+++ b/chat/pidgin-facebookchat/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2012/06/14 07:44:14 sbd Exp $
+# $NetBSD: Makefile,v 1.25 2012/06/22 13:46:30 obache Exp $
 
 DISTNAME=	pidgin-facebookchat-source-1.69
 PKGNAME=	${DISTNAME:S/-source-/-/}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	chat
 MASTER_SITES=	http://pidgin-facebookchat.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -32,7 +32,7 @@ INSTALLATION_DIRS+=	lib/purple-2
 
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.json-glib+=	json-glib>=0.7.6
 .include "../../textproc/json-glib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/pidgin-facebookchat/distinfo b/chat/pidgin-facebookchat/distinfo
index b59518d18fe..baaecbcda2a 100644
--- a/chat/pidgin-facebookchat/distinfo
+++ b/chat/pidgin-facebookchat/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2011/10/05 09:23:44 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/06/22 13:46:30 obache Exp $
 
 SHA1 (pidgin-facebookchat-source-1.69.tar.bz2) = a266e8aeb0b61fde2c5d84fcad93c0615b69a76a
 RMD160 (pidgin-facebookchat-source-1.69.tar.bz2) = a38b0576bdd9f7f61156e7720231fa7424366a45
 Size (pidgin-facebookchat-source-1.69.tar.bz2) = 50532 bytes
-SHA1 (patch-aa) = 43e1c7ab640f2d9d261d593a022137b85c0c1542
+SHA1 (patch-aa) = f204b583194de127fa88d722b5d0b0363f18f1ae
diff --git a/chat/pidgin-facebookchat/patches/patch-aa b/chat/pidgin-facebookchat/patches/patch-aa
index 9526d89b38f..9531af992e1 100644
--- a/chat/pidgin-facebookchat/patches/patch-aa
+++ b/chat/pidgin-facebookchat/patches/patch-aa
@@ -1,17 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2011/10/05 09:23:44 obache Exp $
+$NetBSD: patch-aa,v 1.4 2012/06/22 13:46:30 obache Exp $
 
 * not to build&install redundant plugins.
 * pidin>=2.7.9 contains facebook.png.
+* honor CFLAGS and LDFLAGS.
 
 --- Makefile.orig	2010-10-08 11:35:45.000000000 +0000
 +++ Makefile
-@@ -1,5 +1,5 @@
- #Customisable stuff here
--LINUX32_COMPILER = i686-pc-linux-gnu-gcc
-+LINUX32_COMPILER = ${CC}
- LINUX64_COMPILER = x86_64-pc-linux-gnu-gcc
- WIN32_COMPILER = /usr/bin/i586-mingw32-gcc
- WIN32_WINDRES = i586-mingw32-windres
 @@ -52,16 +52,10 @@ FACEBOOK_SOURCES = \
  #Standard stuff here
  .PHONY:	all clean install sourcepackage
@@ -30,3 +24,12 @@ $NetBSD: patch-aa,v 1.3 2011/10/05 09:23:44 obache Exp $
  
  installers:	pidgin-facebookchat.exe pidgin-facebookchat.deb pidgin-facebookchat.tar.bz2
  
+@@ -73,7 +67,7 @@ libfacebook.macport.so: ${FACEBOOK_SOURC
+ 	${MACPORT_COMPILER} ${MACPORT_CFLAGS} -Wall -I. -g -O2 -pipe ${FACEBOOK_SOURCES} -o libfacebook.macport.so -shared
+ 
+ libfacebook.so:	${FACEBOOK_SOURCES}
+-	${LINUX32_COMPILER} ${LIBPURPLE_CFLAGS} -Wall ${GLIB_CFLAGS} -I. -g -O2 -pipe ${FACEBOOK_SOURCES} -o libfacebook.so -shared -fPIC -DPIC
++	${CC} ${CFLAGS} ${LIBPURPLE_CFLAGS} -Wall ${LDFLAGS} ${GLIB_CFLAGS} -I.  ${FACEBOOK_SOURCES} -o libfacebook.so -shared -fPIC -DPIC
+ 
+ libfacebookxmpp.so:	libfbxmpp.c ${FACEBOOK_SOURCES}
+ 	${LINUX32_COMPILER} ${LIBPURPLE_CFLAGS} -Wall ${GLIB_CFLAGS} -I. -g -O2 -pipe libfbxmpp.c ${FACEBOOK_SOURCES} -o libfacebookxmpp.so -shared -fPIC -DPIC -I$(PIDGIN_DIR)/libpurple/protocols/jabber/ -lxml2 -I/usr/include/libxml2