From owner-svn-ports-all@FreeBSD.ORG Thu Jul 26 07:19:31 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1A85A1065672; Thu, 26 Jul 2012 07:19:31 +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 03C9A8FC08; Thu, 26 Jul 2012 07:19:31 +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 q6Q7JUMi051188; Thu, 26 Jul 2012 07:19:30 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6Q7JUi5051180; Thu, 26 Jul 2012 07:19:30 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201207260719.q6Q7JUi5051180@svn.freebsd.org> From: Doug Barton Date: Thu, 26 Jul 2012 07:19:30 +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: r301551 - in head: irc/bitlbee irc/irssi-otr net-im/climm net-im/mcabber net/kdenetwork4 security/kopete-otr security/py-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2012 07:19:31 -0000 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@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 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