* Remove patch-ab.

  It does not support python27 and python31, but basically pkgsrc pass python
  path as PYTHON configure environment variable, so no need to add python
  variants here.
* Pass mozilla-rootcerts path as default CA certifcates file path to configure
  script like other packeges, or failed to configure if default expected
  files does not exist.
* On more care for in-tree *.pc file, or fail to configure.
  configure script add in-tree path to PKG_CONFIG, but pkgsrc pkg-config wrapper
  will overwrite and hide it.
* Set LICENSE as "gnu-lgpl-v2.1 AND mit" from COPYING file.

3 files changed, 10 insertions, 17 deletions

diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile
index a4d2aa92e9a..650522ddb76 100644
--- a/chat/telepathy-gabble/Makefile
+++ b/chat/telepathy-gabble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/06/10 09:39:49 obache Exp $
+# $NetBSD: Makefile,v 1.17 2011/07/04 07:08:24 obache Exp $
 #
 
 DISTNAME=	telepathy-gabble-0.11.10
@@ -9,6 +9,7 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-gabble/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://telepathy.freedesktop.org/wiki/Components
 COMMENT=	Jabber/XMPP connection manager for Telepathy
+LICENSE=	gnu-lgpl-v2.1 AND mit
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
@@ -19,10 +20,16 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 CONFIGURE_ENV+=	UUID_CFLAGS=" " UUID_LIBS=" "
 
-pre-configure: wocky-pkg-config-hack
+# see pkgsrc/security/mozilla-rootcerts
+CONFIGURE_ARGS+=	--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
+
+# pkgsrc pkg-config wrapper hide *.pc files in source tree with PKG_CONFIG.
+BUILDLINK_TARGETS+=	wocky-pkg-config-hack
 wocky-pkg-config-hack:
 	${LN} -s ${WRKSRC}/lib/ext/wocky/wocky/wocky-uninstalled.pc \
 		${BUILDLINK_DIR}/lib/pkgconfig
+	${LN} -s ${WRKSRC}/lib/ext/telepathy-yell/telepathy-yell/telepathy-yell-uninstalled.pc \
+		${BUILDLINK_DIR}/lib/pkgconfig
 
 BUILDLINK_API_DEPENDS.telepathy-glib+=	telepathy-glib>=0.7.37
 .include "../../chat/telepathy-glib/buildlink3.mk"
diff --git a/chat/telepathy-gabble/distinfo b/chat/telepathy-gabble/distinfo
index fff3f42c520..80914e66e1b 100644
--- a/chat/telepathy-gabble/distinfo
+++ b/chat/telepathy-gabble/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.10 2011/04/05 18:47:20 drochner Exp $
+$NetBSD: distinfo,v 1.11 2011/07/04 07:08:24 obache Exp $
 
 SHA1 (telepathy-gabble-0.11.10.tar.gz) = 26ca4e8a98b01b78007f88caea56b08ae5070fdd
 RMD160 (telepathy-gabble-0.11.10.tar.gz) = b4906a01b8cc6e6630e1707e97250bcdefeac9c4
 Size (telepathy-gabble-0.11.10.tar.gz) = 3443486 bytes
-SHA1 (patch-ab) = 984544201507c0a5f9d2bc24b0fbeab9c061a197
diff --git a/chat/telepathy-gabble/patches/patch-ab b/chat/telepathy-gabble/patches/patch-ab
deleted file mode 100644
index a6b1bba14d6..00000000000
--- a/chat/telepathy-gabble/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2011/04/05 18:47:20 drochner Exp $
-
---- configure.orig	2010-06-14 16:12:31.000000000 +0000
-+++ configure
-@@ -12855,7 +12855,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
-   $as_echo_n "(cached) " >&6
- else
- 
--	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
-+	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
- 	  test "$am_cv_pathless_PYTHON" = none && break
- 	  prog="import sys
- # split strings by '.' and convert to numeric.  Append some zeros