svn commit: r301550 - in head: net-im/mbpurple security/libotr security/pidgin-otr

[Doug Barton]

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 at 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 at 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 at 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