From owner-svn-ports-all@FreeBSD.ORG  Thu Jul 26 07:13:53 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C2E6F1065673;
	Thu, 26 Jul 2012 07:13:53 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 940788FC0A;
	Thu, 26 Jul 2012 07:13:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6Q7DraU050650;
	Thu, 26 Jul 2012 07:13:53 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6Q7Dr56050646;
	Thu, 26 Jul 2012 07:13:53 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201207260713.q6Q7Dr56050646@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 26 Jul 2012 07:13:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301550 - in head: net-im/mbpurple security/libotr
	security/pidgin-otr
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jul 2012 07:13:53 -0000

Author: dougb
Date: Thu Jul 26 07:13:52 2012
New Revision: 301550
URL: http://svn.freebsd.org/changeset/ports/301550

Log:
  Revert the unauthorized conversion of pkg-config from a proper build dep
  to the new macro (r301539). Convert pkg-config to pkgconf.
  
  Add a build dep on pkgconf to pidgin-otr to handle libotr's .pc files

Modified:
  head/net-im/mbpurple/Makefile
  head/security/libotr/Makefile
  head/security/pidgin-otr/Makefile

Modified: head/net-im/mbpurple/Makefile
==============================================================================
--- head/net-im/mbpurple/Makefile	Thu Jul 26 06:48:48 2012	(r301549)
+++ head/net-im/mbpurple/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
@@ -13,12 +13,12 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	Integrate twitter with pidgin (AKA microblog-purple)
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
+BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
+		pkgconf>0:${PORTSDIR}/devel/pkgconf
 RUN_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
 
 PROJECTHOST=	microblog-purple
 USE_GMAKE=	yes
-USE_PKGCONFIG=	yes
 
 post-patch:
 	@${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.Dist

Modified: head/security/libotr/Makefile
==============================================================================
--- head/security/libotr/Makefile	Thu Jul 26 06:48:48 2012	(r301549)
+++ head/security/libotr/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
@@ -20,6 +20,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	The portable OTR Messaging Library and toolkit
 
+BUILD_DEPENDS=	pkgconf>0:${PORTSDIR}/devel/pkgconf
 LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
@@ -27,7 +28,6 @@ MAKE_JOBS_SAFE=	yes
 
 USE_AUTOTOOLS=	autoconf libtool
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
 
 MAN1=		otr_toolkit.1
 MLINKS=		otr_toolkit.1 otr_parse.1 \

Modified: head/security/pidgin-otr/Makefile
==============================================================================
--- head/security/pidgin-otr/Makefile	Thu Jul 26 06:48:48 2012	(r301549)
+++ head/security/pidgin-otr/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
@@ -21,7 +21,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	Allows deniable private conversations using Pidgin
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
+BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
+		pkgconf>0:${PORTSDIR}/devel/pkgconf
 LIB_DEPENDS=	otr:${PORTSDIR}/security/libotr \
 		gcrypt:${PORTSDIR}/security/libgcrypt \
 		purple:${PORTSDIR}/net-im/libpurple