svn commit: r301551 - in head: irc/bitlbee irc/irssi-otr net-im/climm net-im/mcabber net/kdenetwork4 security/kopete-otr security/py-otr

[Doug Barton]

Author: dougb
Date: Thu Jul 26 07:19:30 2012
New Revision: 301551
URL: http://svn.freebsd.org/changeset/ports/301551

Log:
  For ports that depend on security/libotr, add the new USE_PKGCONFIG macro.
  
  For all but kdenetwork4 use =build. For it use both just in case.
  
  For net-im/clim also fix the manual call to pkg-config for CONFIGURE_ENV

Modified:
  head/irc/bitlbee/Makefile
  head/irc/irssi-otr/Makefile
  head/net-im/climm/Makefile
  head/net-im/mcabber/Makefile
  head/net/kdenetwork4/Makefile
  head/security/kopete-otr/Makefile
  head/security/py-otr/Makefile

Modified: head/irc/bitlbee/Makefile
==============================================================================
--- head/irc/bitlbee/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
+++ head/irc/bitlbee/Makefile	Thu Jul 26 07:19:30 2012	(r301551)
@@ -26,6 +26,7 @@ PORTEXAMPLES=	bitlbee.conf motd.txt
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 USE_RC_SUBR=	bitlbee
 PKGMESSAGE=	${WRKDIR}/pkg-message
 

Modified: head/irc/irssi-otr/Makefile
==============================================================================
--- head/irc/irssi-otr/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
+++ head/irc/irssi-otr/Makefile	Thu Jul 26 07:19:30 2012	(r301551)
@@ -27,6 +27,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USE_CMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 
 PLIST_FILES=	lib/irssi/modules/libotr.so \
 		%%DOCSDIR%%/LICENSE %%DOCSDIR%%/README

Modified: head/net-im/climm/Makefile
==============================================================================
--- head/net-im/climm/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
+++ head/net-im/climm/Makefile	Thu Jul 26 07:19:30 2012	(r301551)
@@ -17,6 +17,7 @@ MAINTAINER=	johans at FreeBSD.org
 COMMENT=	CLI-based Multi-Messenger
 
 USE_GMAKE=	yes
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -70,7 +71,7 @@ CONFIGURE_ARGS+=	--disable-remote
 CFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-xmpp --enable-ssl=gnutls \
 			--with-libgcrypt-prefix=${LOCALBASE}
-CONFIGURE_ENV+=		LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config gnutls"
+CONFIGURE_ENV+=		LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkgconf gnutls"
 USE_PKGCONFIG=		yes
 LIB_DEPENDS+=		iksemel:${PORTSDIR}/textproc/iksemel \
 			gnutls:${PORTSDIR}/security/gnutls \

Modified: head/net-im/mcabber/Makefile
==============================================================================
--- head/net-im/mcabber/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
+++ head/net-im/mcabber/Makefile	Thu Jul 26 07:19:30 2012	(r301551)
@@ -27,6 +27,7 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_NCURSES=	yes
+USE_PKGCONFIG=	build
 USE_GNOME=	glib20
 
 MAN1=		mcabber.1

Modified: head/net/kdenetwork4/Makefile
==============================================================================
--- head/net/kdenetwork4/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
+++ head/net/kdenetwork4/Makefile	Thu Jul 26 07:19:30 2012	(r301551)
@@ -45,6 +45,10 @@ USE_KDE4=	kdehier kdelibs kdeprefix libk
 		automoc4 ontologies qimageblitz soprano strigi
 KDE4_BUILDENV=	yes
 USE_OPENSSL=	yes
+
+# Should probably be build-only, but JIC
+USE_PKGCONFIG=	both
+
 USE_QT4=	dbus gui network qt3support sql xml \
 		moc_build qmake_build rcc_build uic_build uic3_build
 USE_SQLITE=	yes

Modified: head/security/kopete-otr/Makefile
==============================================================================
--- head/security/kopete-otr/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
+++ head/security/kopete-otr/Makefile	Thu Jul 26 07:19:30 2012	(r301551)
@@ -29,5 +29,6 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
 
 .include <bsd.port.mk>

Modified: head/security/py-otr/Makefile
==============================================================================
--- head/security/py-otr/Makefile	Thu Jul 26 07:13:52 2012	(r301550)
+++ head/security/py-otr/Makefile	Thu Jul 26 07:19:30 2012	(r301551)
@@ -19,6 +19,7 @@ LIB_DEPENDS=	otr:${PORTSDIR}/security/li
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+USE_PKGCONFIG=	build
 PYDISTUTILS_PKGNAME=	python-otr
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib